mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Sentry3 voltage sensor discovery (#9714)

Browse Source 
* Fix Sentry3 voltage sensor discovery

Previous fix broke voltage sensor discovery with superfluous .1 in the SNMP OID.  I have fixed my install with this patch but other testing should probably be done.

* Update sentry3.json
This commit is contained in:
dharpster
2019-01-22 17:11:26 -06:00
committed by Tony Murray
parent 9d843650b7
commit fa8d7a008d
2 changed files with 8 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/sensors/voltage/sentry3.inc.php
View File

@ -10,7 +10,7 @@ foreach ($oids as $index => $first) {
$valid['sensor'],
'voltage',
$device,
".1.3.6.1.4.1.1718.3.2.2.1.11.1.$index.$end",
".1.3.6.1.4.1.1718.3.2.2.1.11.$index.$end",
$index,
'sentry3',
'Tower ' . $index,

210
tests/data/sentry3.json
View File

@ -10,11 +10,11 @@
"version": null,
"hardware": null,
"features": null,
"location": null,
"os": "sentry3",
"type": "power",
"serial": null,
"icon": "servertech.png"
"icon": "servertech.png",
"location": null
}
]
},
@ -28,11 +28,11 @@
"version": " 7.1a",
"hardware": "CW-24V2C458C1",
"features": null,
"location": null,
"os": "sentry3",
"type": "power",
"serial": "ADLH0001862",
"icon": "servertech.png"
"icon": "servertech.png",
"location": null
}
]
}
@ -618,7 +618,7 @@
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1.1",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "Tower 1",
@ -642,7 +642,7 @@
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.2.1",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.2.1",
"sensor_index": "2",
"sensor_type": "sentry3",
"sensor_descr": "Tower 2",
@ -665,202 +665,6 @@
],
"state_indexes": []
},
"poller": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
"sensor_index": "infeedID.1.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 3.62,
"sensor_limit": 5.43,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.2.1",
"sensor_index": "infeedID.2.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed BA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 5.02,
"sensor_limit": 7.53,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "humidity",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.5.1.10.1.1",
"sensor_index": "tempHumidSensorHumidValue1.1",
"sensor_type": "sentry3",
"sensor_descr": "Removable Sensor A1",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 52,
"sensor_limit": 90,
"sensor_limit_warn": null,
"sensor_limit_low": 10,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "humidity",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.5.1.10.1.2",
"sensor_index": "tempHumidSensorHumidValue1.2",
"sensor_type": "sentry3",
"sensor_descr": "Removable Sensor A2",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 43,
"sensor_limit": 90,
"sensor_limit_warn": null,
"sensor_limit_low": 10,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.5.1.6.1.1",
"sensor_index": "tempHumidSensorTempValue1.1",
"sensor_type": "sentry3",
"sensor_descr": "Removable Sensor A1",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 20,
"sensor_limit": 45,
"sensor_limit_warn": null,
"sensor_limit_low": 5,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": "fahrenheit_to_celsius",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.5.1.6.1.2",
"sensor_index": "tempHumidSensorTempValue1.2",
"sensor_type": "sentry3",
"sensor_descr": "Removable Sensor A2",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 23.61,
"sensor_limit": 45,
"sensor_limit_warn": null,
"sensor_limit_low": 5,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": "fahrenheit_to_celsius",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1.1",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "Tower 1",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 240.695,
"sensor_limit_warn": null,
"sensor_limit_low": 177.905,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": 209.3,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.2.1",
"sensor_index": "2",
"sensor_type": "sentry3",
"sensor_descr": "Tower 2",
"group": null,
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 236.785,
"sensor_limit_warn": null,
"sensor_limit_low": 175.015,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": 205.9,
"user_func": null,
"state_name": null
}
],
"state_indexes": []
}
"poller": "matches discovery"
}
}