Commit Graph

285 Commits

Author SHA1 Message Date
Tony Murray
1d777693e1 feature: New IP parsing classes. Removes usage of Pear Net_IPv4 and Net_IPv6. (#7106)
* Refactor remove use of pear Net_IPv4 and Net_IPv6

Caution, I added tests to test the functionality of the new functions, but I'm not 100% certain the replaced usages match 100%.  Please test.

Left usage in generate-iplist.php because I'm not sure the use of that script, so I didn't want to implement additional functionality to support it.

Add support for ipv6 fo ipInNetwork() function

Add phpdocs to functions
Remove accidental inclusion

Use binary operations instead of string for networKFromIp()
Tidy up binary operations in ipInNetwork()

tidy parsing cidr network

Change to a class based implementation.

Update phpdocs.
Fully catch exceptions for hex parsing.

Fix mistake.

support older phpunit versions

Fix php shifting to negative with php 5

* Fix graph authorization. Uncaught exception and checking an ipv4 against an ipv6 network == fail.

* Also remove colons from hex strings.

* Fix typo in bgp polling
Two passes of removing invalid characters from hex strings. (That way we don't mangle valid IPs)
2017-08-08 14:14:58 -05:00
Neil Lathwood
d8140467ae newdevice: Added support for Emerson energy systems (#7128)
* newdevice: Added support for Emerson energy systems

* added missing test

* Update ees.yaml
2017-08-08 07:58:57 +01:00
Neil Lathwood
707b6c6954 feature: Added support to cisco sensors to link them to ports + macro/docs for alerting (#6959)
* feature: Added support to cisco sensors to link them to ports + macro/docs for alerting

* renamed sql
2017-08-04 19:37:50 +01:00
Tony Murray
123a90feab feature: Log event if device polling takes too long (#7065)
Move $device_time closer to end of poll_device(), and simplify
remove some unused variables
simplify $device_time in discover_device() too
2017-07-21 23:01:59 +01:00
Neil Lathwood
da7550f55f device: Added additional sensors support for HP ILO4 (#7053)
* device: Improved HP ILO4 support

Added HP ILO4 temperature (HDD, motherboard), power, state (powersupply, HDD, Fans, memory slots) sensors support.
Tested with HP ProLiant ML350p Gen8-Gen9

* actual MIB file!
2017-07-19 22:06:59 +01:00
Neil Lathwood
83cb39a7fd fix: Netbotz state sensors using wrong value (#7027)
* fix: Netbotz state sensors using wrong value

* actual fix
2017-07-13 19:02:26 -05:00
Tony Murray
c874fc5b1e fix: Standardise UPS divisors (#6942)
Set default divisors for all devices and remove per-os overrides for them.
We should only use per-os overrides for non-standard behavior.

High possibility for breakage here if devices not listed here have non-standard behavior.
2017-07-13 18:09:56 +01:00
Neil Lathwood
d30e5660f9 feature: Added ability specify options for sensors yaml discovery (#6985)
* feature: Added ability specify options for sensors yaml discovery

* travis fix for new line + skip_values_* -> skip_value_*
2017-07-10 16:27:46 -05:00
Tony Murray
14ed767edb fix: a couple of issues with the yaml state sensor discovery (#6912) 2017-06-29 21:12:51 +01:00
Neil Lathwood
a4b905e3f6 fix: Fixed netman voltage and load divisor values (#6905)
* fix: Fixed netman voltage and load divisor values

* Update to perform more checks
2017-06-29 07:23:39 -05:00
Neil Lathwood
929d7ece56 fix: Fixed checks for $entPhysicalIndex/$hrDeviceIndex being numeric (#6907) 2017-06-28 16:03:35 -05:00
Neil Lathwood
5e32474d26 feature: Added support for sensors to be discovered from yaml (#6859)
* feature: Added support for sensors to be discovered from yaml

* added discovery definitions

* Updated docs, more code updates + tests

* removed the oid_name use

* pre-set variable from scrut output

* small updates as per comments in pr

* Allow index in descr

* Added ability to skip values

* Check for numeric values

* small update of oid name
2017-06-26 23:27:57 +01:00
Neil Lathwood
d48be5f507 newdevice: Added detection for Cisco EPC devices (#6690)
* newdevice: Added detection for Cisco EPC devices

* updated test file

* added dbm support

* added snr support
2017-05-23 10:28:44 -05:00
Neil Lathwood
895801d855 newdevice: Added more health information for APC units (#6619)
* fix: Fixed apc state support emsOutput

* newdevice: Added more health information for APC devices

* update schema file

* schema file renamed
2017-05-17 22:41:53 +01:00
Marcus Pink
5b9623d8d4 newdevice: Added detection for HPE RT3000 UPS (#6638)
* newdevice: HPE RT3000 UPS

* newdevice: HPE RT3000 UPS

* changed polling to snmp_get_multi_oid, fixed divisor for load and voltage

* fixed blank line in functions.inc.php
2017-05-16 21:42:10 +01:00
FTBZ
6c555c6fb5 fix: Fixed load divisor for eaton-mgeups (rfc1628) (#6566) 2017-05-03 22:38:43 +01:00
Olivier Beytrison
0dcc1d18c5 Fix GE UPS voltage factor (#6558) 2017-05-03 14:30:40 +01:00
Olivier Beytrison
2f5a1742c3 newdevice: Added detection for GE UPS (#6549) (#6553)
* Add support for GE UPS (#6549)

* rename OS and remove sysDescr regex
2017-05-02 15:20:28 +01:00
Neil Lathwood
72a0d8202a newdevice: Added further health support for Netbotz devices (#6529) 2017-04-30 16:32:39 +00:00
Tony Murray
374a4041af fix: inconsistent device discovery (#6518)
There were two or more separate $device arrays during discovery. When one was updated, others were not.
Combine those all.
Make sure the new os is loaded if the os changed.
2017-04-28 22:50:00 +01:00
FTBZ
2aa4145a26 fix: APC/MGE UPS sensors divisor for load and voltage (#6509)
* fix: APCMGE sensors divisors

* Add missing SNMP SIM file

* Add OS test for snmprec file
2017-04-26 08:35:07 -05:00
Neil Lathwood
66b7077a01 fix: Updated ipv4/ipv6 discovery to exclude IPs with invalid port_ids (#6495)
* fix: Updated ipv4/ipv6 discovery to exclude IPs with invalid port_ids

* Update the valid IP sql queries to include addresses without a port

* Fix arp-table too.
2017-04-25 21:28:25 +01:00
cahluor
2ced131cf5 Updated logging within discover_new_device() to record device that attempted to discover device
Updated logging within discover_new_device() to record device that attempted to discover device
2017-04-18 21:43:55 +01:00
Tony Murray
e521b39a7d refactor: move rfc1628_compat into os yaml (#6424) 2017-04-17 21:57:27 +01:00
Tony Murray
e005f78211 newdevice: detect more devices as Comware (#6386)
* newdevice: improve comware detection
Only some H3C Comware devices were detected as comware, detect them all.

* Update the test data

FYI, C1234 was just a nonsense string
2017-04-13 10:52:07 +01:00
Neil Lathwood
1bbbaff58b refactor: Moved ifLabel -> cleanPort and updated the usage (#6288)
* refactor: Moved ifLabel -> cleanPort and updated the usage

* added list of tags allowed

* few updates as per comments from @murrant

* Added simple unit tests

* double display for javascript popover

* Remove ifNameDescr() function
Fix realtime port page

* remove accidental temp code

* Remove double display calls in ajax tables
2017-04-04 08:08:23 +01:00
Tony Murray
ea5a4b3586 fix: attempt to fix several bugs with sensor limits and incorrect detection (#6176) 2017-03-12 14:56:56 +00:00
Tony Murray
6993bd122c fix: sensors not being removed from database (#6169) 2017-03-12 00:03:04 +00:00
Neil Lathwood
38cebc5fd7 feature: Added better BGP support for Arista (#6046)
* feature: Added better BGP support for Arista
2017-03-11 23:16:49 +00:00
FTBZ
1d80a0d2a6 fix: Fix Generex voltage sensor divisor (#6156)
* Fix Generex votage sensor divisor and add an exclusion option

* Allow OID to be used to figure out if we need to change the divisor.

* Missed current and found bugs while I was there.

* Use returns swap oid logic
2017-03-09 21:47:58 -06:00
FTBZ
6f2ba2b45b Fix Generex load sensor divisor (#6155) 2017-03-09 14:10:25 -06:00
Neil Lathwood
ecc5b5f5db Update sensor_type (#6108) 2017-03-06 16:37:12 -06:00
Neil Lathwood
339cda3775 fix: Old / duplicate sensors would never be removed, this is fixed by setting the $type correctly #6044 (#6079) 2017-03-06 15:39:56 +00:00
Neil Lathwood
aa24fb62be fix: Do not try and only include files once when they are needed again! #5881 (#6053) 2017-03-01 17:06:11 -06:00
Neil Lathwood
38168832a6 refactor: Centralise device up/down check and use in disco #5862 (#5897)
* refactor: Centralise device up/down check and use in disco #5862

* Remove extra indentation
2017-02-15 15:22:09 +00:00
Neil Lathwood
1e2ab73239 tidy up some more eventlog things (#5885)
* tidy up some more eventlog things

* update sql file
2017-02-14 12:06:01 +00:00
Richard Mayhew
e4f48e661e Add additional eventlog severity levels (#5879) 2017-02-13 22:32:02 +00:00
Richard Mayhew
5bfd23e7eb webui: New eventlog severity classification (#5830)
* New event log severity model

* Revert "New event log severity model"

This reverts commit 0783527af8.

* New event log severity model

* Fixed spaces vs tabs

* Learning the format requirements

* Learning the format requirements

* Moved the colours in to the stylesheet

* change SQL file to stop conflicting

* refactor log_event so severity isn't last, but reference is.

* keep having to move the file due to new PR conflicts

* Revert "keep having to move the file due to new PR conflicts"

This reverts commit f3030e7218.

* extended support to dashboard and eventlog page

* formatting
2017-02-12 22:41:05 +00:00
Neil Lathwood
3944185379 update tripplite divisor for certain versions #5364 (#5794) 2017-02-10 18:38:51 -06:00
Neil Lathwood
21898a3c29 Disco / Poller tidy up + Added display of module mem usage (#5778)
* tidyup + added mem usage for poller modules

* tidied up discovery modules

* fix sensors
2017-02-07 22:54:30 -06:00
Søren Rosiak
414efb3539 refactor: Various Code Cleanup (#5777)
* refactor: Various Code Cleanup

* moar
2017-02-05 22:37:08 +00:00
Neil Lathwood
d4e8c54516 refactor: Tidy up sensor discovery (#5550)
* refactor: Tidy up sensor discovery

* more files

* removed uneeded files

* updated array check

* updates for linux/supermicro

* small changes

* Update linux.inc.php

* Add supermicro temps back to linux.inc.php

* No need for is_file on rfc1628.inc.php, it exists

* Revert rfc1628 change

* Fix whitespace...

* rebased

* fixed $valid data not being passed to new sensors() function
2017-02-03 06:39:38 -06:00
Tony Murray
ab03af889a fix: hostnames returned by discovery protocols with trailing dot (#5571) 2017-01-24 21:56:51 +00:00
Neil Lathwood
32da1bceea fix: Changing device type now is persistant (#5529) 2017-01-22 09:49:13 +00:00
Neil Lathwood
8557f2df41 newdevice: APC Environmental monitoring units #5140 2017-01-18 08:48:33 +00:00
Neil Lathwood
7d27b4ec9a fix: Fix toner detection discovery #5391 (#5410)
* fix: Fix toner detection

* final fix for toner detection

* update $sql variable
2017-01-13 09:30:39 -06:00
Neil Lathwood
d5296319fb refactor: MySQL strict and query fixes (#5338)
* refactor: MySQL strict and query fixes

* moved sql file
2017-01-13 06:47:16 -06:00
Neil Lathwood
569a3b4a8b fix: Detect device type changes and update #5271 (#5390) 2017-01-11 10:36:04 -06:00
Tony Murray
b3f6218359 fix: os type and group not being set (#5357) 2017-01-09 08:16:09 +00:00
Neil Lathwood
da5783d917 feature: Add mysql failed query logging + fixed queries that break ONLY_FULL_GROUP_BY (#5327)
* feature: Add mysql failed query logging + fixed queries that break ONLY_FULL_GROUP_BY

* fix all schema errors and update system
2017-01-07 11:32:38 -06:00