Commit Graph
5439 Commits
Author SHA1 Message Date
Tony Murray 85d0e3b98e refactor: Move nested defaults to Config::processConfig() (#8429)
* Move nested defaults to Config::processConfig()

Fixes log_file when users set log_dir for example.

Removed stuff:
mibdir
dp_autocreate
base_url: setting http/https before config.php is loaded...
moved collectd setting to it's own config file

* add base_url mod back.
I thought that since definitions is called before config.php it was useless, but it changes the built in definition between http and https.
2018-04-03 15:53:25 +01:00
toyowheelin 6f509f4e88 device: show PO and vlanmgmt ports for Dlink devices (#8402) 2018-04-02 21:31:04 +01:00
vivia11 b71febf372 device: Added WTI-MPC OS and mib (#8492)
* Add icon and initial discovery

* Added more discovery for wti-mpc. Add mib.

* Add snmp data and edit discovery

* Remove discovery due to weird mib[C

* Update wti-mpc.yaml
2018-04-01 21:38:47 +01:00
Tony Murray 214472ba89 refactor: rename array_sort() to avoid function collision (#8494) 2018-04-01 21:27:41 +01:00
Neil Lathwood 250b02fe23 device: Added detection for Cisco SPA devices (#8446)
* device: Added detection for Cisco SPA devices

* Drop sysDescr check
2018-03-29 00:27:24 -05:00
Søren Rosiak 8ec70a92af Improve Sentry4 discovery (#8407)
* feature: Improve Sentry4 discovery

* Added test data

* Updated to take into account C/F conversion

* fixed test json data
2018-03-29 00:22:17 -05:00
vivia11 314a552437 devices: Add Phybridge OS support (#8456)
* OS yaml definition for Phybridge

* Add images and snmp data

* Removed width/height from svg and added more specific discovery for phybridge

* Minimized svg and inverted icon

* added json test file

* update to json file

* Changing os name: phybridge to phybridge-flex

* Update json file to phybridge-flex

* Remove unneeded test data
2018-03-28 23:54:02 -05:00
James Andrewartha 2313e9c967 Add serial number detection to xerox, which is the standard prtGeneralSerialNumber from Printer-MIB (#8439) 2018-03-28 23:53:14 -05:00
Neil Lathwood 07ee21b04d fix: Fixed and improved toner discovery (#8428)
* fix: Fixed and improved toner discovery

* Update konica data
xerox tries to insert too long of descriptions.  Lets remove the part and serial number, they are ugly to look at in the ui.
2018-03-28 22:13:45 -05:00
theherodied e814cd8e34 Fixed missing mib dir in raritan definitions (#8476)
* Add mib dir that was missing

* Fixed missing raritan mib dir in definitions
2018-03-26 20:50:17 -05:00
Neil Lathwood 8ec6fc03d6 Fix hiveos detection to make it more strict (#8472) 2018-03-26 14:23:13 +01:00
priiduonu a1999c42e2 device: Updated moxa-etherdevice hardware/software/version detection
* Update moxa-etherdevice.inc.php

Would rather rely on `sysObjectID` when getting the hardware/software information as the `sysDescr` may be changed through the web interface of the device. Use numeric OID-s only.

* Update moxa-etherdevice.inc.php

Converted separate `snmp_get` calls into a single `snmp_get_multi_oid` call.

* Update moxa-etherdevice.inc.php

Unset variables at the end.

* Update moxa-etherdevice.inc.php

Unset multiple variables at once.

* Update moxa-etherdevice.inc.php
2018-03-25 21:57:13 +01:00
Andrew Steen 2044f9bd14 device: Added QFX5100-96S8Q to rewrites.php (#8466) 2018-03-25 21:46:06 +01:00
priiduonu af09e994e9 device: Added hardware and firmware detection for Hanwha Techwin devices (#8468) 2018-03-25 21:23:55 +01:00
theherodied 2537291734 nimbleos Changed to bit shift high << 32 and add low. Changed over graphs. (#8411)
* Changed to concat 32bit high.low counters

* Changed to concat 32bit high.low counters

* Correction. Needed to bit shift.

Correction. Needed to bit shift << 32 on high and add low.

* Correction. Needed to bit shift.

Correction. Needed to bit shift << 32 on high and add low.

* Added storage removed processor and memory

No point in processor and memory until nimble supports it. Added stroage to overhead.
2018-03-23 15:23:02 -05:00
Neil Lathwood 4c2822fe77 device: Improved detection for dlink and dlinkap devices (#8447) 2018-03-23 15:04:25 -05:00
papatango71 7ed7885ca7 Add ifAlias to tag influxdb port data (#8461)
* Update ports.inc.php

Adding ifAlias to the $tags that are sent into influxdb

* Remove space
2018-03-23 12:43:50 -05:00
Neil Lathwood 41dbc3547d device: Added detection for Raritan KVM and EMX devices (#8279) 2018-03-23 12:26:09 -05:00
Neil Lathwood e0589e0efe Added better detection for HiveOS devices (#8277)
* device: Added better detection for HiveOS devices

* Added MIBs for later use
2018-03-23 12:25:46 -05:00
Tony Murray 0d4a403253 Fix GenSQLOld() (#8459) 2018-03-23 14:39:50 +00:00
Neil Lathwood faf48311b2 refactor: Small improvement to per port polling (#8431) 2018-03-22 13:40:11 -05:00
Neil Lathwood 9019f6c599 device: Added additional detection for Calix B6 (#8445) 2018-03-22 13:38:21 -05:00
Neil Lathwood 544b363951 alert: Added support for disabling recovery notifications (#8430)
* alert: Added support for disabling recovery notifications

* reversed use of recovery

* removed debug + small update
2018-03-22 12:38:16 -05:00
Jarod2801 268e7c1ed4 Added detection for Ciena 8700 (SAOS 8) (#8442)
* Update ciena-sds.yaml

Added sysObjectID for Ciena 8700 (SAOS 8) device.

* Add files via upload
2018-03-22 09:17:27 -05:00
ospfbgp dba3f3fdfd device: Update avaya-vsp.yaml to reflect new vendor name (#8373)
* Update avaya-vsp.yaml

Extreme purchased the Avaya network assets and so I need to rebrand the VSP to be Extreme.  I am changing the icon to be Extreme.  I am also adding support for the 8404c which is  sysObjectID .1.3.6.1.4.1.2272.220

* Create avaya-vsp_8404c.snmprec

need to add a new vsp 8404c chassis support for avaya/extreme

* Added generated json file

* Udated test files
2018-03-22 08:37:12 +00:00
Tony Murray f950bb63e5 Don't break the webui when there are broken sql queries. (#8436) 2018-03-21 17:36:17 +00:00
Tony Murray 8883dde9bd Alerting, actually generate SQL (#8415)
* Alerting, actually generate sql.
Only unquote things that are actually numeric

* Fix merge
2018-03-20 12:49:57 +00:00
Tony Murray a9e31dca0e feature: Print mysql errors in debug output. (#8414)
* Print mysql errors in debug output.

* drop debug flag

* Fix sensor order...
2018-03-20 11:05:23 +00:00
Tony Murray 8cc8eb8dd2 refactor: Use elseif instead of else if (#8417) 2018-03-19 21:40:17 +00:00
theherodied 95f6f7b44d Updated command line switches (#8423)
New command line switches -w for warning and -c for critical added.
2018-03-19 21:18:13 +00:00
priiduonu f68f4b2240 newdevice: Added support for Moxa EDS-P510A-8PoE (#8384)
* newdevice: add support for Moxa EDS-P510A-8PoE

Support PoE port consumption, SFP module monitoring and power input statuses for Moxa EDS-P510A-8PoE industrial switch.

* Add Moxa EDS-P510A-8PoE MIB

* Rename MOXA-EDSP510A_8POE-V3.7-MIB.my to MOXA-EDSP510A_8POE-V3.7-MIB

* Update moxa-etherdevice.yaml

Moved MIB definitions to the top as proposed by @laf

* Create moxa-etherdevice_edsp510a8poe.snmprec

* Create moxa-etherdevice_edsp510a8poe.json

* Rename MOXA-EDSP510A_8POE-V3.7-MIB to MOXA-EDSP510A8POE-MIB
2018-03-19 20:58:41 +00:00
Mike Nowak a83ebdc078 Fixing HP Proliant state sensors (#8315)
* Fixing HP Proliant state sensors

* Numeric state data (-e)

Update to new state style
This currently cannot be tested. We don't discover sensors until the second discovery, because we poll 'hardware' instead of discover it.

* Fix whitespace
2018-03-18 23:07:59 -05:00
Robbert 7dfd0a3a89 feature: Added check_haproxy service configuration (#8412)
* Added check_haproxy service configuration.
Default configuration had -H option which isn't supported by the nagios check_haproxy plugin.

* Added check_haproxy service configuration.
Default configuration had -H option which isn't supported by the nagios check_haproxy plugin.

* Added check_haproxy service configuration.
Default configuration had -H option which isn't supported by the nagios check_haproxy plugin.
2018-03-18 21:22:01 +00:00
axemann d20d6fcc18 AOS-EMU2: Add contact,relay,outlet discovery; update yaml,snmprec,json (#8317)
* Add contact,relay,outlet discovery; update yaml,snmprec,json

* Fix formatting

* Another attempt at fixing sensors

* Update state mappings and fix json sensor ordering

* Capture values numerically.
Remove extra if/else statement
Make test data more interesting.

* Fix whitespace.

* Update sensors test data for order_by
2018-03-17 14:11:00 -05:00
Jason Cheng a570165f85 device: "DEVELOP" Support (#8153)
* device: "DEVELOP" Support 

support "DEVELOP", it's fork by KONICA MINOLTA.

* Update konica.yaml

* Add tests
2018-03-17 01:07:04 -05:00
theherodied f95cc1b07f Added Nimble storage volume utilization (#8405)
* Added nimble storage volume utilization

* Added nimble storage volume utilization

* Added author

* Fixed style issues
2018-03-16 13:43:28 -05:00
Søren Rosiak 8fdedcf484 device: Added more Dell iDrac state sensors (#8254)
* feature: Add more Dell iDrac state sensors

* add test data

* Added drac.json test data

* Re-run test data

* Fix drac.inc.php
2018-03-16 10:21:22 +00:00
Tony Murray 72752fa2d0 Use one sql query to fetch device alert rules (#8391)
* Use one sql query to fetch device alert rules
Rename $device to $device_id to avoid confusion.  I didn't see any variable collisions.

* don't return disabled rules

* remove semi-colin
2018-03-15 16:03:45 +00:00
Neil Lathwood 0aed9788e3 Fixed alerts group mapping (#8389) 2018-03-15 09:23:54 -05:00
Neil Lathwood 0ba5fa66e0 Reference the correct table for devices (#8383) 2018-03-15 11:02:43 +00:00
mattie47 0491e2edd0 device: Improve Allied Telesis Chassis product support (#8139)
* device: Improve Allied Telesis Chassis product support

Fix - Wrong Serial number was displayed
Enhancement - Show the type of Controller card in chassis

Controller card can be either CFC400, or CFC960.

Tests:
- Checked Chassis x8106, and x8112
- Checked with CFC400 and CFC960
-- Checked behaviour with/without CFC in bay 1.5

* device: Update awplus to use snmp_get_multi_oid

* update awplus device support

* device: Fix awplus snmptranslate logic error

* device: awplus chassis support improvements

* device: update awplus test data

* device: fix awplus serial number info

* device: fix awplus test data
2018-03-15 09:52:29 +00:00
Tony Murray 2bcc76625c Module tests update: per module output, only store modules data that are run (#8355)
* Test data: don't save data for modules that were not run

* Sometimes mibs are prefixed with +

* Save output for each module and only output the errored module.
Also makes it easier to identify modules that were ran.

* Clean up json files.
Message when no module data exists.

* verbose output when phpunit --debug is used
order by for ports
avoid graphite output in tests
only load module_tables.yaml once

* use explode and strpos instead of regex since it is failing...

* Fix some warnings

* Fix whitespace
2018-03-14 22:28:01 +00:00
Neil Lathwood 03076c4025 feature: Added new alert rule builder UI and rule mapping UI (#8293)
* feature: Added new alert rule builder UI

* Updated to export sql queries

* More updates

* more changes

* removed debug

* fix scrut

* Updated to include import options + various other fixes

* fix rule

* Populate name from collection rules.

* Fix default rule import
Allow new and old style rules in the collection.
Don't add new yet as I'm not sure GenSQL() is working.

* Fix GenSQL call

* Extract filter building to class so it is nicely contained in one place

* moved schema

* some fixes and tweaks

* travis fixes

* Some more features / updates

* Fix up my mistakes when adding default rules

* Use a modal for new alert (Incomplete)
Larger dialog!!
Remove page loading stuff.

Working:
Loading rules, resetting dialog, importing from collection.

Not working yet:
select width
device limited rule access? don't know what this is...

Lots of unused stuff to delete...

* reload "table" after save

* fixed editing rule

* Auto select2 width

* Reload window on save

* Restore per-device alert. Remove debug.

* Small cleanups. Rule Name first.

* Restore button to button type. Rename schema.

* Fixes: wrong command to reload window, remove extra attributes, rule is never passed

* Fixed old rule editing

* some small updates for old imports

* travis update to use trusty

* maybe travis fix

* Ability to set alert rule mappings on the rule edit screen

* pip installs one line, no quiet for deploy

* update schema def

* Fix style and some copyright headers

* fix docs missing file

* Allow new versions of snmpsim and libraries

* Parser WIP

* Fix default rules insert

* reorganize

* Legacy import first draft done

* Implement saving
Skip translation to sql for now

* Working on glues

* small rule collection fix

* Working on glues

* Working on glues

* Docs updates + small UI changes

* Parser WIP

* reorganize

* Legacy import first draft done

* Implement saving
Skip translation to sql for now

* Working on glues

* Working on glues

* Working on glues

* Add table mapping, should move to it's own class

* WIP

* Glue working!!

* Extract Schema class

* Some final touches.
revert alerts_rules.json for now.

* Finish up initial implementation
Needs more tests

* Fix a few places

* small doc updates

* Fix finding tables in grouped rules.

* remove unused code

* code format fixes

* Some quick tests for Schema
Simplified output for findRelationshipPath. Always includes start and target in the result.
This simplifies a lot of code in QueryBuilderParser.php
This also always loads the target table data now (which we want)

* Make bill_id the PRIMARY index for the bills table

* Load macros from a json file in misc instead of the database.

* Fix whitespace and wrong key for collection.

* Handle IN properly when generating SQL

* Fix glue (devices.device_id = ports.port_id) is incorrect :D
Show ALL tables we can resolve relationships for in the query builder filter.

* Remove all macros from the database
Remove insert statements, leave updates to update user's existing rules.
2018-03-14 20:25:19 +00:00
priiduonu 4da272f451 Sane default temperature limits for Axis cameras (#8371)
Default behaviour is to set low limit to (current temperature - 10 deg) and high limit to (current temperature + 20 deg) upon discovery. Changing that to abs values +5 and +35 deg respectively to be in realistic boundaries.
2018-03-13 20:06:40 -05:00
Tony Murray 6b68d5fce9 alerts: Added alert_id to alerts for templates (#8368)
* Add alert_id to alerts for templates
Extract alert loading to a function loadAlerts().
Alternative to #8351

* Actually add alert_id to $obj

* travis fixes
2018-03-13 22:19:57 +00:00
priiduonu 2e66ed354f device: Added detection of Axis Network Speaker (#8336)
* Add detection of Axis Network Speaker

* tests: add test data for Axis C3003 Network Speaker detection
2018-03-13 20:04:13 +00:00
jackson-tim f55d98ab03 device: Added Lenovo CNOS support (#8332)
* Lenovo CNOS Discovery+Logo Update

* Lenovo MIBs

* Update lenovo-cnos.yaml

Left example CPU Usage there.

* Update lenovo-cnos.yaml

* Update lenovo-cnos.yaml

* Update and rename lenovo-cnos.yaml to cnos.yaml

* Rename lenovo-cnos.yaml to cnos.yaml

* Rename Lenovo-Env-MIB.mib to LENOVO-ENV-MIB

* Rename Lenovo-Products-MIB.mib to  LENOVO-PRODUCTS-MIB

* Rename Lenovo-SMI-MIB.mib to LENOVO-SMI-MIB

* Update lenovo.svg

* Create cnos.json

* Create cnos.snmprec

* Update cnos.json

* Update cnos.yaml
2018-03-13 11:59:35 +00:00
Tony Murray e3d44c54d2 fix: Fixed etherlike graphs (#8358)
Empty rrd defintion...
2018-03-12 19:27:51 +00:00
theherodied bbd16dd2d2 feature: Added check_graylog.inc.php for services (#8334)
* Create check_graylog.inc.php

Removes the -H being passed and provides directions.

* Update check_graylog.inc.php
2018-03-11 15:00:07 +00:00
James Andrewartha 6c3473a7f8 ewc: more WirelessSensors and processor/mempools support (#8294)
* Add Errors, NoiseFloor, RSSI, SNR and Utilization Wireless Sensors for ewc

* Enable processor/mempool support for ewc using existing enterasys implementation

* Add test data
2018-03-05 09:46:59 -06:00