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

Show unit on IPMI poll, minor fix to CHANGELOG

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1765 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-12-16 11:25:02 +00:00
parent 69ce49fe2e
commit 6f4e5b5170
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -1,7 +1,7 @@
For more granular updates check http://twitter.com/observium or
http://www.observium.org/websvn/listing.php?repname=observer
Release 0.10.7 ( 19th July 2010 )
Release 0.10.7.1 ( 19th July 2010 )
* Minor bugfix release

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

@@ -15,14 +15,16 @@ 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;
$ipmi_sensor[$desc][$ipmi_unit[$type]]['value'] = $value;
$ipmi_sensor[$desc][$ipmi_unit[$type]]['unit'] = $type;
}
while ($ipmisensors = mysql_fetch_array($ipmi_data))
{
echo("Updating IPMI sensor " . $ipmisensors['sensor_descr'] . "... ");
$sensor = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']];
$sensor = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['value'];
$unit = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['unit'];
$sensorrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($ipmisensors['sensor_class'].'-'.$ipmisensors['sensor_type'].'-'.$ipmisensors['sensor_index'] . ".rrd");
@@ -45,7 +47,7 @@ if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
RRA:MIN:0.5:288:797`;
}
echo($sensor . " \n"); # FIXME unit should follow?
echo($sensor . " $unit\n");
rrdtool_update($sensorrrd,"N:$sensor");