mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved ipmi_unit variable to config variable, patch by lenwe

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/discovery/ipmi.inc.php
View File

@@ -1,7 +1,5 @@
<?php <?php
global $ipmi_unit;
## IPMI ## IPMI
if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname')) 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 # 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); list($desc,$current,$unit,$state,$low_nonrecoverable,$low_limit,$low_warn,$high_warn,$high_limit,$high_nonrecoverable) = explode('|',$sensor);
$index++; $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($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)), (trim($high_warn) == 'na' ? NULL : trim($high_warn)), (trim($high_limit) == 'na' ? NULL : trim($high_limit)),
$current, 'ipmi'); $current, 'ipmi');

4
includes/polling/ipmi.inc.php
View File

@@ -15,8 +15,8 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
foreach (explode("\n",$results) as $row) foreach (explode("\n",$results) as $row)
{ {
list($desc,$value,$type,$status) = explode(',',$row); list($desc,$value,$type,$status) = explode(',',$row);
$ipmi_sensor[$desc][$ipmi_unit[$type]]['value'] = $value; $ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['value'] = $value;
$ipmi_sensor[$desc][$ipmi_unit[$type]]['unit'] = $type; $ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['unit'] = $type;
} }
while ($ipmisensors = mysql_fetch_assoc($ipmi_data)) while ($ipmisensors = mysql_fetch_assoc($ipmi_data))

10
includes/static-config.php
View File

@@ -960,11 +960,11 @@ $config['sixmonth'] = time() - (6 * 31 * 24 * 60 * 60);
$config['year'] = time() - (365 * 24 * 60 * 60); $config['year'] = time() - (365 * 24 * 60 * 60);
# IPMI sensor type mappings # IPMI sensor type mappings
$ipmi_unit['Volts'] = 'voltage'; $config['ipmi_unit']['Volts'] = 'voltage';
$ipmi_unit['degrees C'] = 'temperature'; $config['ipmi_unit']['degrees C'] = 'temperature';
$ipmi_unit['RPM'] = 'fanspeed'; $config['ipmi_unit']['RPM'] = 'fanspeed';
$ipmi_unit['Watts'] = 'power'; $config['ipmi_unit']['Watts'] = 'power';
$ipmi_unit['discrete'] = ''; $config['ipmi_unit']['discrete'] = '';
## INCLUDE THE VMWARE DEFINITION FILE. ## INCLUDE THE VMWARE DEFINITION FILE.
require_once("vmware_guestid.inc.php"); require_once("vmware_guestid.inc.php");