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

fix: Replace \\\\l with \l on GPRINT lines (#4882)

Browse Source
This commit is contained in:
Neil Lathwood
2016-10-25 21:30:25 +01:00
committed by GitHub
parent 706aca09d1 5355c194a6
commit 0ccbc5e64c
20 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/device/asa_conns.inc.php
View File

@@ -26,4 +26,4 @@ $rrd_options .= ' AREA:connections_min';
$rrd_options .= " LINE1.5:connections#cc0000:'".rrdtool_escape('Current connections')."'";
$rrd_options .= ' GPRINT:connections_min:MIN:%4.0lf';
$rrd_options .= ' GPRINT:connections:LAST:%4.0lf';
$rrd_options .= ' GPRINT:connections_max:MAX:%4.0lf\\\\l';
$rrd_options .= ' GPRINT:connections_max:MAX:%4.0lf\l';

2
html/includes/graphs/device/toner.inc.php
View File

@@ -54,7 +54,7 @@ foreach (dbFetchRows('SELECT * FROM toner where device_id = ?', array($device['d
$rrd_options .= " LINE2:toner$toner_id#".$colour['left'].":'".$descr."'";
$rrd_options .= " GPRINT:toner$toner_id:LAST:'%5.0lf%%'";
$rrd_options .= " GPRINT:toner$toner_id:MIN:'%5.0lf%%'";
$rrd_options .= " GPRINT:toner$toner_id:MAX:%5.0lf%%\\\\l";
$rrd_options .= " GPRINT:toner$toner_id:MAX:%5.0lf%%\l";
$iter++;
}//end foreach

2
html/includes/graphs/generic_duplex.inc.php
View File

@@ -109,7 +109,7 @@ $rrd_options .= " COMMENT:\\n";
if ($print_total) {
$rrd_options .= " GPRINT:tot:'Total %6.2lf%s'";
$rrd_options .= " GPRINT:totin:'(In %6.2lf%s'";
$rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\\\\l'";
$rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\l'";
}
if ($percentile) {

2
html/includes/graphs/generic_simplex.inc.php
View File

@@ -99,7 +99,7 @@ if ($config['old_graphs']) {
$rrd_options .= " COMMENT:\\n";
if ($print_total) {
$rrd_options .= ' GPRINT:'.$ds.'_tot:Total\ %6.2lf%s\)\\\\l';
$rrd_options .= ' GPRINT:'.$ds.'_tot:Total\ %6.2lf%s\)\l';
}
if ($percentile) {

12
html/includes/graphs/multiport/bits_duo.inc.php
View File

@@ -88,36 +88,36 @@ if ($legend == 'no') {
$rrd_options .= ' GPRINT:inbitsb:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbitsb:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:doutbits_tot#C3D9FF:';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbitsb:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbitsb:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:inbits#ffcc99:Transit\ In\ ';
$rrd_options .= ' GPRINT:inbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:doutbits#ffcc99:';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s\l';
$rrd_options .= ' COMMENT:Total\ \ \ \ \ In\ ';
$rrd_options .= ' GPRINT:inbits_tot:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbits_tot:MAX:%6.2lf%s\l';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbits_tot:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbits_tot:MAX:%6.2lf%s\l';
$rrd_options .= ' LINE1:inbits#aa9966:';
$rrd_options .= ' LINE1:doutbits#aa9966:';

16
html/includes/graphs/multiport/bits_trio.inc.php
View File

@@ -138,39 +138,39 @@ if ($legend == 'no') {
$rrd_options .= ' GPRINT:inbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:doutbits_tot#cdeb8b:';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s\l';
$rrd_options .= ' LINE1.25:inbits_tot#aacc77:';
$rrd_options .= ' LINE1.25:doutbits_tot#aacc88:';
$rrd_options .= ' AREA:inbits_stot#c3d9ff:NGN\ \ In\ ';
$rrd_options .= ' GPRINT:inbitsb:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsb:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbitsb:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:doutbits_stot#c3d9ff:';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbitsb:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsb:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbitsb:MAX:%6.2lf%s\l';
$rrd_options .= ' LINE1:inbits_stot#b3a9cf:';
$rrd_options .= ' LINE1:doutbits_stot#b3a9cf:';
$rrd_options .= ' AREA:inbitsc#ffcc99:Wave\ In\ ';
$rrd_options .= ' GPRINT:inbitsc:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsc:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsc:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbitsc:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbitsc:MAX:%6.2lf%s\l';
$rrd_options .= ' AREA:doutbitsc#ffcc99:';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbitsc:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsc:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsc:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbitsc:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbitsc:MAX:%6.2lf%s\l';
$rrd_options .= ' LINE1.25:inbitsc#ddaa88';
$rrd_options .= ' LINE1.25:doutbitsc#ddaa88';
$rrd_options .= ' LINE1:inbits#006600:';
@@ -183,12 +183,12 @@ if ($legend == 'no') {
$rrd_options .= ' GPRINT:inbits_tot:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:inbits_tot:MAX:%6.2lf%s\l';
$rrd_options .= ' COMMENT:\ \ \ \ \ \ \ Out';
$rrd_options .= ' GPRINT:outbits_tot:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:MIN:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l';
$rrd_options .= ' GPRINT:outbits_tot:MAX:%6.2lf%s\l';
}//end if
if ($width <= '300') {

2
html/includes/graphs/sensor/charge.inc.php
View File

@@ -24,7 +24,7 @@ $rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensorcold#CCCCFF";
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/current.inc.php
View File

@@ -12,7 +12,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfA";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfA';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfA\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfA\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/dbm.inc.php
View File

@@ -12,7 +12,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdBm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdBm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/fanspeed.inc.php
View File

@@ -9,7 +9,7 @@ $rrd_options .= " COMMENT:' Last Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 20)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfrpm';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfrpm\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfrpm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/frequency.inc.php
View File

@@ -11,7 +11,7 @@ $sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 28), 0,
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfHz';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfHz\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfHz\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/humidity.inc.php
View File

@@ -21,7 +21,7 @@ $rrd_options .= ' AREA:sensor_min#ffffffff';
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= ' LINE1:sensorwarm#660000';
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/load.inc.php
View File

@@ -14,7 +14,7 @@ $rrd_options .= ' CDEF:sensorcold=sensor_min,20,LT,sensor,UNKN,IF';
$rrd_options .= ' AREA:sensor_min#ffffffff';
$rrd_options .= " LINE1:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 28)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%%';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%%\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

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

@@ -21,7 +21,7 @@ if ($sensor['poller_type'] == "ipmi") {
}
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfW';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfW\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfW\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/runtime.inc.php
View File

@@ -6,7 +6,7 @@ $sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 28), 0,
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfMin';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfMin\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfMin\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';
}

2
html/includes/graphs/sensor/signal.inc.php
View File

@@ -11,7 +11,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdBm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdBm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdBm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/state.inc.php
View File

@@ -10,7 +10,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 21)."'";
$rrd_options .= ' GPRINT:sensor:MIN:%4.1lf';
$rrd_options .= ' GPRINT:sensor:MAX:%4.1lf';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf\\\\l';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/sensor/voltage.inc.php
View File

@@ -17,7 +17,7 @@ $rrd_options .= ' AREA:sensor_min#ffffffff';
// $rrd_options .= " AREA:sensor#FFFF99";
$rrd_options .= " LINE1.5:sensor#cc0000:'".rrdtool_escape($sensor['sensor_descr'], 22)."'";
$rrd_options .= ' GPRINT:sensor:LAST:%6.2lfV';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfV\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%6.2lfV\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:'.$sensor['sensor_limit'].'#999999::dashes';

2
html/includes/graphs/service/availability.inc.php
View File

@@ -18,4 +18,4 @@ $rrd_options .= " LINE1.5:percent#009900:'".$service_text."'";
// Ugly hack :(
$rrd_options .= ' LINE1.5:percentdown#cc0000';
$rrd_options .= ' GPRINT:status:LAST:%3.0lf';
$rrd_options .= ' GPRINT:percent:AVERAGE:%3.5lf%%\\\\l';
$rrd_options .= ' GPRINT:percent:AVERAGE:%3.5lf%%\l';

2
html/includes/graphs/toner/usage.inc.php
View File

@@ -21,4 +21,4 @@ $rrd_options .= ' LINE1:toner'.$toner['toner_id'].'#'.$colour['left'].":'".$desc
$rrd_options .= ' AREA:toner'.$toner['toner_id'].'#'.$background['right'].':';
$rrd_options .= ' GPRINT:toner'.$toner['toner_id'].":LAST:'%5.0lf%%'";
$rrd_options .= ' GPRINT:toner'.$toner['toner_id'].':MAX:%5.0lf%%\\\\l';
$rrd_options .= ' GPRINT:toner'.$toner['toner_id'].':MAX:%5.0lf%%\l';