From f6d369d977832fb00bf16180c511b24bbc26776e Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Fri, 19 Jun 2015 16:04:44 +0100
Subject: [PATCH] Updated Temp support for EqualLogic

---
 .../discovery/temperatures/equallogic.inc.php | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/includes/discovery/temperatures/equallogic.inc.php b/includes/discovery/temperatures/equallogic.inc.php
index 4a82b9c1e..b6621a685 100644
--- a/includes/discovery/temperatures/equallogic.inc.php
+++ b/includes/discovery/temperatures/equallogic.inc.php
@@ -1,38 +1,49 @@
 <?php
 
 if ($device['os'] == "equallogic") {
-    $oids = snmp_walk($device, "eqlControllerProcessorTemp", "-OsqnU", "EQLCONTROLLER-MIB", $config['install_dir']."/mibs/equallogic");
+    $oids = snmp_walk($device, "eqlMemberHealthDetailsTemperatureName", "-OQn", "EQLMEMBER-MIB", $config['install_dir']."/mibs/equallogic");
+
+    /**
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.4 = Control module 0 processor
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.5 = Control module 0 chipset
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.6 = Control module 1 processor
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.7 = Control module 1 chipset
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.8 = Control module 0 SAS Controller
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.9 = Control module 0 SAS Expander
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.10 = Control module 0 SES Enclosure
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.11 = Control module 1 SAS Controller
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.12 = Control module 1 SAS Expander
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.17 = Control module 0 Battery
+.1.3.6.1.4.1.12740.2.1.6.1.2.1.329840783.18 = Control module 1 Battery
+    **/
+
     d_echo($oids."\n");
-    if ($oids !== false) echo("EQLCONTROLLER-MIB ");
+    if (!empty($oids)) {
+        echo("EQLCONTROLLER-MIB ");
+        foreach (explode("\n",$oids) as $data) {
+            $data = trim($data);
+            if (!empty($data)) {
+                list($oid,$descr) = explode(" = ", $data,2);
+                $split_oid = explode('.', $oid);
+                $num_index = $split_oid[count($split_oid)-1];
+                $index = $num_index;
+                $part_oid = $split_oid[count($split_oid)-2];
+                $num_index = $part_oid.'.'.$num_index;
+                $base_oid = '.1.3.6.1.4.1.12740.2.1.6.1.3.1.';
+                $oid = $base_oid .$num_index;
+                $extra = snmp_get_multi($device, "eqlMemberHealthDetailsTemperatureValue.3.329840783.$index eqlMemberHealthDetailsTemperatureCurrentState.3.329840783.$index eqlMemberHealthDetailsTemperatureHighCriticalThreshold.3.329840783.$index eqlMemberHealthDetailsTemperatureHighWarningThreshold.3.329840783.$index eqlMemberHealthDetailsTemperatureLowCriticalThreshold.3.329840783.$index eqlMemberHealthDetailsTemperatureLowWarningThreshold.3.329840783.$index", "-OQUs", "EQLMEMBER-MIB", $config['install_dir']."/mibs/equallogic");
+                $keys = array_keys($extra);
+                $temperature = $extra[$keys[0]]['eqlMemberHealthDetailsTemperatureValue'];
+                $low_limit = $extra[$keys[0]]['eqlMemberHealthDetailsTemperatureLowCriticalThreshold'];
+                $low_warn = $extra[$keys[0]]['eqlMemberHealthDetailsTemperatureLowWarningThreshold'];
+                $high_limit = $extra[$keys[0]]['eqlMemberHealthDetailsTemperatureHighCriticalThreshold'];
+                $high_warn = $extra[$keys[0]]['eqlMemberHealthDetailsTemperatureHighWarningThreshold'];
+                $index = 100+$index;
 
-    foreach (explode("\n", $oids) as $data) {
-        $data = trim($data);
-        if ($data) {
-            list($oid,$temperature) = explode(" ", $data,2);
-            $split_oid = explode('.',$oid);
-            $index = $split_oid[count($split_oid)-1];
-            $descr = "Contoller Proc Temp " . ($index-1);
-            $index = 100+$index;
-
-            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'snmp', $descr, 1, '1', NULL, NULL, NULL, NULL, $temperature);
+                if ($extra[$keys[0]]['eqlMemberHealthDetailsTemperatureCurrentState'] != 'unknown') {
+                    discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'snmp', $descr, 1, 1, $low_limit, $low_warn, $high_limit, $high_warn, $temperature);
+                }
+            }
         }
     }
-
-    $oids = snmp_walk($device, "eqlControllerChipsetTemp", "-OsqnU", "EQLCONTROLLER-MIB", $config['install_dir']."/mibs/equallogic");
-    d_echo($oids."\n");
-    if ($oids !== false) echo("EQLCONTROLLER-MIB ");
-
-    foreach (explode("\n", $oids) as $data) {
-        $data = trim($data);
-        if ($data) {
-            list($oid,$temperature) = explode(" ", $data,2);
-            $split_oid = explode('.',$oid);
-            $index = $split_oid[count($split_oid)-1];
-            $descr = "Contoller Chipset Temp " . ($index-1);
-            $index = 200+$index;
-
-            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'snmp', $descr, 1, '1', NULL, NULL, NULL, NULL, $temperature);
-        }
-    }
-
 }