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
This commit is contained in:
Tom Laermans
2011-05-09 08:18:30 +00:00
parent 291cbb2ec2
commit 8c840da62d
3 changed files with 9 additions and 11 deletions

View File

@@ -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');