Merge pull request #1282 from rztuc/aos69k-cpu

Added support for CPU graphing of Alcatel-Lucent AOS 7 devices.
librenms · Jun 15, 2015 · d6e22a5 · d6e22a5
2 parents 7298cef + 46b0084
commit d6e22a5
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/includes/discovery/processors/aos-device.inc.php b/includes/discovery/processors/aos-device.inc.php
@@ -13,8 +13,19 @@
   {
     discover_processor($valid['processor'], $device, "1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
   }
+  else
+  {
+    // AOS7 devices use a different OID for CPU load. Not all Switches have
+    // healthModuleCpuLatest so we use healthModuleCpu1MinAvg which makes no
+    // difference for a 5 min. polling interval.
+    // Note: This OID shows (a) the CPU load of a single switch or (b) the
+    // average CPU load of all CPUs in a stack of switches.
+    $usage = snmp_get($device, "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0", "-OQUvs", NULL, NULL);
+    if (is_numeric($usage))
+    {
+      discover_processor($valid['processor'], $device, "1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
+    }
+  }
 }
 
-unset ($processors_array);
-
 ?>