From a5efb98a4e0a9dc0702492b49ba05f517be8f57b Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Sat, 30 May 2015 10:06:47 -0300
Subject: [PATCH] Changed discovery to Device based, diferent Oids for soem
 devices

---
 .../discovery/processors/powerconnect.inc.php | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/includes/discovery/processors/powerconnect.inc.php b/includes/discovery/processors/powerconnect.inc.php
index 126d9cccb..f385bdd4e 100644
--- a/includes/discovery/processors/powerconnect.inc.php
+++ b/includes/discovery/processors/powerconnect.inc.php
@@ -1,23 +1,27 @@
 <?php
-
-///
-//  Hardcoded discovery of cpu usage on Dell Powerconnect devices.
-///
-//  Dell-Vendor-MIB::dellLanExtension.6132.1.1.1.1.4.4.0 = STRING: "5 Sec (6.99%),    1 Min (6.72%),   5 Min (9.06%)"
-
 if ($device['os'] == "powerconnect")
 {
-  echo("Powerconnect : ");
+    $sysObjectId = snmp_get ($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn");
+    switch ($sysObjectId) {
+        case ".1.3.6.1.4.1.674.10895.3031":
+        /**
+        * Devices supported:
+        * Dell Powerconnect 55xx
+        */
+        $usage = trim(snmp_get($device, ".1.3.6.1.4.1.89.1.7.0", "-Ovq"));
+        discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.89.1.7.0", "0", "powerconnect","Processor", "1", $usage, NULL, NULL);
+        break;
+        default :
+        /**
+         * Defaul Discovery for powerconnect series
+         *  Dell-Vendor-MIB::dellLanExtension.6132.1.1.1.1.4.4.0 = STRING: "5 Sec (6.99%),    1 Min (6.72%),   5 Min (9.06%)"
+         */
+        $descr = "Processor";
+        $usage = trim(snmp_get($device, "dellLanExtension.6132.1.1.1.1.4.4.0", "-OQUvs", "Dell-Vendor-MIB"),'"');
+        if (substr($usage,0,5) == "5 Sec")
+        {
+            discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.4.0", "0", "powerconnect", $descr, "1", $usage, NULL, NULL);
+        }
 
-  $descr = "Processor";
-  $usage = trim(snmp_get($device, "dellLanExtension.6132.1.1.1.1.4.4.0", "-OQUvs", "Dell-Vendor-MIB"),'"');
-
-  if (substr($usage,0,5) == "5 Sec")
-  {
-    discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.4.0", "0", "powerconnect", $descr, "1", $usage, NULL, NULL);
-  }
+    }
 }
-
-unset ($processors_array);
-
-?>