From 8c840da62d704a5cbeebe2a11f8ee1e9563d0787 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 9 May 2011 08:18:30 +0000
Subject: [PATCH] moved ipmi_unit variable to config variable, patch by lenwe

git-svn-id: http://www.observium.org/svn/observer/trunk@2271 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/ipmi.inc.php |  6 ++----
 includes/polling/ipmi.inc.php   |  4 ++--
 includes/static-config.php      | 10 +++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/includes/discovery/ipmi.inc.php b/includes/discovery/ipmi.inc.php
index 8f84dcb371..0a89dd97df 100644
--- a/includes/discovery/ipmi.inc.php
+++ b/includes/discovery/ipmi.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-global $ipmi_unit;
-
 ## IPMI
 if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
 {
@@ -19,9 +17,9 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
     # BB +1.1V IOH     | 1.089      | Volts      | ok    | na        | 1.027     | 1.054     | 1.146     | 1.177     | na
     list($desc,$current,$unit,$state,$low_nonrecoverable,$low_limit,$low_warn,$high_warn,$high_limit,$high_nonrecoverable) = explode('|',$sensor);
     $index++;
-    if (trim($current) != "na" && $ipmi_unit[trim($unit)])
+    if (trim($current) != "na" && $config['ipmi_unit'][trim($unit)])
     {
-      discover_sensor($valid['sensor'], $ipmi_unit[trim($unit)], $device, trim($desc), $index, 'ipmi', trim($desc), '1', '1',
+      discover_sensor($valid['sensor'], $config['ipmi_unit'][trim($unit)], $device, trim($desc), $index, 'ipmi', trim($desc), '1', '1',
         (trim($low_limit) == 'na' ? NULL : trim($low_limit)), (trim($low_warn) == 'na' ? NULL : trim($low_warn)),
         (trim($high_warn) == 'na' ? NULL : trim($high_warn)), (trim($high_limit) == 'na' ? NULL : trim($high_limit)),
         $current, 'ipmi');
diff --git a/includes/polling/ipmi.inc.php b/includes/polling/ipmi.inc.php
index 4ac3be2dc1..584a025d98 100644
--- a/includes/polling/ipmi.inc.php
+++ b/includes/polling/ipmi.inc.php
@@ -15,8 +15,8 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
   foreach (explode("\n",$results) as $row)
   {
     list($desc,$value,$type,$status) = explode(',',$row);
-    $ipmi_sensor[$desc][$ipmi_unit[$type]]['value'] = $value;
-    $ipmi_sensor[$desc][$ipmi_unit[$type]]['unit'] = $type;
+    $ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['value'] = $value;
+    $ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['unit'] = $type;
   }
 
   while ($ipmisensors = mysql_fetch_assoc($ipmi_data))
diff --git a/includes/static-config.php b/includes/static-config.php
index ebf0ed3d4b..71bf38bcc4 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -960,11 +960,11 @@ $config['sixmonth']   = time() - (6 * 31 * 24 * 60 * 60);
 $config['year']       = time() - (365 * 24 * 60 * 60);
 
 # IPMI sensor type mappings
-$ipmi_unit['Volts']     = 'voltage';
-$ipmi_unit['degrees C'] = 'temperature';
-$ipmi_unit['RPM']       = 'fanspeed';
-$ipmi_unit['Watts']     = 'power';
-$ipmi_unit['discrete']  = '';
+$config['ipmi_unit']['Volts']     = 'voltage';
+$config['ipmi_unit']['degrees C'] = 'temperature';
+$config['ipmi_unit']['RPM']       = 'fanspeed';
+$config['ipmi_unit']['Watts']     = 'power';
+$config['ipmi_unit']['discrete']  = '';
 
 ## INCLUDE THE VMWARE DEFINITION FILE.
 require_once("vmware_guestid.inc.php");