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

Sensors, convert hex to strings (#14121)

Browse Source 
* Sensors, convert hex to strings

* Fix clickshare, it actually was returning hex

* update hpe-mapdu

* skip ict-mps sensors without valid values
This commit is contained in:
Tony Murray
2022-07-22 07:59:41 -05:00
committed by GitHub
parent 07f052738d
commit 52f0dab2f8
7 changed files with 23 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/Device/YamlDiscovery.php
+2 -2
View File
@@ -296,9 +296,9 @@ class YamlDiscovery
if (isset($data['snmp_flags'])) {
$snmp_flag = Arr::wrap($data['snmp_flags']);
} elseif (Str::contains($oid, '::')) {
$snmp_flag = ['-OteQUS'];
$snmp_flag = ['-OteQUSa'];
} else {
$snmp_flag = ['-OteQUs'];
$snmp_flag = ['-OteQUsa'];
}
$snmp_flag[] = '-Ih';
includes/definitions/discovery/hpe-mapdu.yaml
+6 -6
View File
@@ -58,7 +58,7 @@ modules:
-
oid: 'pdu3OutletName'
op: '=='
value: '00 00 00 00 00 00 00 00'
value: '........'
-
oid: pdu3InputType
value: pdu3InputType
@@ -163,7 +163,7 @@ modules:
-
oid: 'pdu3OutletName'
op: '=='
value: '00 00 00 00 00 00 00 00'
value: '........'
power:
data:
-
@@ -230,7 +230,7 @@ modules:
-
oid: 'pdu3OutletName'
op: '=='
value: '00 00 00 00 00 00 00 00'
value: '........'
power_factor:
data:
-
@@ -295,7 +295,7 @@ modules:
-
oid: 'pdu3OutletName'
op: '=='
value: '00 00 00 00 00 00 00 00'
value: '........'
load:
data:
-
@@ -335,7 +335,7 @@ modules:
-
oid: 'pdu3OutletName'
op: '=='
value: '00 00 00 00 00 00 00 00'
value: '........'
-
oid: pdu3InputPhaseCurrentPercentLoad
value: pdu3InputPhaseCurrentPercentLoad
@@ -415,4 +415,4 @@ modules:
-
oid: 'pdu3HumidityProbeStatus'
op: '=='
value: '1'
value: '1'
includes/definitions/discovery/ict-mps.yaml
+5
View File
@@ -29,6 +29,11 @@ modules:
num_oid: '.1.3.6.1.4.1.39145.13.10.1.4.{{ $index }}'
descr: 'Module #{{ $index }} Voltage (VDC)'
index: 'moduleVoltage.{{ $index }}'
skip_values:
-
oid: moduleVoltage
op: =
value: '.'
state:
data:
-
includes/discovery/sensors.inc.php
+2 -2
View File
@@ -29,7 +29,7 @@ if ($device['os'] == 'linux') {
include 'includes/discovery/sensors/rpigpiomonitor.inc.php';
}
if (strstr($device['hardware'], 'Dell')) {
if (isset($device['hardware']) && strstr($device['hardware'], 'Dell')) {
include 'includes/discovery/sensors/fanspeed/dell.inc.php';
include 'includes/discovery/sensors/power/dell.inc.php';
include 'includes/discovery/sensors/voltage/dell.inc.php';
@@ -37,7 +37,7 @@ if (strstr($device['hardware'], 'Dell')) {
include 'includes/discovery/sensors/temperature/dell.inc.php';
}
if (strstr($device['hardware'], 'ProLiant')) {
if (isset($device['hardware']) && strstr($device['hardware'], 'ProLiant')) {
include 'includes/discovery/sensors/state/hp.inc.php';
}
includes/polling/functions.inc.php
+2 -2
View File
@@ -22,7 +22,7 @@ function bulk_sensor_snmpget($device, $sensors)
return $data['sensor_oid'];
}, $chunk);
$oids = implode(' ', $oids);
$multi_response = snmp_get_multi_oid($device, $oids, '-OUQnte');
$multi_response = snmp_get_multi_oid($device, $oids, '-OUQntea');
$cache = array_merge($cache, $multi_response);
}
@@ -76,7 +76,7 @@ function poll_sensor($device, $class)
if (file_exists('includes/polling/sensors/' . $class . '/' . $device['os'] . '.inc.php')) {
require 'includes/polling/sensors/' . $class . '/' . $device['os'] . '.inc.php';
} elseif (file_exists('includes/polling/sensors/' . $class . '/' . $device['os_group'] . '.inc.php')) {
} elseif (isset($device['os_group']) && file_exists('includes/polling/sensors/' . $class . '/' . $device['os_group'] . '.inc.php')) {
require 'includes/polling/sensors/' . $class . '/' . $device['os_group'] . '.inc.php';
}
tests/data/clickshare_main.json
+6 -30
View File
@@ -873,30 +873,6 @@
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "fanspeed",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.7312.2468.1.2.1.0",
"sensor_index": "sensorCaseFanSpeed",
"sensor_type": "clickshare",
"sensor_descr": "Case",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"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": "fanspeed",
@@ -908,10 +884,10 @@
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 30,
"sensor_limit": 54,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 24,
"sensor_limit_low": 0,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -932,10 +908,10 @@
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 35,
"sensor_limit": 55,
"sensor_current": 55.652,
"sensor_limit": 95,
"sensor_limit_warn": null,
"sensor_limit_low": 25,
"sensor_limit_low": 45.652,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
tests/data/ict-mps.json
-96
View File
@@ -551,102 +551,6 @@
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39145.13.10.1.4.5",
"sensor_index": "moduleVoltage.5",
"sensor_type": "ict-mps",
"sensor_descr": "Module #5 Voltage (VDC)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"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": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39145.13.10.1.4.6",
"sensor_index": "moduleVoltage.6",
"sensor_type": "ict-mps",
"sensor_descr": "Module #6 Voltage (VDC)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"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": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39145.13.10.1.4.7",
"sensor_index": "moduleVoltage.7",
"sensor_type": "ict-mps",
"sensor_descr": "Module #7 Voltage (VDC)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"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": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39145.13.10.1.4.8",
"sensor_index": "moduleVoltage.8",
"sensor_type": "ict-mps",
"sensor_descr": "Module #8 Voltage (VDC)",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
"sensor_limit": 0,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"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": "voltage",