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] 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 8641536f1..2688b6a8b 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
+    }
+}