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

webui: Improve sensor graph legend alignment

Browse Source
This commit is contained in:
Tony Murray
2017-03-08 16:32:05 -06:00
committed by Neil Lathwood
parent 59ed2e31c1
commit 9c780a46cb
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
html/includes/graphs/device/sensor.inc.php
View File

@@ -2,50 +2,47 @@
require 'includes/graphs/common.inc.php';
$col_w = 7 + strlen($unit);
$rrd_options .= " COMMENT:'". str_pad($unit_long, 19) . str_pad("Cur", $col_w). str_pad("Min", $col_w) . "Max\\n'";
$iter = '1';
$rrd_options .= " COMMENT:'$unit_long Cur Min Max\\n'";
foreach (dbFetchRows('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? ORDER BY `sensor_index`', array($class, $device['device_id'])) as $sensor) {
foreach (dbFetchRows('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? ORDER BY `sensor_index`', array($class, $device['device_id'])) as $index => $sensor) {
// FIXME generic colour function
switch ($iter) {
case '1':
switch ($index % 7) {
case 0:
$colour = 'CC0000';
break;
case '2':
case 1:
$colour = '008C00';
break;
case '3':
case 2:
$colour = '4096EE';
break;
case '4':
case 3:
$colour = '73880A';
break;
case '5':
case 4:
$colour = 'D01F3C';
break;
case '6':
case 5:
$colour = '36393D';
break;
case '7':
case 6:
default:
$colour = 'FF0084';
unset($iter);
break;
}//end switch
$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 12);
$rrd_file = get_sensor_rrd($device, $sensor);
$rrd_options .= ' DEF:sensor'.$sensor['sensor_id']."=$rrd_file:sensor:AVERAGE ";
$rrd_options .= ' LINE1:sensor'.$sensor['sensor_id'].'#'.$colour.":'".str_replace(':', '\:', str_replace('\*', '*', $sensor['sensor_descr_fixed']))."'";
$rrd_options .= ' GPRINT:sensor'.$sensor['sensor_id'].':LAST:%4.1lf'.$unit.' ';
$rrd_options .= ' GPRINT:sensor'.$sensor['sensor_id'].':MIN:%4.1lf'.$unit.' ';
$rrd_options .= ' GPRINT:sensor'.$sensor['sensor_id'].':MAX:%4.1lf'.$unit.'\\\l ';
$sensor_descr_fixed = rrdtool_escape($sensor['sensor_descr'], 12);
$rrd_file = get_sensor_rrd($device, $sensor);
$rrd_options .= " DEF:sensor{$sensor['sensor_id']}=$rrd_file:sensor:AVERAGE";
$rrd_options .= " LINE1:sensor{$sensor['sensor_id']}#$colour:'$sensor_descr_fixed'";
$rrd_options .= " GPRINT:sensor{$sensor['sensor_id']}:LAST:%5.1lf$unit";
$rrd_options .= " GPRINT:sensor{$sensor['sensor_id']}:MIN:%5.1lf$unit";
$rrd_options .= " GPRINT:sensor{$sensor['sensor_id']}:MAX:%5.1lf$unit\\l ";
$iter++;
}//end foreach