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

Refresh device_bits graph; align column headers, use wider descriptio… (#11922)

Browse Source 
* Refresh device_bits graph; align column headers, use wider description on wider graphs

* Fix a couple of code climate issues...

* use float_precision variable like we do everywhere else...

* remove unnecessary substr
This commit is contained in:
Nick Peelman 2020-07-24 00:14:36 -04:00 committed by GitHub
parent 6dba2555a7
commit 57362c1ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 82 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,19 @@ require 'includes/html/graphs/common.inc.php';
$rrddescr_len = 14; // length of the padded rrd_descr in legend
if ($width > '1500') {
$rrddescr_len = 30;
} elseif ($width >= '500') {
$rrddescr_len = 8;
$rrddescr_len += min(30, round(($width - 320) / 15));
} else {
$rrddescr_len = 8;
$rrddescr_len += min(20, round(($width - 260) / 9.5));
}
$stacked = generate_stacked_graphs();
$units_descr = substr(str_pad($units_descr, $rrddescr_len + 9), 0, $rrddescr_len + 9);
$units_descr = rrdtool_escape($units_descr, $rrddescr_len + 5);
if ($format == 'octets' || $format == 'bytes') {
$units = 'Bps';
@ -32,14 +42,29 @@ if ($format == 'octets' || $format == 'bytes') {
}
$i = 0;
$rrd_options .= " COMMENT:'$units_descr Now Avg Max'";
if (!$args['nototal']) {
$rrd_options .= " COMMENT:' Total'";
if ($width > '500') {
$rrd_options .= sprintf(" COMMENT:'%s'", $units_descr);
$rrd_options .= sprintf(" COMMENT:'%12s'", "Current");
$rrd_options .= sprintf(" COMMENT:'%10s'", "Average");
$rrd_options .= sprintf(" COMMENT:'%10s'", "Maximum");
if (!$$args['nototal']) {
$rrd_options .= sprintf(" COMMENT:'%8s'", "Total");
}
} else {
$nototal = true;
$rrd_options .= sprintf(" COMMENT:'%s'", $units_descr);
$rrd_options .= sprintf(" COMMENT:'%12s'", "Now");
$rrd_options .= sprintf(" COMMENT:'%10s'", "Avg");
$rrd_options .= sprintf(" COMMENT:'%10s'", "Max");
}
if ($_GET['previous']) {
$rrd_options .= " COMMENT:' \t P Avg P Max'";
$rrd_options .= sprintf(" COMMENT:'\t'", "");
$rrd_options .= sprintf(" COMMENT:'%10s'", "P Avg");
$rrd_options .= sprintf(" COMMENT:'%10s'", "P Max");
if (!$args['nototal']) {
$rrd_options .= " COMMENT:' P Total'";
$rrd_options .= sprintf(" COMMENT:'%8s'", "P Total");
}
}
@ -107,10 +132,15 @@ foreach ($rrd_list as $rrd) {
$stack = ':STACK';
}
$rrd_options .= ' AREA:inbits' . $i . '#' . $colour_in . $stacked['transparency'] . ":'" . rrdtool_escape($rrd['descr'], $rrddescr_len) . "In '$stack";
$rrd_options .= ' GPRINT:inbits' . $i . ':LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbits' . $i . ':AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbits' . $i . ':MAX:%6.'.$float_precision.'lf%s';
if (!$nodetails) {
$descr = rrdtool_escape($rrd['descr'], $rrddescr_len) . ' In';
$descr_out = rrdtool_escape('', $rrddescr_len) . ' Out';
}
$rrd_options .= ' AREA:inbits' . $i . '#' . $colour_in . $stacked['transparency'] . ":'$descr'$stack";
$rrd_options .= ' GPRINT:inbits' . $i . ':LAST:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:inbits' . $i . ':AVERAGE:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:inbits' . $i . ':MAX:%6.'.$float_precision."lf%s$units";
if (!$args['nototal']) {
$rrd_options .= ' GPRINT:totinB' . $i . ":%6.".$float_precision."lf%s$total_units";
@ -118,8 +148,8 @@ foreach ($rrd_list as $rrd) {
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:inbits' . $i . 'X:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbits' . $i . 'X:MAX:%6.'.$float_precision.'lf%s';
$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']) {
$rrd_options .= ' GPRINT:totinB' . $i . 'X' . ":%6.".$float_precision."lf%s$total_units";
}
@ -127,10 +157,10 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= " COMMENT:'\\n'";
$rrd_optionsb .= ' AREA:outbits' . $i . '_neg#' . $colour_out . $stacked['transparency'] . ":$stack";
$rrd_options .= ' HRULE:999999999999999#' . $colour_out . ":'" . str_pad('', $rrddescr_len + 1) . "Out'";
$rrd_options .= ' GPRINT:outbits' . $i . ':LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbits' . $i . ':AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbits' . $i . ':MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= ' HRULE:999999999999999#' . $colour_out . ":'$descr_out'";
$rrd_options .= ' GPRINT:outbits' . $i . ':LAST:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:outbits' . $i . ':AVERAGE:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:outbits' . $i . ':MAX:%6.'.$float_precision."lf%s$units";
if (!$args['nototal']) {
$rrd_options .= ' GPRINT:totoutB' . $i . ":%6.".$float_precision."lf%s$total_units";
@ -138,8 +168,8 @@ foreach ($rrd_list as $rrd) {
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \t'";
$rrd_options .= ' GPRINT:outbits' . $i . 'X:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbits' . $i . 'X:MAX:%6.'.$float_precision.'lf%s';
$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']) {
$rrd_options .= ' GPRINT:totoutB' . $i . 'X' . ":%6.".$float_precision."lf%s$total_units";
}
@ -203,47 +233,44 @@ if (!$args['nototal']) {
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= " HRULE:999999999999999#FFFFFF:'" . str_pad('Total', $rrddescr_len + 1) . "In '";
$rrd_options .= ' GPRINT:inbits:LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbits:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbits:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " HRULE:999999999999999#FFFFFF:'" . rrdtool_escape('Total', $rrddescr_len) . " In'";
$rrd_options .= ' GPRINT:inbits:LAST:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:inbits:AVERAGE:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:inbits:MAX:%6.'.$float_precision."lf%s$units";
$rrd_options .= " GPRINT:totin:%6.".$float_precision."lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . str_pad('', $rrddescr_len + 1) . "Out'";
$rrd_options .= ' GPRINT:outbits:LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbits:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbits:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:totout:%6.".$float_precision."lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . str_pad('', $rrddescr_len + 1) . "Agg'";
$rrd_options .= ' GPRINT:bits:LAST:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:bits:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:bits:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:tot:%6.".$float_precision."lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
if ($_GET['previous'] == 'yes') {
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= " COMMENT:' \t\t\t\t\t\t'";
$rrd_options .= " HRULE:999999999999999#FFFFFF:'" . str_pad('Perv Total', $rrddescr_len + 1) . "In '\t\t";
$rrd_options .= ' GPRINT:inbitsX:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:inbitsX:MAX:%6.'.$float_precision.'lf%s';
$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";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " COMMENT:' \t\t\t\t\t\t'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . str_pad('', $rrddescr_len + 1) . "Out'\t\t";
$rrd_options .= ' GPRINT:outbitsX:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:outbitsX:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:totoutX:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " COMMENT:' \t\t\t\t\t\t'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . str_pad('', $rrddescr_len + 1) . "Agg'\t\t";
$rrd_options .= ' GPRINT:bitsX:AVERAGE:%6.'.$float_precision.'lf%s';
$rrd_options .= ' GPRINT:bitsX:MAX:%6.'.$float_precision.'lf%s';
$rrd_options .= " GPRINT:totX:%6.".$float_precision."lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
}
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . rrdtool_escape('', $rrddescr_len) . " Out'";
$rrd_options .= ' GPRINT:outbits:LAST:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:outbits:AVERAGE:%6.'.$float_precision."lf%s$units";
$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 .= ' 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";
}
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . rrdtool_escape('', $rrddescr_len) . " Agg'";
$rrd_options .= ' GPRINT:bits:LAST:%6.'.$float_precision."lf%s$units";
$rrd_options .= ' GPRINT:bits:AVERAGE:%6.'.$float_precision."lf%s$units";
$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 .= ' 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";
}
$rrd_options .= " COMMENT:'\\n'";
}
$rrd_options .= $rrd_optionsb;