From 7cd3dc86ec7e72e0c0bad23a69d3222bd3592155 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 4 May 2011 12:58:57 +0000
Subject: [PATCH] fix temperature and processors discovery

git-svn-id: http://www.observium.org/svn/observer/trunk@2238 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/entity-physical.inc.php    |  4 --
 includes/discovery/functions.inc.php          | 37 +++++++++----------
 includes/discovery/processors-ucd-old.inc.php |  4 +-
 includes/discovery/processors.inc.php         |  7 +---
 .../discovery/processors/aos-device.inc.php   |  6 +--
 .../discovery/processors/hrdevice.inc.php     |  6 +--
 includes/discovery/processors/ios.inc.php     | 10 ++---
 .../discovery/processors/ironware.inc.php     |  6 +--
 includes/discovery/processors/junos.inc.php   |  6 +--
 includes/discovery/processors/junose.inc.php  |  6 +--
 .../discovery/processors/procurve.inc.php     |  6 +--
 includes/discovery/processors/radlan.inc.php  |  6 +--
 .../discovery/processors/screenos.inc.php     |  4 +-
 includes/discovery/temperatures/akcp.inc.php  |  4 +-
 .../discovery/temperatures/aos-device.inc.php |  2 -
 includes/discovery/temperatures/apc.inc.php   |  2 -
 includes/discovery/temperatures/areca.inc.php |  4 +-
 .../temperatures/cisco-envmon.inc.php         |  4 +-
 .../temperatures/cometsystem-p85xx.inc.php    |  4 +-
 includes/discovery/temperatures/dell.inc.php  |  4 +-
 .../temperatures/ftos-c-series.inc.php        | 11 ------
 .../temperatures/ftos-e-series.inc.php        |  6 +--
 .../temperatures/ftos-s-series.inc.php        |  7 +---
 .../discovery/temperatures/ipoman.inc.php     |  4 +-
 .../discovery/temperatures/ironware.inc.php   |  4 +-
 includes/discovery/temperatures/junos.inc.php |  4 +-
 .../discovery/temperatures/junose.inc.php     |  4 +-
 .../discovery/temperatures/lm-sensors.inc.php |  4 +-
 .../temperatures/observernms-custom.inc.php   |  4 +-
 .../temperatures/papouch-tme.inc.php          |  4 +-
 .../temperatures/powerconnect.inc.php         |  4 +-
 .../discovery/temperatures/rfc1628.inc.php    |  2 -
 .../discovery/temperatures/sentry3.inc.php    |  4 --
 .../discovery/temperatures/supermicro.inc.php |  4 +-
 includes/discovery/temperatures/xups.inc.php  |  4 +-
 .../discovery/temperatures/zyxel-ies.inc.php  |  4 +-
 36 files changed, 60 insertions(+), 146 deletions(-)

diff --git a/includes/discovery/entity-physical.inc.php b/includes/discovery/entity-physical.inc.php
index 2da492d82..14b649d5a 100755
--- a/includes/discovery/entity-physical.inc.php
+++ b/includes/discovery/entity-physical.inc.php
@@ -2,8 +2,6 @@
 
  echo("Physical Inventory : ");
 
- unset($valid);
-
  if ($config['enable_inventory']) {
 
 
@@ -86,8 +84,6 @@
     }
   }
 
- unset($valid);
-
  echo("\n");
 
 ?>
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index 565a3b745..6b7bef3b3 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 ### Discover sensors
-function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr, $divisor = '1', $multiplier = '1', $low_limit = NULL, $low_warn_limit = NULL, $warn_limit = NULL, $high_limit = NULL, $current = NULL, $poller_type = 'snmp')
+function discover_sensor(&$this_valid, $class, $device, $oid, $index, $type, $descr, $divisor = '1', $multiplier = '1', $low_limit = NULL, $low_warn_limit = NULL, $warn_limit = NULL, $high_limit = NULL, $current = NULL, $poller_type = 'snmp')
 {
   global $config, $debug;
 
@@ -74,7 +74,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
       if ($debug) { echo("$query\n". mysql_affected_rows() . " updated\n"); }
     }
   }
-  $valid[$class][$type][$index] = 1;
+  $this_valid[$class][$type][$index] = 1;
 }
 
 function sensor_low_limit($class, $current)
@@ -140,19 +140,17 @@ function sensor_limit($class, $current)
   return $limit;
 }
 
-function check_valid_sensors($device, $class, $valid)
+function check_valid_sensors($device, $class, $this_valid)
 {
   $sql = "SELECT * FROM sensors AS S, devices AS D WHERE S.sensor_class='".$class."' AND S.device_id = D.device_id AND D.device_id = '".$device['device_id']."'";
   if ($query = mysql_query($sql))
   {
     while ($test = mysql_fetch_assoc($query))
     {
-
-      print_r($test);
       $index = $test['sensor_index'];
       $type = $test['sensor_type'];
       if ($debug) { echo($index . " -> " . $type . "\n"); }
-      if (!$valid[$class][$type][$index])
+      if (!$this_valid[$class][$type][$index])
       {
         echo("-");
         mysql_query("DELETE FROM `sensors` WHERE sensor_class='".$class."' AND sensor_id = '" . $test['sensor_id'] . "'");
@@ -163,8 +161,7 @@ function check_valid_sensors($device, $class, $valid)
   }
 }
 
-
-function discover_juniAtmVp(&$valid, $interface_id, $vp_id, $vp_descr)
+function discover_juniAtmVp(&$this_valid, $interface_id, $vp_id, $vp_descr)
 {
   global $config, $debug;
 
@@ -180,7 +177,7 @@ function discover_juniAtmVp(&$valid, $interface_id, $vp_id, $vp_descr)
   {
     echo(".");
   }
-  $valid[$interface_id][$vp_id] = 1;
+  $this_valid[$interface_id][$vp_id] = 1;
 }
 
 function discover_link($local_interface_id, $protocol, $remote_interface_id, $remote_hostname, $remote_port, $remote_platform, $remote_version)
@@ -213,7 +210,7 @@ function discover_link($local_interface_id, $protocol, $remote_interface_id, $re
   $link_exists[$local_interface_id][$remote_hostname][$remote_port] = 1;
 }
 
-function discover_storage(&$valid, $device, $index, $type, $mib, $descr, $size, $units, $used = NULL)
+function discover_storage(&$this_valid, $device, $index, $type, $mib, $descr, $size, $units, $used = NULL)
 {
   global $config, $debug;
 
@@ -236,12 +233,12 @@ function discover_storage(&$valid, $device, $index, $type, $mib, $descr, $size,
       mysql_query($query);
       if ($debug) { print $query . "\n"; }
     }
-    $valid[$mib][$index] = 1;
+    $this_valid[$mib][$index] = 1;
   }
 }
 
 
-function discover_processor(&$valid, $device, $oid, $index, $type, $descr, $precision = "1", $current = NULL, $entPhysicalIndex = NULL, $hrDeviceIndex = NULL)
+function discover_processor(&$this_valid, $device, $oid, $index, $type, $descr, $precision = "1", $current = NULL, $entPhysicalIndex = NULL, $hrDeviceIndex = NULL)
 {
   global $config, $debug;
 
@@ -266,12 +263,12 @@ function discover_processor(&$valid, $device, $oid, $index, $type, $descr, $prec
       mysql_query($query);
       if ($debug) { print $query . "\n"; }
     }
-    $valid[$type][$index] = 1;
+    $this_valid[$type][$index] = 1;
   }
 }
 
 
-function discover_mempool(&$valid, $device, $index, $type, $descr, $precision = "1", $entPhysicalIndex = NULL, $hrDeviceIndex = NULL)
+function discover_mempool(&$this_valid, $device, $index, $type, $descr, $precision = "1", $entPhysicalIndex = NULL, $hrDeviceIndex = NULL)
 {
   global $config, $debug;
 
@@ -296,11 +293,11 @@ function discover_mempool(&$valid, $device, $index, $type, $descr, $precision =
       mysql_query($query);
       if ($debug) { print $query . "\n"; }
     }
-    $valid[$type][$index] = 1;
+    $this_valid[$type][$index] = 1;
   }
 }
 
-function discover_toner(&$valid, $device, $oid, $index, $type, $descr, $capacity = NULL, $current = NULL)
+function discover_toner(&$this_valid, $device, $oid, $index, $type, $descr, $capacity = NULL, $current = NULL)
 {
   global $config, $debug;
 
@@ -327,10 +324,10 @@ function discover_toner(&$valid, $device, $oid, $index, $type, $descr, $capacity
       echo("U");
     }
   }
-  $valid[$type][$index] = 1;
+  $this_valid[$type][$index] = 1;
 }
 
-function discover_process_ipv6(&$valid, $ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_origin)
+function discover_process_ipv6(&$this_valid, $ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_origin)
 {
   global $device,$config;
 
@@ -373,8 +370,8 @@ function discover_process_ipv6(&$valid, $ifIndex,$ipv6_address,$ipv6_prefixlen,$
       echo(".");
     }
     $full_address = "$ipv6_address/$ipv6_prefixlen";
-    $valid_address = $full_address  . "-" . $interface_id;
-    $valid['ipv6'][$valid_address] = 1;
+    $this_valid_address = $full_address  . "-" . $interface_id;
+    $this_valid['ipv6'][$this_valid_address] = 1;
   }
 }
 
diff --git a/includes/discovery/processors-ucd-old.inc.php b/includes/discovery/processors-ucd-old.inc.php
index 13ca49f15..470d6b8bf 100644
--- a/includes/discovery/processors-ucd-old.inc.php
+++ b/includes/discovery/processors-ucd-old.inc.php
@@ -14,8 +14,8 @@ if ($device['os_group'] == "unix" && $count == "0")
 
   if (is_numeric($percent))
   {
-    discover_processor($valid_processor, $device, 0, 0, "ucd-old", "CPU", "1", $system+$user, NULL, NULL);
+    discover_processor($valid['processor'], $device, 0, 0, "ucd-old", "CPU", "1", $system+$user, NULL, NULL);
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors.inc.php b/includes/discovery/processors.inc.php
index 06c35944e..fd488022c 100755
--- a/includes/discovery/processors.inc.php
+++ b/includes/discovery/processors.inc.php
@@ -2,8 +2,6 @@
 
 echo("Processors : ");
 
-global $valid_processor;
-
 include_dir("includes/discovery/processors");
 
 ## Last-resort discovery here
@@ -15,14 +13,14 @@ include("processors-ucd-old.inc.php");
 $sql = "SELECT * FROM `processors` WHERE `device_id`  = '".$device['device_id']."'";
 $query = mysql_query($sql);
 
-if ($debug) { print_r ($valid_processor); }
+if ($debug) { print_r ($valid['processor']); }
 
 while ($test_processor = mysql_fetch_assoc($query))
 {
   $processor_index = $test_processor['processor_index'];
   $processor_type = $test_processor['processor_type'];
   if ($debug) { echo($processor_index . " -> " . $processor_type . "\n"); }
-  if (!$valid_processor[$processor_type][$processor_index])
+  if (!$valid['processor'][$processor_type][$processor_index])
   {
     echo("-");
     mysql_query("DELETE FROM `processors` WHERE processor_id = '" . $test_processor['processor_id'] . "'");
@@ -30,7 +28,6 @@ while ($test_processor = mysql_fetch_assoc($query))
   unset($processor_oid); unset($processor_type);
 }
 
-unset($valid_processor);
 echo("\n");
 
 ?>
diff --git a/includes/discovery/processors/aos-device.inc.php b/includes/discovery/processors/aos-device.inc.php
index a7079a236..b060cd06a 100644
--- a/includes/discovery/processors/aos-device.inc.php
+++ b/includes/discovery/processors/aos-device.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 ##  Hardcoded discovery of device CPU usage on Alcatel-Lucent Omniswitches.
 
 if ($device['os'] == "aos")
@@ -13,10 +11,10 @@ if ($device['os'] == "aos")
 
   if (is_numeric($usage))
   {
-    discover_processor($valid_processor, $device, "1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
+    discover_processor($valid['processor'], $device, "1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0", "0", "aos-system", $descr, "1", $usage, NULL, NULL);
   }
 }
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/hrdevice.inc.php b/includes/discovery/processors/hrdevice.inc.php
index 944422a38..d159715c0 100755
--- a/includes/discovery/processors/hrdevice.inc.php
+++ b/includes/discovery/processors/hrdevice.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 echo("hrDevice ");
 $hrDevice_oids = array('hrDevice','hrProcessorLoad');
 unset($hrDevice_array);
@@ -40,7 +38,7 @@ if (is_array($hrDevice_array))
       }
       if (isset($descr) && $descr != "An electronic chip that makes the computer work.")
       {
-        discover_processor($valid_processor, $device, $usage_oid, $index, "hr", $descr, "1", $usage, NULL, $hrDeviceIndex);
+        discover_processor($valid['processor'], $device, $usage_oid, $index, "hr", $descr, "1", $usage, NULL, $hrDeviceIndex);
       }
       unset($old_rrd,$new_rrd,$descr,$entry,$usage_oid,$index,$usage,$hrDeviceIndex,$descr_array);
     }
@@ -51,4 +49,4 @@ if (is_array($hrDevice_array))
 
 ## End hrDevice Processors
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/ios.inc.php b/includes/discovery/processors/ios.inc.php
index 842549a4e..a153ccfe1 100755
--- a/includes/discovery/processors/ios.inc.php
+++ b/includes/discovery/processors/ios.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 if ($device['os'] == "ios" || $device['os_group'] == "ios")
 {
   echo("CISCO-PROCESS-MIB : ");
@@ -43,17 +41,17 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
 
       if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "")
       {
-	discover_processor($valid_processor, $device, $usage_oid, $index, "cpm", $descr, "1", $entry['juniSystemModuleCpuUtilPct'], $entPhysicalIndex, NULL);
+	discover_processor($valid['processor'], $device, $usage_oid, $index, "cpm", $descr, "1", $entry['juniSystemModuleCpuUtilPct'], $entPhysicalIndex, NULL);
       }
     }
   }
 
-  if (!is_array($valid_processor['cpm']))
+  if (!is_array($valid['processor']['cpm']))
   {
     $avgBusy5 = snmp_get($device, ".1.3.6.1.4.1.9.2.1.58.0", "-Oqv");
     if (is_numeric($avgBusy5))
     {
-      discover_processor($valid_processor, $device, ".1.3.6.1.4.1.9.2.1.58.0", "0", "ios", "Processor", "1", $avgBusy5, NULL, NULL);
+      discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.9.2.1.58.0", "0", "ios", "Processor", "1", $avgBusy5, NULL, NULL);
     }
   }
 }
@@ -61,4 +59,4 @@ if ($device['os'] == "ios" || $device['os_group'] == "ios")
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/ironware.inc.php b/includes/discovery/processors/ironware.inc.php
index d579080e8..1789cbaf8 100755
--- a/includes/discovery/processors/ironware.inc.php
+++ b/includes/discovery/processors/ironware.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 if ($device['os'] == "ironware" || $device['os_group'] == "ironware")
 {
   echo("IronWare : ");
@@ -36,7 +34,7 @@ if ($device['os'] == "ironware" || $device['os_group'] == "ironware")
 
       if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "")
       {
-        discover_processor($valid_processor, $device, $usage_oid, $index, "ironware", $descr, $precision, $usage, $entPhysicalIndex, NULL);
+        discover_processor($valid['processor'], $device, $usage_oid, $index, "ironware", $descr, $precision, $usage, $entPhysicalIndex, NULL);
       }
     }
   }
@@ -44,4 +42,4 @@ if ($device['os'] == "ironware" || $device['os_group'] == "ironware")
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/junos.inc.php b/includes/discovery/processors/junos.inc.php
index 59f85fdd4..77bc45a46 100755
--- a/includes/discovery/processors/junos.inc.php
+++ b/includes/discovery/processors/junos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 ## JUNOS Processors
 if ($device['os'] == "junos")
 {
@@ -23,7 +21,7 @@ if ($device['os'] == "junos")
         $usage = $entry['jnxOperatingCPU'];
         if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "")
         {
-          discover_processor($valid_processor, $device, $usage_oid, $index, "junos", $descr, "1", $usage, NULL, NULL);
+          discover_processor($valid['processor'], $device, $usage_oid, $index, "junos", $descr, "1", $usage, NULL, NULL);
         }
       } ## End if checks
     } ## End Foreach
@@ -32,4 +30,4 @@ if ($device['os'] == "junos")
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/junose.inc.php b/includes/discovery/processors/junose.inc.php
index 500bec20d..4b1da5122 100755
--- a/includes/discovery/processors/junose.inc.php
+++ b/includes/discovery/processors/junose.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 ## JUNOSe Processors
 if ($device['os'] == "junose")
 {
@@ -21,7 +19,7 @@ if ($device['os'] == "junose")
 
       if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "")
       {
-        discover_processor($valid_processor, $device, $usage_oid, $index, "junose", $descr, "1", $usage, $entPhysicalIndex, NULL);
+        discover_processor($valid['processor'], $device, $usage_oid, $index, "junose", $descr, "1", $usage, $entPhysicalIndex, NULL);
       }
     }
   }
@@ -29,4 +27,4 @@ if ($device['os'] == "junose")
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/procurve.inc.php b/includes/discovery/processors/procurve.inc.php
index 3d5ef44e7..43aad036b 100755
--- a/includes/discovery/processors/procurve.inc.php
+++ b/includes/discovery/processors/procurve.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 ##
 ##  Hardcoded discovery of cpu usage on HP Procurve devices.
 ##
@@ -17,10 +15,10 @@ if ($device['os'] == "procurve")
 
   if (is_numeric($usage))
   {
-    discover_processor($valid_processor, $device, "1.3.6.1.4.1.11.2.14.11.5.1.9.6.1.0", "0", "procurve-fixed", $descr, "1", $usage, NULL, NULL);
+    discover_processor($valid['processor'], $device, "1.3.6.1.4.1.11.2.14.11.5.1.9.6.1.0", "0", "procurve-fixed", $descr, "1", $usage, NULL, NULL);
   }
 }
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/radlan.inc.php b/includes/discovery/processors/radlan.inc.php
index a899cabe2..3b95c313b 100644
--- a/includes/discovery/processors/radlan.inc.php
+++ b/includes/discovery/processors/radlan.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $valid_processor;
-
 ##
 ##  Hardcoded discovery of cpu usage on RADLAN devices.
 ##
@@ -15,10 +13,10 @@ if ($device['os'] == "radlan")
 
   if (is_numeric($usage))
   {
-    discover_processor($valid_processor, $device, ".1.3.6.1.4.1.89.1.9.0", "0", "radlan", $descr, "1", $usage, NULL, NULL);
+    discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.89.1.9.0", "0", "radlan", $descr, "1", $usage, NULL, NULL);
   }
 }
 
 unset ($processors_array);
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors/screenos.inc.php b/includes/discovery/processors/screenos.inc.php
index e1257d5ff..73d9f9336 100644
--- a/includes/discovery/processors/screenos.inc.php
+++ b/includes/discovery/processors/screenos.inc.php
@@ -11,8 +11,8 @@ if ($device['os'] == "screenos" && mysql_result(mysql_query("SELECT COUNT(*) FRO
 
   if (is_numeric($percent))
   {
-    discover_processor($valid_processor, $device, ".1.3.6.1.4.1.3224.16.1.3.0", "1", "screenos", "Processor", "1", $percent, NULL, NULL);
+    discover_processor($valid['processor'], $device, ".1.3.6.1.4.1.3224.16.1.3.0", "1", "screenos", "Processor", "1", $percent, NULL, NULL);
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/akcp.inc.php b/includes/discovery/temperatures/akcp.inc.php
index 860bf1396..e2c8c9b15 100644
--- a/includes/discovery/temperatures/akcp.inc.php
+++ b/includes/discovery/temperatures/akcp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "akcp" || $device['os'] == "minkelsrms")
 {
   $oids = snmp_walk($device, ".1.3.6.1.4.1.3854.1.2.2.1.16.1.4", "-Osqn", "");
@@ -38,4 +36,4 @@ if ($device['os'] == "akcp" || $device['os'] == "minkelsrms")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/aos-device.inc.php b/includes/discovery/temperatures/aos-device.inc.php
index b5cb754ac..1ffc52078 100644
--- a/includes/discovery/temperatures/aos-device.inc.php
+++ b/includes/discovery/temperatures/aos-device.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "aos")
 {
   echo("Alcatel-Lucent Device: ");
diff --git a/includes/discovery/temperatures/apc.inc.php b/includes/discovery/temperatures/apc.inc.php
index 96b06cf51..19b9000d1 100644
--- a/includes/discovery/temperatures/apc.inc.php
+++ b/includes/discovery/temperatures/apc.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "apc")
 {
   $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.2.2.2.0", "-OsqnU", "");
diff --git a/includes/discovery/temperatures/areca.inc.php b/includes/discovery/temperatures/areca.inc.php
index 5f461fe4c..ac25df88f 100644
--- a/includes/discovery/temperatures/areca.inc.php
+++ b/includes/discovery/temperatures/areca.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "areca")
 {
   $oids = snmp_walk($device, "1.3.6.1.4.1.18928.1.1.2.14.1.2", "-Osqn", "");
@@ -47,4 +45,4 @@ if ($device['os'] == "areca")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index e01fa1ce3..8068cbd3e 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $entity_temperature;
-
 if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os'] == "ios" || $device['os_group'] == "ios"))
 {
   echo("Cisco ");
@@ -27,6 +25,8 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` =
 
         discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
 
+	print_r($valid['sensor']);
+
       }
     }
   }
diff --git a/includes/discovery/temperatures/cometsystem-p85xx.inc.php b/includes/discovery/temperatures/cometsystem-p85xx.inc.php
index 3fb358ab3..0d2992117 100644
--- a/includes/discovery/temperatures/cometsystem-p85xx.inc.php
+++ b/includes/discovery/temperatures/cometsystem-p85xx.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "cometsystem-p85xx")
 {
   $regexp = '/
@@ -62,4 +60,4 @@ if ($device['os'] == "cometsystem-p85xx")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/dell.inc.php b/includes/discovery/temperatures/dell.inc.php
index 807b1ca2d..c11f786bd 100644
--- a/includes/discovery/temperatures/dell.inc.php
+++ b/includes/discovery/temperatures/dell.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if (strstr($device['hardware'], "dell"))
 {
   $oids = snmp_walk($device, "coolingDeviceDiscreteReading", "-Osqn", "MIB-Dell-10892");
@@ -24,4 +22,4 @@ if (strstr($device['hardware'], "dell"))
 }
 
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/ftos-c-series.inc.php b/includes/discovery/temperatures/ftos-c-series.inc.php
index 2ddabb43a..1915e95af 100644
--- a/includes/discovery/temperatures/ftos-c-series.inc.php
+++ b/includes/discovery/temperatures/ftos-c-series.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 ### Force10 C-Series
 
 #F10-C-SERIES-CHASSIS-MIB::chSysCardType.1 = INTEGER: lc4802E48TB(1024)
@@ -12,9 +10,7 @@
 if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
 {
   echo("FTOS C-Series ");
-
   $oids = snmpwalk_cache_oid($device, "chSysCardTemp", array(), "F10-C-SERIES-CHASSIS-MIB", $config['mib_dir'].":".$config['mib_dir']."/ftos" );
-
   if (is_array($oids))
   {
     foreach ($oids as $index => $entry)
@@ -22,16 +18,9 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       $entry['descr'] = "Slot ".$index;
       $entry['oid'] = ".1.3.6.1.4.1.6027.3.8.1.2.1.1.5.".$index;
       $entry['current'] = $entry['chSysCardTemp'];
-
       discover_sensor($valid['sensor'], 'temperature', $device, $entry['oid'], $index, 'ftos-cseries', $entry['descr'], '1', '1', NULL, NULL, NULL, NULL, $entry['current']);
-
     }
-
-    unset($entry);
-
   }
-
-  unset($oids);
 }
 
 ?>
diff --git a/includes/discovery/temperatures/ftos-e-series.inc.php b/includes/discovery/temperatures/ftos-e-series.inc.php
index 46308bafd..9130f3a94 100644
--- a/includes/discovery/temperatures/ftos-e-series.inc.php
+++ b/includes/discovery/temperatures/ftos-e-series.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 ### Force10 E-Series
 
 #F10-CHASSIS-MIB::chSysCardType.1 = INTEGER: rpmCardEF3(206)
@@ -28,8 +26,6 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-eseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
-
-  unset($oids);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/ftos-s-series.inc.php b/includes/discovery/temperatures/ftos-s-series.inc.php
index 4c462cc9b..392afbcb7 100644
--- a/includes/discovery/temperatures/ftos-s-series.inc.php
+++ b/includes/discovery/temperatures/ftos-s-series.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 ### Force10 S-Series
 
 #F10-S-SERIES-CHASSIS-MIB::chStackUnitTemp.1 = Gauge32: 47
@@ -21,12 +19,9 @@ if ($device['os'] == "ftos" || $device['os_group'] == "ftos")
       $descr = "Unit ".$index . " " . $entry['chStackUnitSysType'];
       $oid = ".1.3.6.1.4.1.6027.3.10.1.2.2.1.14.".$index;
       $current = $entry['chStackUnitTemp'];
-
       discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
     }
   }
-
-  unset($oids);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/ipoman.inc.php b/includes/discovery/temperatures/ipoman.inc.php
index bb2c198f7..8b11326f2 100644
--- a/includes/discovery/temperatures/ipoman.inc.php
+++ b/includes/discovery/temperatures/ipoman.inc.php
@@ -3,8 +3,6 @@
 # FIXME: EMD "stack" support?
 # FIXME: What to do with IPOMANII-MIB::ipmEnvEmdConfigTempOffset.0 ?
 
-
-
 if ($device['os'] == "ipoman")
 {
   echo(" IPOMANII-MIB ");
@@ -27,4 +25,4 @@ if ($device['os'] == "ipoman")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/ironware.inc.php b/includes/discovery/temperatures/ironware.inc.php
index ecb22429b..591453bd1 100644
--- a/includes/discovery/temperatures/ironware.inc.php
+++ b/includes/discovery/temperatures/ironware.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "ironware")
 {
   echo("IronWare ");
@@ -38,4 +36,4 @@ if ($device['os'] == "ironware")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/junos.inc.php b/includes/discovery/temperatures/junos.inc.php
index ba2c252d8..04987509c 100644
--- a/includes/discovery/temperatures/junos.inc.php
+++ b/includes/discovery/temperatures/junos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "junos" || $device['os_group'] == "junos")
 {
   echo("JunOS ");
@@ -32,4 +30,4 @@ if ($device['os'] == "junos" || $device['os_group'] == "junos")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/junose.inc.php b/includes/discovery/temperatures/junose.inc.php
index 971306754..ecfb8fa06 100644
--- a/includes/discovery/temperatures/junose.inc.php
+++ b/includes/discovery/temperatures/junose.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 ## JunOSe Temperatures
 
 if ($device['os'] == "junose")
@@ -27,4 +25,4 @@ if ($device['os'] == "junose")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/lm-sensors.inc.php b/includes/discovery/temperatures/lm-sensors.inc.php
index b8d6392d4..883a3edac 100644
--- a/includes/discovery/temperatures/lm-sensors.inc.php
+++ b/includes/discovery/temperatures/lm-sensors.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "linux")
 {
   $oids = snmp_walk($device, "lmTempSensorsDevice", "-Osqn", "LM-SENSORS-MIB");
@@ -29,4 +27,4 @@ if ($device['os'] == "linux")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/observernms-custom.inc.php b/includes/discovery/temperatures/observernms-custom.inc.php
index fd0eb96e3..7e0b707ab 100644
--- a/includes/discovery/temperatures/observernms-custom.inc.php
+++ b/includes/discovery/temperatures/observernms-custom.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os_group'] == "unix")
 {
   # FIXME snmp_walk
@@ -25,4 +23,4 @@ if ($device['os_group'] == "unix")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/papouch-tme.inc.php b/includes/discovery/temperatures/papouch-tme.inc.php
index 5e363e2d6..9d7d5ddb3 100644
--- a/includes/discovery/temperatures/papouch-tme.inc.php
+++ b/includes/discovery/temperatures/papouch-tme.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "papouch-tme")
 {
   echo("Papouch TME ");
@@ -17,4 +15,4 @@ if ($device['os'] == "papouch-tme")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index e3a6c0596..a63c08269 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "powerconnect")
 {
   $oids = snmp_get($device, ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0", "-OsqnU", "");
@@ -20,4 +18,4 @@ if ($device['os'] == "powerconnect")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/rfc1628.inc.php b/includes/discovery/temperatures/rfc1628.inc.php
index 7b3fb0e42..035434507 100644
--- a/includes/discovery/temperatures/rfc1628.inc.php
+++ b/includes/discovery/temperatures/rfc1628.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "netmanplus" || $device['os'] == "deltaups" || $device['os'] == "poweralert")
 {
   $oids = snmp_walk($device, "1.3.6.1.2.1.33.1.2.7", "-Osqn", "UPS-MIB");
diff --git a/includes/discovery/temperatures/sentry3.inc.php b/includes/discovery/temperatures/sentry3.inc.php
index b31727d89..ce94fa362 100644
--- a/includes/discovery/temperatures/sentry3.inc.php
+++ b/includes/discovery/temperatures/sentry3.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "sentry3")
 {
   $oids = snmp_walk($device, "tempHumidSensorTempValue", "-Osqn", "Sentry3-MIB");
@@ -32,9 +30,7 @@ if ($device['os'] == "sentry3")
         discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
       }
     }
-    unset($data);
   }
-  unset($oids);
 }
 
 ?>
diff --git a/includes/discovery/temperatures/supermicro.inc.php b/includes/discovery/temperatures/supermicro.inc.php
index e37803557..e25e5a42e 100644
--- a/includes/discovery/temperatures/supermicro.inc.php
+++ b/includes/discovery/temperatures/supermicro.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "linux")
 {
   # Supermicro sensors
@@ -38,4 +36,4 @@ if ($device['os'] == "linux")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/xups.inc.php b/includes/discovery/temperatures/xups.inc.php
index fc99fd1c8..3c9d2ac4a 100644
--- a/includes/discovery/temperatures/xups.inc.php
+++ b/includes/discovery/temperatures/xups.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == "powerware")
 {
   # XUPS-MIB::xupsEnvAmbientTemp.0 = INTEGER: 52
@@ -30,4 +28,4 @@ if ($device['os'] == "powerware")
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/temperatures/zyxel-ies.inc.php b/includes/discovery/temperatures/zyxel-ies.inc.php
index 8552f7adc..9aa9f88d0 100644
--- a/includes/discovery/temperatures/zyxel-ies.inc.php
+++ b/includes/discovery/temperatures/zyxel-ies.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-
-
 if ($device['os'] == 'ies')
 {
   echo("ZyXEL IES ");
@@ -25,4 +23,4 @@ if ($device['os'] == 'ies')
   }
 }
 
-?>
\ No newline at end of file
+?>