From 9c3c39aee42eca83d4c6f8f14db5356fb4535318 Mon Sep 17 00:00:00 2001
From: Rudy Hardeman <zarya@gigafreak.net>
Date: Tue, 12 May 2015 21:53:41 +0200
Subject: [PATCH] HP ilo temperature: Removed lookup array, lookup name from
 mib

---
 includes/discovery/temperatures/hpilo.inc.php | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/includes/discovery/temperatures/hpilo.inc.php b/includes/discovery/temperatures/hpilo.inc.php
index 137f51502..00117932c 100644
--- a/includes/discovery/temperatures/hpilo.inc.php
+++ b/includes/discovery/temperatures/hpilo.inc.php
@@ -1,22 +1,5 @@
 <?php
 
-$sensor_names[1] = "other";
-$sensor_names[2] = "unknown";
-$sensor_names[3] = "system";
-$sensor_names[4] = "systemBoard";
-$sensor_names[5] = "ioBoard";
-$sensor_names[6] = "cpu";
-$sensor_names[7] = "memory";
-$sensor_names[8] = "storage";
-$sensor_names[9] = "removableMedia";
-$sensor_names[10] = "powerSupply";
-$sensor_names[11] = "ambient";
-$sensor_names[12] = "chassis";
-$sensor_names[13] = "bridgeCard";
-
-
-//if ($device['os'] == "ironware")
-//{
   echo("HP_ILO ");
   $oids = snmp_walk($device,"1.3.6.1.4.1.232.6.2.6.8.1.2.1","-Osqn","");
   $oids = trim($oids);
@@ -30,7 +13,7 @@ $sensor_names[13] = "bridgeCard";
       $temperature_id   = $split_oid[count($split_oid)-2].".".$split_oid[count($split_oid)-1];
 
       $descr_oid = "1.3.6.1.4.1.232.6.2.6.8.1.3.$temperature_id";
-      $descr = $sensor_names[snmp_get($device,$descr_oid,"-Oqv","")];
+      $descr = snmp_get($device,$descr_oid,"-Oqnv","CPQHLTH-MIB");
 
       $temperature_oid  = "1.3.6.1.4.1.232.6.2.6.8.1.4.$temperature_id";
       $temperature = snmp_get($device,$temperature_oid,"-Oqv","");
@@ -38,9 +21,9 @@ $sensor_names[13] = "bridgeCard";
       $threshold_oid = "1.3.6.1.4.1.232.6.2.6.8.1.5.$temperature_id";
       $threshold = snmp_get($device,$threshold_oid,"-Oqv","");
 
-      discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'hpilo', $descr, '2', '1', NULL, NULL, NULL, $threshold, $temperature);
+      discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'hpilo', $d
+escr, '2', '1', NULL, NULL, NULL, $threshold, $temperature);
     }
   }
-//}
 
 ?>