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

Updated interface graph formatting for non unicast

Browse Source
This commit is contained in:
laf
2015-08-10 23:01:14 +00:00
parent e8a74e17a6
commit 8676a0c22f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ else {
} }
$i = 0; $i = 0;
$rrd_options .= " COMMENT:'$units_descr Current Average Maximum'"; $rrd_options .= " COMMENT:'$units_descr Now Ave Max'";
if (!$nototal) { if (!$nototal) {
$rrd_options .= " COMMENT:'Total'"; $rrd_options .= " COMMENT:'Total'";
} }
@@ -74,7 +74,7 @@ foreach ($rrd_list as $rrd) {
$stack = 'STACK'; $stack = 'STACK';
} }
$rrd_options .= ' AREA:inbits'.$i.'#'.$colour_in.":'".rrdtool_escape($rrd['descr'], 10)."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';
@@ -85,7 +85,7 @@ 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('', 11)."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', 11)."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('', 11)."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('', 11)."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';

6
html/includes/graphs/port/nupkts.inc.php
View File

@@ -13,7 +13,7 @@ if (1) {
$rrd_list[2]['descr'] = $int['ifDescr']; $rrd_list[2]['descr'] = $int['ifDescr'];
$rrd_list[2]['ds_in'] = 'INBROADCASTPKTS'; $rrd_list[2]['ds_in'] = 'INBROADCASTPKTS';
$rrd_list[2]['ds_out'] = 'OUTBROADCASTPKTS'; $rrd_list[2]['ds_out'] = 'OUTBROADCASTPKTS';
$rrd_list[2]['descr'] = 'Broadcast'; $rrd_list[2]['descr'] = 'B/cast';
$rrd_list[2]['colour_area_in'] = 'aa37BB'; $rrd_list[2]['colour_area_in'] = 'aa37BB';
$rrd_list[2]['colour_area_out'] = 'ee9D88'; $rrd_list[2]['colour_area_out'] = 'ee9D88';
@@ -21,12 +21,12 @@ if (1) {
$rrd_list[4]['descr'] = $int['ifDescr']; $rrd_list[4]['descr'] = $int['ifDescr'];
$rrd_list[4]['ds_in'] = 'INMULTICASTPKTS'; $rrd_list[4]['ds_in'] = 'INMULTICASTPKTS';
$rrd_list[4]['ds_out'] = 'OUTMULTICASTPKTS'; $rrd_list[4]['ds_out'] = 'OUTMULTICASTPKTS';
$rrd_list[4]['descr'] = 'Multicast'; $rrd_list[4]['descr'] = 'M/cast';
$rrd_list[4]['colour_area_in'] = '905090'; $rrd_list[4]['colour_area_in'] = '905090';
$rrd_list[4]['colour_area_out'] = 'c0a060'; $rrd_list[4]['colour_area_out'] = 'c0a060';
$units = ''; $units = '';
$units_descr = 'Packets/sec'; $units_descr = 'Packets';
$total_units = 'B'; $total_units = 'B';
$colours_in = 'purples'; $colours_in = 'purples';
$multiplier = '1'; $multiplier = '1';