Fixed sensor discovery issue for serverscheck os (librenms#16499)

murrant · Oct 6, 2024 · 8c6964a · 8c6964a
1 parent 205c104
commit 8c6964a
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 0 deletions.
diff --git a/includes/discovery/sensors/humidity/serverscheck.inc.php b/includes/discovery/sensors/humidity/serverscheck.inc.php
@@ -31,6 +31,9 @@
     'sensor3Value.0' => '.1.3.6.1.4.1.17095.3.10.0',
     'sensor4Value.0' => '.1.3.6.1.4.1.17095.3.14.0',
     'sensor5Value.0' => '.1.3.6.1.4.1.17095.3.18.0',
+    'sensor6Value.0' => '.1.3.6.1.4.1.17095.3.22.0',
+    'sensor7Value.0' => '.1.3.6.1.4.1.17095.3.26.0',
+    'sensor8Value.0' => '.1.3.6.1.4.1.17095.3.30.0',
 ];
 
 $temp_x = 1;

diff --git a/includes/discovery/sensors/state/serverscheck.inc.php b/includes/discovery/sensors/state/serverscheck.inc.php
@@ -31,6 +31,9 @@
     'sensor3Value.0' => '.1.3.6.1.4.1.17095.3.10.0',
     'sensor4Value.0' => '.1.3.6.1.4.1.17095.3.14.0',
     'sensor5Value.0' => '.1.3.6.1.4.1.17095.3.18.0',
+    'sensor6Value.0' => '.1.3.6.1.4.1.17095.3.22.0',
+    'sensor7Value.0' => '.1.3.6.1.4.1.17095.3.26.0',
+    'sensor8Value.0' => '.1.3.6.1.4.1.17095.3.30.0',
 ];
 
 foreach ($pre_cache['serverscheck_control'] as $oid_name => $oid_value) {

diff --git a/includes/discovery/sensors/temperature/serverscheck.inc.php b/includes/discovery/sensors/temperature/serverscheck.inc.php
@@ -31,6 +31,9 @@
     'sensor3Value.0' => '.1.3.6.1.4.1.17095.3.10.0',
     'sensor4Value.0' => '.1.3.6.1.4.1.17095.3.14.0',
     'sensor5Value.0' => '.1.3.6.1.4.1.17095.3.18.0',
+    'sensor6Value.0' => '.1.3.6.1.4.1.17095.3.22.0',
+    'sensor7Value.0' => '.1.3.6.1.4.1.17095.3.26.0',
+    'sensor8Value.0' => '.1.3.6.1.4.1.17095.3.30.0',
 ];
 
 $temp_x = 1;

diff --git a/tests/data/serverscheck.json b/tests/data/serverscheck.json
@@ -23,6 +23,31 @@
     "sensors": {
         "discovery": {
             "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "humidity",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.17095.3.22.0",
+                    "sensor_index": "sensor6name",
+                    "sensor_type": "serverscheck",
+                    "sensor_descr": "Humidity1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 39.63,
+                    "sensor_limit": 70,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 30,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -100,6 +125,31 @@
         },
         "poller": {
             "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "humidity",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.17095.3.22.0",
+                    "sensor_index": "sensor6name",
+                    "sensor_type": "serverscheck",
+                    "sensor_descr": "Humidity1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 39.63,
+                    "sensor_limit": 70,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 30,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",

diff --git a/tests/snmpsim/serverscheck.snmprec b/tests/snmpsim/serverscheck.snmprec
@@ -23,3 +23,8 @@
 1.3.6.1.4.1.17095.3.17.0|4|-
 1.3.6.1.4.1.17095.3.18.0|4|-
 1.3.6.1.4.1.17095.3.19.0|4|-
+1.3.6.1.4.1.17095.3.20.0|4|-
+1.3.6.1.4.1.17095.3.21.0|4|Humidity1
+1.3.6.1.4.1.17095.3.22.0|4|39.63
+1.3.6.1.4.1.17095.3.23.0|4|DOWN
+1.3.6.1.4.1.17095.3.24.0|4|04 October 2024,11:33:55