From 31816943c370617d71af9936caca1b78ff35d1cd Mon Sep 17 00:00:00 2001
From: Clint Armstrong <clint@clintarmstrong.net>
Date: Tue, 21 Jul 2015 16:21:31 -0400
Subject: [PATCH] Revert "attempt fix"

This reverts commit 8479e7a133e74e536f3db76dd60889a1640e7014.
---
 .../discovery/temperatures/equallogic.inc.php | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/includes/discovery/temperatures/equallogic.inc.php b/includes/discovery/temperatures/equallogic.inc.php
index 10e241304c..8febba396a 100644
--- a/includes/discovery/temperatures/equallogic.inc.php
+++ b/includes/discovery/temperatures/equallogic.inc.php
@@ -1,42 +1,49 @@
 <?php
 
 if ($device['os'] == 'equallogic') {
-    $oids = snmp_walk($device, 'eqlMemberHealthDetailsTemperatureEntry', '-OQ', 'EQLMEMBER-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 (!empty($oids)) {
         echo 'EQLCONTROLLER-MIB ';
-        $temps = [];
         foreach (explode("\n", $oids) as $data) {
             $data = trim($data);
             if (!empty($data)) {
-                list($oid,$val) = explode(' = ', $data, 2);
-                $oid = explode('::', $oid, 2)[1];
-                $oid = explode('.', $oid);
-                $key = $oid[0];
-                $part = $oid[-1];
-
-                if not array_key_exists($part, $temps) {
-                    $temps[$part] = [];
-                } //end if
-
-                $temps[$part][$key] = $val;
-            }//end if
-        }//end foreach
-
-        foreach ($temps as $part => $vals) {
-            discover_sensor($valid['sensor'], 'temperature', $device, $vals['eqlMemberHealthDetailsTemperatureName']
-        }// end foreach
-    }//end if
-}//end if
-
+                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);
 
                 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);
-
-EqlMemberHealthDetailsTemperatureEntry
+                }
+            }//end if
+        }//end foreach
+    }//end if
+}//end if