Updated dlink support with additional health,mempools and processors (#…

…9464) * Updated dlink support with additional health,mempools and processors * Update dlink.inc.php * Update dlink.inc.php * Added test data * add tests/data/dlink_dgs-1510-28.json * actual data for the new items
librenms · Dec 19, 2018 · a5eddc0 · a5eddc0
1 parent 7093b36
commit a5eddc0
Show file tree

Hide file tree

Showing 89 changed files with 59,811 additions and 7,106 deletions.
diff --git a/includes/definitions/discovery/dlink.yaml b/includes/definitions/discovery/dlink.yaml
@@ -1,11 +1,15 @@
-mib: EQUIPMENT-MIB
+mib: EQUIPMENT-MIB:DLINKSW-ENTITY-EXT-MIB
 modules:
     processors:
           data:
               -
                   oid: AGENT-GENERAL-MIB::agentCPUutilizationIn5sec
                   value: agentCPUutilizationIn5sec
                   num_oid: '.1.3.6.1.4.1.171.12.1.1.6.1.{{ $index }}'
+              -
+                  oid: DLINKSW-ENTITY-EXT-MIB::dEntityExtCpuUtilOneMinute
+                  value: dEntityExtCpuUtilOneMinute
+                  num_oid: '.1.3.6.1.4.1.171.14.5.1.7.1.4.{{ $index }}'
     sensors:
         temperature:
             data:
@@ -15,3 +19,41 @@ modules:
                     num_oid: '.1.3.6.1.4.1.171.12.11.1.8.1.2.{{ $index }}'
                     descr: 'Current Sys Temp {{ $index }}'
                     index: 'swTemperatureCurrent.{{ $index }}'
+                -
+                    oid: dEntityExtEnvTempTable
+                    value: dEntityExtEnvTempCurrent
+                    num_oid: '.1.3.6.1.4.1.171.14.5.1.1.1.1.4.{{ $index }}'
+                    descr: $dEntityExtEnvTempDescr
+                    index: 'dEntityExtEnvTempCurrent.{{ $index }}'
+                    low_limit: dEntityExtEnvTempThresholdLow
+                    high_limit: dEntityExtEnvTempThresholdHigh
+        state:
+            data:
+                -
+                    oid: dEntityExtEnvFanTable
+                    value: dEntityExtEnvFanStatus
+                    num_oid: '.1.3.6.1.4.1.171.14.5.1.1.2.1.4.{{ $index }}'
+                    descr: dEntityExtEnvFanDescr
+                    index: 'dEntityExtEnvFanStatus.{{ $index }}'
+                    states:
+                        - { descr: Ok, graph: 1, value: 1, generic: 0 }
+                        - { descr: Fault, graph: 1, value: 2, generic: 2 }
+                -
+                    oid: dEntityExtEnvPowerTable
+                    value: dEntityExtEnvPowerStatus
+                    num_oid: '.1.3.6.1.4.1.171.14.5.1.1.3.1.6.{{ $index }}'
+                    descr: dEntityExtEnvPowerDescr
+                    index: 'dEntityExtEnvPowerStatus.{{ $index }}'
+                    states:
+                        - { descr: In Operation, graph: 1, value: 1, generic: 0 }
+                        - { descr: Failed, graph: 1, value: 2, generic: 2 }
+                        - { descr: Empty, graph: 1, value: 3, generic: 3 }
+                -
+                    oid: dEntityExtEnvTempTable
+                    value: dEntityExtEnvTempStatus
+                    num_oid: '.1.3.6.1.4.1.171.14.5.1.1.1.1.7.{{ $index }}'
+                    descr: dEntityExtEnvTempDescr
+                    index: 'dEntityExtEnvTempStatus.{{ $index }}'
+                    states:
+                        - { descr: Ok, graph: 1, value: 1, generic: 0 }
+                        - { descr: Abnormal, graph: 1, value: 2, generic: 2 }
diff --git a/includes/discovery/mempools/dlink.inc.php b/includes/discovery/mempools/dlink.inc.php
@@ -21,4 +21,10 @@
     if (is_numeric($usage)) {
         discover_mempool($valid_mempool, $device, '0', 'dlink', 'Memory', '1', null, null);
     }
+
+    $dlink_mempools = snmpwalk_cache_oid($device, 'dEntityExtMemoryUtilTable', [], 'DLINKSW-ENTITY-EXT-MIB');
+    foreach ($dlink_mempools as $tmp_index => $dlink_data) {
+        list(,$dlink_type) = explode('.', $tmp_index);
+        discover_mempool($valid_mempool, $device, $tmp_index, 'dlink', ucfirst($dlink_type). " Memory");
+    }
 }
diff --git a/includes/polling/mempools/dlink.inc.php b/includes/polling/mempools/dlink.inc.php
@@ -21,4 +21,9 @@
     $mempool['used']  = $perc;
     $mempool['total'] = 100;
     $mempool['free']  = 100 - $perc;
+} else {
+    $dlink_mempools = snmp_get_multi_oid($device, "dEntityExtMemUtilTotal.$mempool_index dEntityExtMemUtilUsed.$mempool_index dEntityExtMemUtilFree.$mempool_index", '-OUQs', 'DLINKSW-ENTITY-EXT-MIB');
+    $mempool['total'] = $dlink_mempools["dEntityExtMemUtilTotal.$mempool_index"];
+    $mempool['used'] = $dlink_mempools["dEntityExtMemUtilUsed.$mempool_index"];
+    $mempool['free'] = $dlink_mempools["dEntityExtMemUtilFree.$mempool_index"];
 }
diff --git a/includes/polling/os/dlink.inc.php b/includes/polling/os/dlink.inc.php
@@ -6,3 +6,7 @@
 $hardware = $Descr_chopper[0].' Rev. '.str_replace('"', '', snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.12.1', '-Oqv'));
 $version = snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.11.1', '-Oqv');
 $serial = snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.17.1', '-Oqv');
+
+if (!$version) {
+    $version = snmp_get($device, 'dEntityExtVersionRuntime.1', '-Oqv', 'DLINKSW-ENTITY-EXT-MIB');
+}