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

Make network graphs compatible with 1.4.x and 1.5.x rrdtool

Browse Source
This commit is contained in:
laf
2015-08-24 19:14:30 +00:00
parent c0125f28e4
commit 4d9163c9ec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@ foreach ($rrd_list as $rrd) {
$stack = 'STACK'; $stack = 'STACK';
} }
$rrd_options .= ' AREA:inbits'.$i.'#'.$colour_in.":'".rrdtool_escape($rrd['descr'], 9)."In ':$stack"; $rrd_options .= ' AREA:inbits'.$i.'#'.$colour_in.":'".rrdtool_escape($rrd['descr'], 9)."In '$stack";
$rrd_options .= ' GPRINT:inbits'.$i.':LAST:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits'.$i.':LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits'.$i.':AVERAGE:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits'.$i.':AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits'.$i.':MAX:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits'.$i.':MAX:%6.2lf%s';
@@ -84,8 +84,8 @@ foreach ($rrd_list as $rrd) {
} }
$rrd_options .= " COMMENT:'\\n'"; $rrd_options .= " COMMENT:'\\n'";
$rrd_optionsb .= ' AREA:outbits'.$i.'_neg#'.$colour_out."::$stack"; $rrd_optionsb .= ' AREA:outbits'.$i.'_neg#'.$colour_out.":$stack";
$rrd_options .= ' HRULE:999999999999999#'.$colour_out.":'".str_pad('', 10)."Out':"; $rrd_options .= ' HRULE:999999999999999#'.$colour_out.":'".str_pad('', 10)."Out'";
$rrd_options .= ' GPRINT:outbits'.$i.':LAST:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits'.$i.':LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits'.$i.':AVERAGE:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits'.$i.':AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits'.$i.':MAX:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits'.$i.':MAX:%6.2lf%s';
@@ -141,21 +141,21 @@ if (!$args['nototal']) {
$rrd_options .= " COMMENT:' \\n'"; $rrd_options .= " COMMENT:' \\n'";
$rrd_options .= " HRULE:999999999999999#FFFFFF:'".str_pad('Total', 10)."In ':"; $rrd_options .= " HRULE:999999999999999#FFFFFF:'".str_pad('Total', 10)."In '";
$rrd_options .= ' GPRINT:inbits:LAST:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:AVERAGE:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s'; $rrd_options .= ' GPRINT:inbits:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:totin:%6.2lf%s$total_units"; $rrd_options .= " GPRINT:totin:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'"; $rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'".str_pad('', 10)."Out':"; $rrd_options .= " HRULE:999999999999990#FFFFFF:'".str_pad('', 10)."Out'";
$rrd_options .= ' GPRINT:outbits:LAST:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:AVERAGE:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s'; $rrd_options .= ' GPRINT:outbits:MAX:%6.2lf%s';
$rrd_options .= " GPRINT:totout:%6.2lf%s$total_units"; $rrd_options .= " GPRINT:totout:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'"; $rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'".str_pad('', 10)."Agg':"; $rrd_options .= " HRULE:999999999999990#FFFFFF:'".str_pad('', 10)."Agg'";
$rrd_options .= ' GPRINT:bits:LAST:%6.2lf%s'; $rrd_options .= ' GPRINT:bits:LAST:%6.2lf%s';
$rrd_options .= ' GPRINT:bits:AVERAGE:%6.2lf%s'; $rrd_options .= ' GPRINT:bits:AVERAGE:%6.2lf%s';
$rrd_options .= ' GPRINT:bits:MAX:%6.2lf%s'; $rrd_options .= ' GPRINT:bits:MAX:%6.2lf%s';