clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix escaped chars for graphs legends (#12841)" (#12874)

Browse Source 
This reverts commit 9ae652a15c.
This commit is contained in:
Tony Murray 2021-05-13 13:13:10 -05:00 committed by GitHub
parent 77a17dac88
commit 730ea3b008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/html/graphs/device/mempool.inc.php
View File

@ -71,7 +71,7 @@ foreach ($mempools as $index => $mempool) {
if ($mempool->mempool_class == 'system') {
// add system
$legend_sections[1] .= " LINE1:mempooltotal$index#AAAAAA:'Total '";
$legend_sections[1] .= " GPRINT:mempooltotal$index:LAST:%6.2lf%siB\\\\l ";
$legend_sections[1] .= " GPRINT:mempooltotal$index:LAST:%6.2lf%siB\\l ";
}
if ($mempool->mempool_class == 'swap') {
$section = 2;
@ -88,7 +88,7 @@ foreach ($mempools as $index => $mempool) {
$legend_sections[$section] .= " GPRINT:mempoolpercent$index:MIN:%3.0lf%%";
$legend_sections[$section] .= " GPRINT:mempoolpercent$index:MAX:%3.0lf%%";
$legend_sections[$section] .= " GPRINT:mempoolpercent$index:LAST:%3.0lf%%";
$legend_sections[$section] .= " GPRINT:mempoolused$index:LAST:%6.2lf%siB\\\\l ";
$legend_sections[$section] .= " GPRINT:mempoolused$index:LAST:%6.2lf%siB\\l ";
}
}
@ -102,7 +102,7 @@ if (! empty($free_indexes)) {
$legend_sections[1] .= ' GPRINT:mempoolfree:MIN:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolfree:LAST:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolfree:MAX:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolfreebytes:LAST:%6.2lf%siB\\\\l';
$legend_sections[1] .= ' GPRINT:mempoolfreebytes:LAST:%6.2lf%siB\l';
if ($available === null) {
$rrd_options .= " CDEF:mempoolavailablebytes=mempoolfree{$free_indexes[0]}";
@ -116,7 +116,7 @@ if (! empty($free_indexes)) {
$legend_sections[1] .= ' GPRINT:mempoolavailable:MIN:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolavailable:LAST:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolavailable:MAX:%3.0lf%%';
$legend_sections[1] .= ' GPRINT:mempoolavailablebytes:LAST:%6.2lf%siB\\\\l';
$legend_sections[1] .= ' GPRINT:mempoolavailablebytes:LAST:%6.2lf%siB\l';
}
}

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

@ -36,7 +36,7 @@ foreach ($components as $id => $array) {
$rrd_additions .= ' LINE1.25:DS' . $count . '#' . $color . ":'" . str_pad(substr($array['peer'], 0, 15), 15) . "'" . $stack;
$rrd_additions .= ' GPRINT:DS' . $count . ':LAST:%5.0lf ';
$rrd_additions .= ' GPRINT:DS' . $count . ':MIN:%7.0lf ';
$rrd_additions .= ' GPRINT:DS' . $count . ':MAX:%7.0lf\\\\l ';
$rrd_additions .= ' GPRINT:DS' . $count . ':MAX:%7.0lf\\l ';
$count++;
}
}

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

@ -43,6 +43,6 @@ foreach (dbFetchRows('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `devi
$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 ";
$rrd_options .= " GPRINT:sensor{$sensor['sensor_id']}:MAX:%5.1lf$unit\\l ";
$iter++;
}//end foreach

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

@ -42,6 +42,6 @@ foreach ($storages as $storage) {
$rrd_options .= " LINE1.25:{$storage['storage_id']}perc#" . $colour . ":'$descr'";
$rrd_options .= " GPRINT:{$storage['storage_id']}size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:{$storage['storage_id']}used:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:{$storage['storage_id']}perc:LAST:%5.2lf%%\\\\l";
$rrd_options .= " GPRINT:{$storage['storage_id']}perc:LAST:%5.2lf%%\\l";
$iter++;
}//end foreach

4
includes/html/graphs/device/wireless-sensor.inc.php
View File

@ -47,7 +47,7 @@ if (count($sensors) == 1 && $unit_long == $sensors[0]['sensor_descr']) {
}
$col_w = 7 + strlen($unit);
$rrd_options .= " COMMENT:'" . str_pad($unit_long, 35) . str_pad('Cur', $col_w) . str_pad('Min', $col_w) . 'Max\\n\'';
$rrd_options .= " COMMENT:'" . str_pad($unit_long, 35) . str_pad('Cur', $col_w) . str_pad('Min', $col_w) . "Max\\n'";
foreach ($sensors as $index => $sensor) {
$sensor_id = $sensor['sensor_id'];
@ -65,6 +65,6 @@ foreach ($sensors as $index => $sensor) {
$rrd_options .= " LINE1.5:$output_def$sensor_id#$colour:'$sensor_descr_fixed'";
$rrd_options .= " GPRINT:$output_def$sensor_id:LAST:'$num$unit'";
$rrd_options .= " GPRINT:$output_def$sensor_id:MIN:'$num$unit'";
$rrd_options .= " GPRINT:$output_def$sensor_id:MAX:'$num$unit'" . '\\\\l ';
$rrd_options .= " GPRINT:$output_def$sensor_id:MAX:'$num$unit'\\l ";
$iter++;
}//end foreach

10
includes/html/graphs/generic_data.inc.php
View File

@ -134,7 +134,7 @@ if ($format == 'octets' || $format == 'bytes') {
$format = 'bits';
}
$rrd_options .= " COMMENT:'bps Now Ave Max " . Config::get('percentile_value') . 'th %\\n\'';
$rrd_options .= " COMMENT:'bps Now Ave Max " . Config::get('percentile_value') . "th %\\n'";
$rrd_options .= ' AREA:in' . $format . '_max#D7FFC7' . $stacked['transparency'] . ':';
$rrd_options .= ' AREA:in' . $format . '#90B040' . $stacked['transparency'] . ':';
@ -142,7 +142,7 @@ $rrd_options .= ' LINE:in' . $format . "#608720:'In '";
$rrd_options .= ' GPRINT:in' . $format . ':LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in' . $format . ':AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_max:MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_in:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_in:%6.' . $float_precision . 'lf%s\\n';
$rrd_options .= ' AREA:dout' . $format . '_max#E0E0FF' . $stacked['transparency'] . ':';
$rrd_options .= ' AREA:dout' . $format . '#8080C0' . $stacked['transparency'] . ':';
@ -150,7 +150,7 @@ $rrd_options .= ' LINE:dout' . $format . "#606090:'Out'";
$rrd_options .= ' GPRINT:out' . $format . ':LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:out' . $format . ':AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_max:MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_out:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_out:%6.' . $float_precision . 'lf%s\\n';
if (Config::get('rrdgraph_real_percentile')) {
$rrd_options .= ' HRULE:percentilehigh#FF0000:"Highest"';
@ -181,11 +181,11 @@ if ($_GET['previous'] == 'yes') {
$rrd_options .= ' LINE1.25:in' . $format . "X#333300:'Prev In '\t";
$rrd_options .= ' GPRINT:in' . $format . 'X:AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in' . $format . '_maxX:MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_inX:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_inX:%6.' . $float_precision . 'lf%s\\n';
$rrd_options .= ' LINE1.25:dout' . $format . "X#000099:'Prev Out '\t";
$rrd_options .= ' GPRINT:out' . $format . 'X:AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:out' . $format . '_maxX:MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_outX:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_outX:%6.' . $float_precision . 'lf%s\\n';
$rrd_options .= " GPRINT:totX:'Total %6." . $float_precision . "lf%sB'";
$rrd_options .= " GPRINT:totinX:'(In %6." . $float_precision . "lf%sB'";
$rrd_options .= " GPRINT:totoutX:'Out %6." . $float_precision . "lf%sB)\\l'";

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

@ -97,7 +97,7 @@ if ($percentile) {
$rrd_options .= ' ' . $percentile . 'th %';
}
$rrd_options .= '\\n\'';
$rrd_options .= "\\n'";
$rrd_options .= ' LINE1.25:in#' . $colour_line_in . ":'" . $in_text . "'";
$rrd_options .= ' GPRINT:in:LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in:AVERAGE:%6.' . $float_precision . 'lf%s';
@ -107,7 +107,7 @@ if ($percentile) {
$rrd_options .= ' GPRINT:percentile_in:%6.' . $float_precision . 'lf%s';
}
$rrd_options .= ' COMMENT:\\\\n';
$rrd_options .= ' COMMENT:\\n';
$rrd_options .= ' AREA:dout#' . $colour_area_out . $stacked['transparency'] . ':';
$rrd_options .= ' LINE1.25:dout#' . $colour_line_out . ":'" . $out_text . "'";
$rrd_options .= ' GPRINT:out:LAST:%6.' . $float_precision . 'lf%s';
@ -118,12 +118,12 @@ if ($percentile) {
$rrd_options .= ' GPRINT:percentile_out:%6.' . $float_precision . 'lf%s';
}
$rrd_options .= ' COMMENT:\\\\n';
$rrd_options .= ' COMMENT:\\n';
if ($print_total) {
$rrd_options .= " GPRINT:tot:'Total %6." . $float_precision . "lf%s'";
$rrd_options .= " GPRINT:totin:'(In %6." . $float_precision . "lf%s'";
$rrd_options .= " GPRINT:totout:'Out %6." . $float_precision . "lf%s)\\\\l'";
$rrd_options .= " GPRINT:totout:'Out %6." . $float_precision . "lf%s)\l'";
}
if ($percentile) {
@ -132,7 +132,7 @@ if ($percentile) {
}
if ($_GET['previous'] == 'yes') {
$rrd_options .= ' LINE1.25:in' . $format . "X#666666:'Prev In \\n'";
$rrd_options .= ' LINE1.25:in' . $format . "X#666666:'Prev In \\\\n'";
$rrd_options .= ' AREA:in' . $format . 'X#99999966' . $stacked['transparency'] . ':';
$rrd_options .= ' LINE1.25:dout' . $format . "X#666666:'Prev Out'";
$rrd_options .= ' AREA:dout' . $format . 'X#99999966' . $stacked['transparency'] . ':';

14
includes/html/graphs/generic_multi_bits_separated.inc.php
View File

@ -39,13 +39,13 @@ if (! $noagg || ! $nodetails) {
if (! $nototal) {
$rrd_options .= sprintf(" COMMENT:'%8s'", 'Total');
}
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$nototal = true;
$rrd_options .= sprintf(" COMMENT:'%s'", substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)));
$rrd_options .= sprintf(" COMMENT:'%12s'", 'Now');
$rrd_options .= sprintf(" COMMENT:'%10s'", 'Avg');
$rrd_options .= sprintf(" COMMENT:'%10s\\l'", 'Max');
$rrd_options .= sprintf(" COMMENT:'%10s\l'", 'Max');
}
}
@ -96,7 +96,7 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= ' GPRINT:totin' . $i . ':%6.' . $float_precision . "lf%s$total_units";
}
$rrd_options .= '\\\\l';
$rrd_options .= '\l';
}
$rrd_options .= " 'HRULE:0#" . $colour_out . ':' . $descr_out . "'";
@ -110,10 +110,10 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= ' GPRINT:totout' . $i . ':%6.' . $float_precision . "lf%s$total_units";
}
$rrd_options .= '\\\\l';
$rrd_options .= '\l';
}
$rrd_options .= " 'COMMENT:\\l'";
$rrd_options .= " 'COMMENT:\l'";
if ($i >= 1) {
$aggr_in .= ',';
@ -148,7 +148,7 @@ if (! $noagg) {
$rrd_options .= ' GPRINT:totalin:%6.' . $float_precision . "lf%s$total_units";
}
$rrd_options .= '\\\\n';
$rrd_options .= '\\n';
$rrd_options .= " COMMENT:'" . substr(str_pad('Aggregate', ($descr_len + 4)), 0, ($descr_len + 4)) . 'Out' . "'";
$rrd_options .= ' GPRINT:aggroutbits:LAST:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:aggroutbits:AVERAGE:%6.' . $float_precision . "lf%s$units";
@ -157,7 +157,7 @@ if (! $noagg) {
$rrd_options .= ' GPRINT:totalout:%6.' . $float_precision . "lf%s$total_units";
}
$rrd_options .= '\\\\n';
$rrd_options .= '\\n';
}
if ($custom_graph) {

4
includes/html/graphs/generic_multi_data.inc.php
View File

@ -109,12 +109,12 @@ if ($i) {
$rrd_options .= ' GPRINT:in' . $format . ':LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in' . $format . ':AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:in' . $format . ':MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_in:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_in:%6.' . $float_precision . 'lf%s\\n';
$rrd_options .= ' AREA:dout' . $format . '#' . $colour_area_out . $stacked['transparency'] . ':Out';
$rrd_options .= ' GPRINT:out' . $format . ':LAST:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:out' . $format . ':AVERAGE:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:out' . $format . ':MAX:%6.' . $float_precision . 'lf%s';
$rrd_options .= ' GPRINT:percentile_out:%6.' . $float_precision . 'lf%s\\\\n';
$rrd_options .= ' GPRINT:percentile_out:%6.' . $float_precision . 'lf%s\\n';
$rrd_options .= " GPRINT:tot:'Total %6." . $float_precision . "lf%sB'";
$rrd_options .= " GPRINT:totin:'(In %6." . $float_precision . "lf%sB'";
$rrd_options .= " GPRINT:totout:'Out %6." . $float_precision . "lf%sB)\\l'";

10
includes/html/graphs/generic_multi_data_separated.inc.php
View File

@ -33,9 +33,9 @@ if ($width > '500') {
$rrd_options .= " COMMENT:'Total '";
}
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . " Now Ave Max\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . " Now Ave Max\l'";
}
if (! isset($multiplier)) {
@ -84,7 +84,7 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= ' AREA:inB' . $i . '#' . $colour_in . $stacked['transparency'] . ":'" . $descr . "'$stack";
$rrd_options .= ' GPRINT:inB' . $i . ':LAST:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:inB' . $i . ':AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:inB' . $i . ':MAX:%6.' . $float_precision . "lf%s$units\\\\l";
$rrd_options .= ' GPRINT:inB' . $i . ':MAX:%6.' . $float_precision . "lf%s$units\l";
if (! $nototal) {
$rrd_options .= ' GPRINT:totin' . $i . ':%6.' . $float_precision . "lf%s$total_units";
@ -94,13 +94,13 @@ foreach ($rrd_list as $rrd) {
$rrd_optionsb .= " 'AREA:outB" . $i . '_neg#' . $colour_out . $stacked['transparency'] . ":$stack'";
$rrd_options .= ' GPRINT:outB' . $i . ':LAST:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:outB' . $i . ':AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:outB' . $i . ':MAX:%6.' . $float_precision . "lf%s$units\\\\l";
$rrd_options .= ' GPRINT:outB' . $i . ':MAX:%6.' . $float_precision . "lf%s$units\l";
if (! $nototal) {
$rrd_options .= ' GPRINT:totout' . $i . ':%6.' . $float_precision . "lf%s$total_units";
}
$rrd_options .= " 'COMMENT:\\l'";
$rrd_options .= " 'COMMENT:\l'";
$i++;
$iter++;
}

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

@ -26,7 +26,7 @@ if ($nototal) {
$unitlen += '2';
}
$rrd_options .= " COMMENT:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($unit_text, $descr_len) . " Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($unit_text, $descr_len) . " Now Min Max Avg\l'";
$i = 0;
$iter = 0;

6
includes/html/graphs/generic_multi_line_exact_numbers.inc.php
View File

@ -16,13 +16,13 @@ if ($printtotal === 1) {
$unit_text = str_pad(truncate($unit_text, $unitlen), $unitlen);
if ($width > '500') {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
if ($printtotal === 1) {
$rrd_options .= " COMMENT:'Total '";
}
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
}
foreach ($rrd_list as $rrd) {

16
includes/html/graphs/generic_multi_seperated.inc.php
View File

@ -60,7 +60,7 @@ if ($width > '500') {
}
if ($_GET['previous']) {
$rrd_options .= sprintf(" COMMENT:'\\t'", '');
$rrd_options .= sprintf(" COMMENT:'\t'", '');
$rrd_options .= sprintf(" COMMENT:'%10s'", 'P Avg');
$rrd_options .= sprintf(" COMMENT:'%10s'", 'P Max');
if (! $args['nototal']) {
@ -95,8 +95,8 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= ' CDEF:bits' . $i . '=inbits' . $i . ',outbits' . $i . ',+';
if ($_GET['previous']) {
$rrd_options .= ' DEF:inB' . $i . 'X=' . $rrd['filename'] . ':' . $rrd['ds_in'] . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' DEF:outB' . $i . 'X=' . $rrd['filename'] . ':' . $rrd['ds_out'] . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' DEF:inB' . $i . 'X=' . $rrd['filename'] . ':' . $ds_in . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' DEF:outB' . $i . 'X=' . $rrd['filename'] . ':' . $ds_out . ':AVERAGE:start=' . $prev_from . ':end=' . $from;
$rrd_options .= ' CDEF:octets' . $i . 'X=inB' . $i . 'X,outB' . $i . 'X,+';
$rrd_options .= ' CDEF:inbits' . $i . 'X=inB' . $i . 'X' . ",$multiplier,* ";
$rrd_options .= ' CDEF:outbits' . $i . 'X=outB' . $i . 'X' . ",$multiplier,*";
@ -147,7 +147,7 @@ foreach ($rrd_list as $rrd) {
}
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\t'";
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:inbits' . $i . 'X:AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:inbits' . $i . 'X:MAX:%6.' . $float_precision . "lf%s$units";
if (! $args['nototal']) {
@ -167,7 +167,7 @@ foreach ($rrd_list as $rrd) {
}
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\t'";
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:outbits' . $i . 'X:AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:outbits' . $i . 'X:MAX:%6.' . $float_precision . "lf%s$units";
if (! $args['nototal']) {
@ -238,7 +238,7 @@ if (! $args['nototal']) {
$rrd_options .= ' GPRINT:inbits:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:totin:%6.' . $float_precision . "lf%s$total_units";
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\t'";
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:inbitsX:AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:inbitsX:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:totinX:%6.' . $float_precision . "lf%s$total_units";
@ -251,7 +251,7 @@ if (! $args['nototal']) {
$rrd_options .= ' GPRINT:outbits:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:totout:%6.' . $float_precision . "lf%s$total_units";
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\t'";
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:outbitsX:AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:outbitsX:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:totoutX:%6.' . $float_precision . "lf%s$total_units";
@ -264,7 +264,7 @@ if (! $args['nototal']) {
$rrd_options .= ' GPRINT:bits:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:tot:%6.' . $float_precision . "lf%s$total_units";
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\t'";
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:bitsX:AVERAGE:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:bitsX:MAX:%6.' . $float_precision . "lf%s$units";
$rrd_options .= ' GPRINT:totX:%6.' . $float_precision . "lf%s$total_units";

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

@ -11,7 +11,7 @@ if ($nototal) {
$unitlen += '2';
}
$rrd_options .= " COMMENT:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($unit_text, $descr_len) . " Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($unit_text, $descr_len) . " Now Min Max Avg\l'";
$unitlen = '10';
if ($nototal) {

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

@ -96,10 +96,10 @@ if (\LibreNMS\Config::get('old_graphs')) {
}
$rrd_options .= '\\\\n';
$rrd_options .= ' COMMENT:\\\\n';
$rrd_options .= ' COMMENT:\\n';
if ($print_total) {
$rrd_options .= ' GPRINT:' . $ds . '_tot:Total\ %6.' . $float_precision . 'lf%s\)\\\\l';
$rrd_options .= ' GPRINT:' . $ds . '_tot:Total\ %6.' . $float_precision . 'lf%s\)\l';
}
if ($percentile) {

6
includes/html/graphs/generic_v3_multiline.inc.php
View File

@ -16,13 +16,13 @@ if ($printtotal === 1) {
$unit_text = str_pad(truncate($unit_text, $unitlen), $unitlen);
if ($width > '500') {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
if ($printtotal === 1) {
$rrd_options .= " COMMENT:'Total '";
}
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
}
foreach ($rrd_list as $rrd) {

6
includes/html/graphs/generic_v3_multiline_float.inc.php
View File

@ -16,13 +16,13 @@ if ($printtotal === 1) {
$unit_text = str_pad(truncate($unit_text, $unitlen), $unitlen);
if ($width > '500') {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
if ($printtotal === 1) {
$rrd_options .= " COMMENT:'Total '";
}
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 10)), 0, ($descr_len + 10)) . "Now Min Max Avg\l'";
}
foreach ($rrd_list as $rrd) {

12
includes/html/graphs/mempool/usage.inc.php
View File

@ -18,9 +18,9 @@ if ($width > '500') {
if ($width > '500') {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . "Total Used Free( Min Max Ave)'";
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . "Total Used Free\\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . "Total Used Free\l'";
}
$descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr(short_hrDeviceDescr($mempool['mempool_descr']), $descr_len);
@ -42,21 +42,21 @@ if ($width > '500') {
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:MIN:%5.2lf%sB";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:MAX:%5.2lf%sB";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:AVERAGE:%5.2lf%sB\\\\n";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:AVERAGE:%5.2lf%sB\\n";
$rrd_options .= " COMMENT:'" . substr(str_pad('', ($descr_len + 12)), 0, ($descr_len + 12)) . " '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:LAST:'%5.2lf%% '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}percx:LAST:'%5.2lf%% '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:MIN:'%5.2lf%% '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:MAX:'%5.2lf%% '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:AVERAGE:%5.2lf%%\\\\n";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:AVERAGE:%5.2lf%%\\n";
} else {
$rrd_options .= " LINE1.25:{$mempool['mempool_id']}perc#" . $background['left'] . ":'$descr'";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}used:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}free:LAST:%6.2lf%sB";
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
$rrd_options .= " COMMENT:'" . substr(str_pad('', ($descr_len + 12)), 0, ($descr_len + 12)) . " '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}perc:LAST:'%5.2lf%% '";
$rrd_options .= " GPRINT:{$mempool['mempool_id']}percx:LAST:'%5.2lf%% '";
$rrd_options .= " COMMENT:'\\l'";
$rrd_options .= " COMMENT:'\l'";
}//end if

4
includes/html/graphs/old_generic_simplex.inc.php
View File

@ -72,8 +72,8 @@ if ($percentile) {
$rrd_options .= ' GPRINT:' . $ds . '_percentile:%6.' . $float_precision . 'lf%s';
}
$rrd_options .= '\\\\n';
$rrd_options .= ' COMMENT:\\\\n';
$rrd_options .= '\\n';
$rrd_options .= ' COMMENT:\\n';
if ($print_total) {
$rrd_options .= ' GPRINT:' . $ds . '_total:Total" %6.' . $float_precision . 'lf%s"\\l';

2
includes/html/graphs/port/cbqos_generic.inc.php
View File

@ -80,7 +80,7 @@ foreach ($components as $id => $array) {
$rrd_additions .= ' AREA:MOD' . $count . '#' . $colour . ":'" . str_pad(substr($components[$id]['label'], 0, 15), 15) . "'" . $stack;
$rrd_additions .= ' GPRINT:MOD' . $count . ':LAST:%6.2lf%s ';
$rrd_additions .= ' GPRINT:MOD' . $count . ':AVERAGE:%6.2lf%s ';
$rrd_additions .= ' GPRINT:MOD' . $count . ':MAX:%6.2lf%s\\\\l ';
$rrd_additions .= ' GPRINT:MOD' . $count . ":MAX:%6.2lf%s\\\l ";
$count++;
} // End if file exists

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

@ -31,7 +31,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/ber.inc.php
View File

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

2
includes/html/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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/chromatic_dispersion.inc.php
View File

@ -13,7 +13,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.0lfps/nm";
$rrd_options .= ' GPRINT:sensor:LAST:%5.0lfps/nm';
$rrd_options .= ' GPRINT:sensor:MAX:%5.0lfps/nm\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.0lfps/nm\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/graphs/sensor/cooling.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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 20) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfW';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfW\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfW\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

@ -7,7 +7,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 30) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%8.0lf';
$rrd_options .= ' GPRINT:sensor:MAX:%8.0lf';
$rrd_options .= ' GPRINT:sensor:LAST:%8.0lf\\\\l';
$rrd_options .= ' GPRINT:sensor:LAST:%8.0lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/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.2lf%sA";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lf%sA';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%sA\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%sA\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/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
includes/html/graphs/sensor/delay.inc.php
View File

@ -13,7 +13,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.2lf%ss";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lf%ss';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%ss\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lf%ss\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

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

2
includes/html/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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/frequency.inc.php
View File

@ -11,7 +11,7 @@ $sensor['sensor_descr_fixed'] = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed'] . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lf%sHz';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%sHz\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lf%sHz\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

@ -25,7 +25,7 @@ if (is_numeric($sensor['sensor_limit'])) {
$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
includes/html/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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/loss.inc.php
View File

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

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

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

2
includes/html/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
includes/html/graphs/sensor/power_consumed.inc.php
View File

@ -6,7 +6,7 @@ $rrd_options .= " COMMENT:' Min
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 34) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%8.0lfkWh';
$rrd_options .= ' GPRINT:sensor:MAX:%8.0lfkWh\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%8.0lfkWh\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

@ -12,7 +12,7 @@ $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 30) . "'";
$rrd_options .= ' GPRINT:sensor:MIN:%1.4lf';
$rrd_options .= ' GPRINT:sensor:MAX:%1.4lf';
$rrd_options .= ' GPRINT:sensor:LAST:%1.4lf\\\\l';
$rrd_options .= ' GPRINT:sensor:LAST:%1.4lf\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/graphs/sensor/pressure.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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 20) . "'";
$rrd_options .= ' GPRINT:sensor:LAST:%3.0lfkPa';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfkPa\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%3.0lfkPa\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

@ -13,7 +13,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.2lfdB";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdB';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

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

@ -7,7 +7,7 @@ $sensor['sensor_descr_fixed'] = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor
$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
includes/html/graphs/sensor/signal.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
includes/html/graphs/sensor/snr.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.2lfdB";
$rrd_options .= ' GPRINT:sensor:LAST:%5.2lfdB';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\\\\l';
$rrd_options .= ' GPRINT:sensor:MAX:%5.2lfdB\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/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:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/temperature.inc.php
View File

@ -26,7 +26,7 @@ if ($sensor['poller_type'] == 'ipmi') {
$rrd_options .= ' GPRINT:sensor_min:MIN:%4.1lfC';
$rrd_options .= ' GPRINT:sensor:LAST:%4.1lfC';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lfC\\\\l';
$rrd_options .= ' GPRINT:sensor_max:MAX:%4.1lfC\\l';
if (is_numeric($sensor['sensor_limit'])) {
$rrd_options .= ' HRULE:' . $sensor['sensor_limit'] . '#999999::dashes';

2
includes/html/graphs/sensor/tv_signal.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
includes/html/graphs/sensor/voltage.inc.php
View File

@ -13,7 +13,7 @@ $rrd_options .= " DEF:sensor_min=$rrd_filename:sensor:MIN";
$rrd_options .= " LINE1.5:sensor#cc0000:'" . \LibreNMS\Data\Store\Rrd::fixedSafeDescr($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
includes/html/graphs/sensor/waterflow.inc.php
View File

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

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

@ -88,7 +88,7 @@ if ($services[$vars['service']]['service_ds'] != '') {
$rrd_additions .= ' AREA:DS#' . $color_avg . ":'" . str_pad(substr(ucfirst($ds) . ' (' . $label . ')', 0, 15), 15) . "' ";
$rrd_additions .= ' GPRINT:DS:LAST:%5.2lf%s ';
$rrd_additions .= ' GPRINT:DS:AVERAGE:%5.2lf%s ';
$rrd_additions .= ' GPRINT:DS_MAX:MAX:%5.2lf%s\\\\l ';
$rrd_additions .= ' GPRINT:DS_MAX:MAX:%5.2lf%s\\l ';
}
}
}

4
includes/html/graphs/sla-jitter-jitter.inc.php
View File

@ -24,11 +24,11 @@ if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_options .= " LINE1.25:SD#0000ee:'Src to Dst ' ";
$rrd_options .= ' GPRINT:SD:LAST:%3.0lf ';
$rrd_options .= ' GPRINT:SD:MIN:%3.0lf ';
$rrd_options .= ' GPRINT:SD:MAX:%3.0lf\\\\l ';
$rrd_options .= " GPRINT:SD:MAX:%3.0lf\\\l ";
$rrd_options .= ' DEF:DS=' . $rrd_filename . ':AvgDSJ:AVERAGE ';
$rrd_options .= " LINE1.25:DS#008C00:'Dst to Src ' ";
$rrd_options .= ' GPRINT:DS:LAST:%3.0lf ';
$rrd_options .= ' GPRINT:DS:MIN:%3.0lf ';
$rrd_options .= ' GPRINT:DS:MAX:%3.0lf\\\\l ';
$rrd_options .= " GPRINT:DS:MAX:%3.0lf\\\l ";
}

4
includes/html/graphs/storage/usage.inc.php
View File

@ -30,7 +30,7 @@ $rrd_options .= ' AREA:perc#' . $background['right'] . ':';
$rrd_options .= ' LINE1.25:perc#' . $background['left'] . ":'$descr'";
$rrd_options .= ' GPRINT:size:LAST:%6.2lf%sB';
$rrd_options .= ' GPRINT:free:LAST:%6.2lf%sB';
$rrd_options .= ' GPRINT:perc:LAST:%5.2lf%%\\\\n';
$rrd_options .= ' GPRINT:perc:LAST:%5.2lf%%\\n';
if ($_GET['previous']) {
$descr = \LibreNMS\Data\Store\Rrd::fixedSafeDescr('Prev ' . $storage['storage_descr'], 16);
@ -48,5 +48,5 @@ if ($_GET['previous']) {
$rrd_options .= ' LINE1.25:percX#' . $colour . ":'$descr'";
$rrd_options .= ' GPRINT:sizeX:LAST:%6.2lf%sB';
$rrd_options .= ' GPRINT:freeX:LAST:%6.2lf%sB';
$rrd_options .= ' GPRINT:percX:LAST:%5.2lf%%\\\\n';
$rrd_options .= ' GPRINT:percX:LAST:%5.2lf%%\\n';
}

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

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

4
includes/html/graphs/wireless/wireless-sensor.inc.php
View File

@ -33,7 +33,7 @@ if ($unit_long == $sensor['sensor_descr']) {
$col_w = 7 + strlen($unit);
$sensor_descr_fixed = \LibreNMS\Data\Store\Rrd::fixedSafeDescr($sensor['sensor_descr'], 28);
$rrd_options .= " COMMENT:'" . str_pad($unit_long, 35) . str_pad('Cur', $col_w) . str_pad('Min', $col_w) . 'Max\\n\'';
$rrd_options .= " COMMENT:'" . str_pad($unit_long, 35) . str_pad('Cur', $col_w) . str_pad('Min', $col_w) . "Max\\n'";
$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
$num = '%5.2lf'; // default: float
@ -77,4 +77,4 @@ if ($vars['width'] > 300) {
$rrd_options .= " GPRINT:$output_def:LAST:'$num$unit'";
$rrd_options .= " GPRINT:$output_def:MIN:'$num$unit'";
$rrd_options .= " GPRINT:$output_def:MAX:'$num$unit'" . '\\\\l';
$rrd_options .= " GPRINT:$output_def:MAX:'$num$unit'\\l";