From b931e5d5c7ebcc80d9354e460cce43b0ae4c46eb Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Wed, 15 Jul 2015 11:50:42 -0300
Subject: [PATCH 1/5] Added PowerConnect 3548 support

---
 .../temperatures/powerconnect.inc.php         | 71 ++++++++++---------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index 8641536f1a..2688b6a8b5 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,42 +1,45 @@
 <?php
-
-if ($device['os'] == 'powerconnect') {
-    $sysObjectId = snmp_get($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
+if ($device['os'] == "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
-         * Operating Temperature: 0º C to 40º C
-         */
-        $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
-        discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '40', $temperature);
+        /**
+        * Dell Powerconnect 5548
+        * Operating Temperature: 0º C to 45º C
+        */
+        case ".1.3.6.1.4.1.674.10895.3031":
+        $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
+        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
         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%)"
-         */
-        $temps = snmp_walk($device, 'boxServicesTempSensorTemperature', '-OsqnU', 'FASTPATH-BOXSERVICES-PRIVATE-MIB');
-        if ($debug) {
-            echo $temps."\n";
-        }
+        /**
+        * Dell Powerconnect 3548
+        * Operating Temperature: 0º C to 45º C
+        */
+        case ".1.3.6.1.4.1.674.10895.3017":
+        $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
+        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
+        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%)"
+        */
+        $temps = snmp_walk($device, "boxServicesTempSensorTemperature", "-OsqnU", "FASTPATH-BOXSERVICES-PRIVATE-MIB");
+        if ($debug) { echo($temps."\n"); }
 
         $index = 0;
-        foreach (explode("\n", $temps) as $oids) {
-            echo 'Powerconnect ';
-            list($oid,$current) = explode(' ', $oids);
-            $divisor            = '1';
-            $multiplier         = '1';
-            $type               = 'powerconnect';
+        foreach (explode("\n",$temps) as $oids)
+        {
+            echo("Powerconnect ");
+            list($oid,$current) = explode(' ',$oids);
+            $divisor = "1";
+            $multiplier = "1";
+            $type = "powerconnect";
             $index++;
-            $descr = 'Internal Temperature';
-            if (count(explode("\n", $temps)) > 1) {
-                $descr .= " $index";
-            }
+            $descr = "Internal Temperature";
+            if (count(explode("\n",$temps)) > 1) { $descr .= " $index"; }
 
-            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, null, null, null, null, $current);
+            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
         }
-    }//end switch
-}//end if
+    }
+}

From be670131c1e1609e0df0aa08595630d6116d2cb3 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Wed, 15 Jul 2015 18:04:13 -0300
Subject: [PATCH 2/5] Fixed some code standards

---
 includes/discovery/temperatures/powerconnect.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index 2688b6a8b5..e70a468ee1 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -25,8 +25,9 @@ if ($device['os'] == "powerconnect")
         *  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%)"
         */
         $temps = snmp_walk($device, "boxServicesTempSensorTemperature", "-OsqnU", "FASTPATH-BOXSERVICES-PRIVATE-MIB");
-        if ($debug) { echo($temps."\n"); }
-
+        if ($debug) {
+            echo($temps."\n");
+        }
         $index = 0;
         foreach (explode("\n",$temps) as $oids)
         {
@@ -37,8 +38,9 @@ if ($device['os'] == "powerconnect")
             $type = "powerconnect";
             $index++;
             $descr = "Internal Temperature";
-            if (count(explode("\n",$temps)) > 1) { $descr .= " $index"; }
-
+            if (count(explode("\n",$temps)) > 1) {
+                $descr .= " $index";
+            }
             discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
         }
     }

From d1c7886d665edab1f6575fe2a1c699a8a36d864e Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Thu, 16 Jul 2015 09:45:17 -0300
Subject: [PATCH 3/5] Updated old code and fixed some code standards

---
 .../temperatures/powerconnect.inc.php         | 39 ++++++-------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index e70a468ee1..fef53599c6 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,47 +1,32 @@
 <?php
-if ($device['os'] == "powerconnect")
+if ($device['os'] == 'powerconnect')
 {
-    $sysObjectId = snmp_get ($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn");
+    $sysObjectId = snmp_get ($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
     switch ($sysObjectId) {
         /**
         * Dell Powerconnect 5548
         * Operating Temperature: 0º C to 45º C
         */
-        case ".1.3.6.1.4.1.674.10895.3031":
-        $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
-        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
+        case '.1.3.6.1.4.1.674.10895.3031':
+        $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
+        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         break;
         /**
         * Dell Powerconnect 3548
         * Operating Temperature: 0º C to 45º C
         */
-        case ".1.3.6.1.4.1.674.10895.3017":
+        case '.1.3.6.1.4.1.674.10895.3017':
         $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
-        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         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%)"
+        * Default Temperature Discovery
+        * Operating Temperature: 0º C to 45º C
         */
-        $temps = snmp_walk($device, "boxServicesTempSensorTemperature", "-OsqnU", "FASTPATH-BOXSERVICES-PRIVATE-MIB");
-        if ($debug) {
-            echo($temps."\n");
-        }
-        $index = 0;
-        foreach (explode("\n",$temps) as $oids)
-        {
-            echo("Powerconnect ");
-            list($oid,$current) = explode(' ',$oids);
-            $divisor = "1";
-            $multiplier = "1";
-            $type = "powerconnect";
-            $index++;
-            $descr = "Internal Temperature";
-            if (count(explode("\n",$temps)) > 1) {
-                $descr .= " $index";
-            }
-            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
+        $temperature = snmp_get($device, 'boxServicesTempSensorTemperature.0', '-Ovq','FASTPATH-BOXSERVICES-PRIVATE-MIB');
+        if (is_numeric($temperature)) {
+            discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         }
     }
 }

From c3db4f4422c0fe6993b9bc6c334c266e809fa5ef Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Thu, 16 Jul 2015 13:09:54 -0300
Subject: [PATCH 4/5] Updated standards

---
 .../discovery/temperatures/powerconnect.inc.php     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index fef53599c6..c6dc4c195a 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,6 +1,5 @@
 <?php
-if ($device['os'] == 'powerconnect')
-{
+if ($device['os'] == 'powerconnect') {
     $sysObjectId = snmp_get ($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
     switch ($sysObjectId) {
         /**
@@ -9,7 +8,7 @@ if ($device['os'] == 'powerconnect')
         */
         case '.1.3.6.1.4.1.674.10895.3031':
         $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
-        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
         break;
         /**
         * Dell Powerconnect 3548
@@ -17,7 +16,7 @@ if ($device['os'] == 'powerconnect')
         */
         case '.1.3.6.1.4.1.674.10895.3017':
         $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
-        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
         break;
         default :
         /**
@@ -26,7 +25,7 @@ if ($device['os'] == 'powerconnect')
         */
         $temperature = snmp_get($device, 'boxServicesTempSensorTemperature.0', '-Ovq','FASTPATH-BOXSERVICES-PRIVATE-MIB');
         if (is_numeric($temperature)) {
-            discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
+            discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
         }
-    }
-}
+    }//end switch
+}//end if

From 54cc274f136cf79bdfe2eee2437135d289812138 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Thu, 16 Jul 2015 13:11:12 -0300
Subject: [PATCH 5/5] REmoved aditional space

---
 includes/discovery/temperatures/powerconnect.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index c6dc4c195a..af9c8fe8d2 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,6 +1,6 @@
 <?php
 if ($device['os'] == 'powerconnect') {
-    $sysObjectId = snmp_get ($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
+    $sysObjectId = snmp_get($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
     switch ($sysObjectId) {
         /**
         * Dell Powerconnect 5548