From 2e187d82b2286895d910cf30cf766d45f9523bf6 Mon Sep 17 00:00:00 2001 From: Jellyfrog Date: Tue, 18 Oct 2022 12:33:19 +0200 Subject: [PATCH] Benuos: Remove undefined sensors (#14449) --- .../discovery/sensors/fanspeed/benuos.inc.php | 8 +- .../sensors/temperature/benuos.inc.php | 10 +- .../discovery/sensors/voltage/benuos.inc.php | 8 +- tests/data/benuos.json | 271 ------------------ 4 files changed, 19 insertions(+), 278 deletions(-) diff --git a/includes/discovery/sensors/fanspeed/benuos.inc.php b/includes/discovery/sensors/fanspeed/benuos.inc.php index 266afbaf8d..562f826870 100644 --- a/includes/discovery/sensors/fanspeed/benuos.inc.php +++ b/includes/discovery/sensors/fanspeed/benuos.inc.php @@ -5,11 +5,15 @@ echo 'Benu Sensors '; $data = snmp_get_multi($device, ['benuSensorName.1.4', 'benuSensorName.1.5', 'benuSensorName.1.6', 'benuSensorName.1.7', 'benuSensorName.1.8', 'benuSensorName.1.9', 'benuSensorValue.1.4', 'benuSensorValue.1.5', 'benuSensorValue.1.6', 'benuSensorValue.1.7', 'benuSensorValue.1.8', 'benuSensorValue.1.9'], '-OQUs', 'BENU-CHASSIS-MIB'); +if (empty($data)) { + return; +} + $sensor_index = 0; for ($index = 4; $index <= 9; $index++) { //Benu Fans are index 4 thru 9 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; - $descr = $data["1.$index"]['benuSensorName']; - $current = $data["1.$index"]['benuSensorValue']; + $descr = $data["1.$index"]['benuSensorName'] ?? null; + $current = $data["1.$index"]['benuSensorValue'] ?? null; discover_sensor($valid['sensor'], 'fanspeed', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/includes/discovery/sensors/temperature/benuos.inc.php b/includes/discovery/sensors/temperature/benuos.inc.php index a8cc9d9be7..ab68de1604 100644 --- a/includes/discovery/sensors/temperature/benuos.inc.php +++ b/includes/discovery/sensors/temperature/benuos.inc.php @@ -6,11 +6,15 @@ echo 'Benu Sensors '; $data = snmp_get_multi($device, ['benuSensorName.1.1', 'benuSensorName.1.2', 'benuSensorName.1.3', 'benuSensorValue.1.1', 'benuSensorValue.1.2', 'benuSensorValue.1.3'], '-OQUs', 'BENU-CHASSIS-MIB'); +if (empty($data)) { + return; +} + $sensor_index = 0; for ($index = 1; $index <= 3; $index++) { //Benu Temp Sensors are index 1 thru 3 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; - $descr = $data["1.$index"]['benuSensorName']; - $current = $data["1.$index"]['benuSensorValue']; - discover_sensor($valid['sensor'], 'temparature', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); + $descr = $data["1.$index"]['benuSensorName'] ?? null; + $current = $data["1.$index"]['benuSensorValue'] ?? null; + discover_sensor($valid['sensor'], 'temperature', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/includes/discovery/sensors/voltage/benuos.inc.php b/includes/discovery/sensors/voltage/benuos.inc.php index 2a34920dcb..bb418c9cb6 100644 --- a/includes/discovery/sensors/voltage/benuos.inc.php +++ b/includes/discovery/sensors/voltage/benuos.inc.php @@ -6,11 +6,15 @@ $sensor_index = 0; $data = snmp_get_multi($device, ['benuSensorName.1.10', 'benuSensorName.1.11', 'benuSensorValue.1.10', 'benuSensorValue.1.11'], '-OQUs', 'BENU-CHASSIS-MIB'); +if (empty($data)) { + return; +} + $sensor_index = 0; for ($index = 10; $index <= 11; $index++) { //Benu Voltage Sensors are index 10 and 11 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; - $descr = $data["1.$index"]['benuSensorName']; - $current = $data["1.$index"]['benuSensorValue']; + $descr = $data["1.$index"]['benuSensorName'] ?? null; + $current = $data["1.$index"]['benuSensorValue'] ?? null; discover_sensor($valid['sensor'], 'voltage', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/tests/data/benuos.json b/tests/data/benuos.json index 740c132ad0..3ab63ccd0c 100644 --- a/tests/data/benuos.json +++ b/tests/data/benuos.json @@ -38,277 +38,6 @@ }, "poller": "matches discovery" }, - "sensors": { - "discovery": { - "sensors": [ - { - "sensor_deleted": 0, - "sensor_class": "fanspeed", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.4", - "sensor_index": "0", - "sensor_type": "benuos", - "sensor_descr": null, - "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", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.5", - "sensor_index": "1", - "sensor_type": "benuos", - "sensor_descr": null, - "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", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.6", - "sensor_index": "2", - "sensor_type": "benuos", - "sensor_descr": null, - "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", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.7", - "sensor_index": "3", - "sensor_type": "benuos", - "sensor_descr": null, - "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", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.8", - "sensor_index": "4", - "sensor_type": "benuos", - "sensor_descr": null, - "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", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.9", - "sensor_index": "5", - "sensor_type": "benuos", - "sensor_descr": null, - "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": "temparature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.1", - "sensor_index": "0", - "sensor_type": "benuos", - "sensor_descr": null, - "group": null, - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_current": 0, - "sensor_limit": null, - "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": "temparature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.2", - "sensor_index": "1", - "sensor_type": "benuos", - "sensor_descr": null, - "group": null, - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_current": 0, - "sensor_limit": null, - "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": "temparature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.3", - "sensor_index": "2", - "sensor_type": "benuos", - "sensor_descr": null, - "group": null, - "sensor_divisor": 1, - "sensor_multiplier": 1, - "sensor_current": 0, - "sensor_limit": null, - "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": "voltage", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.10", - "sensor_index": "0", - "sensor_type": "benuos", - "sensor_descr": null, - "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.39406.1.1.1.4.1.1.5.1.11", - "sensor_index": "1", - "sensor_type": "benuos", - "sensor_descr": null, - "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 - } - ] - }, - "poller": "matches discovery" - }, "mempools": { "discovery": { "mempools": [