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

Merge pull request #4016 from crcro/ipmi_rewrites

Browse Source 
ipmi sensors rewrite based on known hardware id
This commit is contained in:
Neil Lathwood
2016-08-11 23:37:40 +01:00
committed by GitHub
parent f9ba459e08 1281ae4bd3
commit 2aaf9559ea
6 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
html/includes/functions.inc.php
View File

@@ -1346,3 +1346,16 @@ function get_ports_from_type($given_types) {
$ports = dbFetchRows("SELECT * FROM `ports` as I, `devices` AS D WHERE $type_where AND I.device_id = D.device_id ORDER BY I.ifAlias", $type_param);
return $ports;
}
function ipmiSensorName($hardwareId, $sensorIpmi, $rewriteArray)
{
if(count($rewriteArray[$hardwareId]) > 0) {
if($rewriteArray[$hardwareId][$sensorIpmi] != "") {
return $rewriteArray[$hardwareId][$sensorIpmi];
} else {
return $sensorIpmi;
}
} else {
return $sensorIpmi;
}
}

9
html/includes/graphs/sensor/power.inc.php
View File

@@ -14,8 +14,13 @@ $rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= ' AREA:sensor_max#c5c5c5';
$rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensor#FFFF99";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 22)."'";
if($sensor['poller_type'] == "ipmi")
{
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr'], $ipmiSensorsNames), 21)."'";
} else {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
}
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfW';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfW\\\\l';

10
html/includes/graphs/sensor/temperature.inc.php
View File

@@ -1,5 +1,4 @@
<?php
$scale_min = '0';
$scale_max = '60';
@@ -16,7 +15,13 @@ $rrd_options .= ' CDEF:sensor_diff=sensor_max,sensor_min,-';
$rrd_options .= ' AREA:sensor_min';
$rrd_options .= ' AREA:sensor_diff#c5c5c5::STACK';
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
if($sensor['poller_type'] == "ipmi")
{
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape(ipmiSensorName($device['hardware'], $sensor['sensor_descr'], $ipmiSensorsNames), 21)."'";
} else {
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
}
$rrd_options .= ' GPRINT:sensor_min:MIN:%4.1lfC';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lfC';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lfC\\l';
@@ -28,3 +33,4 @@ if (is_numeric($sensor['sensor_limit'])) {
if (is_numeric($sensor['sensor_limit_low'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit_low'].'#999999::dashes';
}