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

webui: Added support for stacked graphs (#7725)

Browse Source 
* initial release

* newline fix

* missed some graphs in edit

* style fixes

* revert custom function, use Config

* unified config option
added webui graph config entry
added sql entry for webui config

* removed config_id from sql file

* remove graph stack from defaults

* moved transparency and stacked option to functions.php

* style fixes

* style fixes

* changes in code
added docs about stacked graphs

* return keyed array

* new colors and transparency

* sql rename
This commit is contained in:
crcro
2017-12-02 22:28:03 +02:00
committed by Neil Lathwood
parent 731261b509
commit 995b7069eb
15 changed files with 715 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,27 @@
<?php
/*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*
* @package LibreNMS
* @subpackage graphs
* @link http://librenms.org
* @copyright 2017 LibreNMS
* @author LibreNMS Contributors
*/
require 'includes/graphs/common.inc.php';
$stacked = generate_stacked_graphs();
$i = 0;
if ($width > '500') {
$descr_len = 18;
} else {
$descr_len = 8;
$descr_len = 8;
$descr_len += round(($width - 260) / 9.5);
}
@@ -14,15 +29,15 @@ $unit_text = 'Bits/sec';
if (!$noagg || !$nodetails) {
if ($width > '500') {
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5))." Current Average Maximum '";
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . " Current Average Maximum '";
if (!$nototal) {
$rrd_options .= " COMMENT:'Total '";
}
$rrd_options .= " COMMENT:'\l'";
} else {
$nototal = true;
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5))." Now Ave Max\l'";
$nototal = true;
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . " Now Ave Max\l'";
}
}
@@ -35,57 +50,56 @@ foreach ($rrd_list as $rrd) {
$iter = 0;
}
$colour_in = $config['graph_colours'][$colours_in][$iter];
$colour_in = $config['graph_colours'][$colours_in][$iter];
$colour_out = $config['graph_colours'][$colours_out][$iter];
if (!$nodetails) {
if (isset($rrd['descr_in'])) {
$descr = rrdtool_escape($rrd['descr_in'], $descr_len).' In';
$descr = rrdtool_escape($rrd['descr_in'], $descr_len) . ' In';
} else {
$descr = rrdtool_escape($rrd['descr'], $descr_len).' In';
$descr = rrdtool_escape($rrd['descr'], $descr_len) . ' In';
}
$descr_out = rrdtool_escape($rrd['descr_out'], $descr_len).' Out';
$descr_out = rrdtool_escape($rrd['descr_out'], $descr_len) . ' Out';
}
$rrd_options .= ' DEF:'.$in.$i.'='.$rrd['filename'].':'.$ds_in.':AVERAGE ';
$rrd_options .= ' DEF:'.$out.$i.'='.$rrd['filename'].':'.$ds_out.':AVERAGE ';
$rrd_options .= ' CDEF:inB'.$i.'=in'.$i.",$multiplier,* ";
$rrd_options .= ' CDEF:outB'.$i.'=out'.$i.",$multiplier,*";
$rrd_options .= ' CDEF:outB'.$i.'_neg=outB'.$i.',-1,*';
$rrd_options .= ' CDEF:octets'.$i.'=inB'.$i.',outB'.$i.',+';
$rrd_options .= ' DEF:' . $in . $i . '=' . $rrd['filename'] . ':' . $ds_in . ':AVERAGE ';
$rrd_options .= ' DEF:' . $out . $i . '=' . $rrd['filename'] . ':' . $ds_out . ':AVERAGE ';
$rrd_options .= ' CDEF:inB' . $i . '=in' . $i . ",$multiplier,* ";
$rrd_options .= ' CDEF:outB' . $i . '=out' . $i . ",$multiplier,*";
$rrd_options .= ' CDEF:outB' . $i . '_neg=outB' . $i . ',' . $stacked['stacked'] . ',*';
$rrd_options .= ' CDEF:octets' . $i . '=inB' . $i . ',outB' . $i . ',+';
if (!$nototal) {
$rrd_options .= ' VDEF:totin'.$i.'=inB'.$i.',TOTAL';
$rrd_options .= ' VDEF:totout'.$i.'=outB'.$i.',TOTAL';
$rrd_options .= ' VDEF:tot'.$i.'=octets'.$i.',TOTAL';
$rrd_options .= ' VDEF:totin' . $i . '=inB' . $i . ',TOTAL';
$rrd_options .= ' VDEF:totout' . $i . '=outB' . $i . ',TOTAL';
$rrd_options .= ' VDEF:tot' . $i . '=octets' . $i . ',TOTAL';
}
if ($i) {
$stack = ':STACK';
}
$rrd_options .= ' AREA:inB'.$i.'#'.$colour_in.":'".$descr."'$stack";
$rrd_options .= ' AREA:inB' . $i . '#' . $colour_in . $stacked['transparency'] . ":'" . $descr . "'$stack";
if (!$nodetails) {
$rrd_options .= ' GPRINT:inB'.$i.":LAST:%6.2lf%s$units";
$rrd_options .= ' GPRINT:inB'.$i.":AVERAGE:%6.2lf%s$units";
$rrd_options .= ' GPRINT:inB'.$i.":MAX:%6.2lf%s$units";
$rrd_options .= ' GPRINT:inB' . $i . ":LAST:%6.2lf%s$units";
$rrd_options .= ' GPRINT:inB' . $i . ":AVERAGE:%6.2lf%s$units";
$rrd_options .= ' GPRINT:inB' . $i . ":MAX:%6.2lf%s$units";
if (!$nototal) {
$rrd_options .= ' GPRINT:totin'.$i.":%6.2lf%s$total_units";
$rrd_options .= ' GPRINT:totin' . $i . ":%6.2lf%s$total_units";
}
$rrd_options .= '\l';
}
$rrd_options .= " 'HRULE:0#".$colour_out.':'.$descr_out."'";
$rrd_optionsb .= " 'AREA:outB".$i.'_neg#'.$colour_out.":$stack'";
$rrd_options .= " 'HRULE:0#" . $colour_out . ':' . $descr_out . "'";
$rrd_optionsb .= " 'AREA:outB" . $i . '_neg#' . $colour_out . $stacked['transparency'] . ":$stack'";
if (!$nodetails) {
$rrd_options .= ' GPRINT:outB'.$i.":LAST:%6.2lf%s$units";
$rrd_options .= ' GPRINT:outB'.$i.":AVERAGE:%6.2lf%s$units";
$rrd_options .= ' GPRINT:outB'.$i.":MAX:%6.2lf%s$units";
$rrd_options .= ' GPRINT:outB' . $i . ":LAST:%6.2lf%s$units";
$rrd_options .= ' GPRINT:outB' . $i . ":AVERAGE:%6.2lf%s$units";
$rrd_options .= ' GPRINT:outB' . $i . ":MAX:%6.2lf%s$units";
if (!$nototal) {
$rrd_options .= ' GPRINT:totout'.$i.":%6.2lf%s$total_unit";
$rrd_options .= ' GPRINT:totout' . $i . ":%6.2lf%s$total_unit";
}
$rrd_options .= '\l';
@@ -94,31 +108,31 @@ foreach ($rrd_list as $rrd) {
$rrd_options .= " 'COMMENT:\l'";
if ($i >= 1) {
$aggr_in .= ',';
$aggr_in .= ',';
$aggr_out .= ',';
}
if ($i > 1) {
$aggr_in .= 'ADDNAN,';
$aggr_in .= 'ADDNAN,';
$aggr_out .= 'ADDNAN,';
}
$aggr_in .= $in.$i;
$aggr_out .= $out.$i;
$aggr_in .= $in . $i;
$aggr_out .= $out . $i;
$i++;
$iter++;
}
if (!$noagg) {
$rrd_options .= ' CDEF:aggr'.$in.'bytes='.$aggr_in.',ADDNAN';
$rrd_options .= ' CDEF:aggr'.$out.'bytes='.$aggr_out.',ADDNAN';
$rrd_options .= ' CDEF:aggrinbits=aggrinbytes,'.$multiplier.',*';
$rrd_options .= ' CDEF:aggroutbits=aggroutbytes,'.$multiplier.',*';
$rrd_options .= ' CDEF:aggr' . $in . 'bytes=' . $aggr_in . ',ADDNAN';
$rrd_options .= ' CDEF:aggr' . $out . 'bytes=' . $aggr_out . ',ADDNAN';
$rrd_options .= ' CDEF:aggrinbits=aggrinbytes,' . $multiplier . ',*';
$rrd_options .= ' CDEF:aggroutbits=aggroutbytes,' . $multiplier . ',*';
$rrd_options .= ' VDEF:totalin=aggrinbytes,TOTAL';
$rrd_options .= ' VDEF:totalout=aggroutbytes,TOTAL';
$rrd_options .= " COMMENT:' \\\\n'";
$rrd_options .= " COMMENT:'".substr(str_pad('Aggregate In', ($descr_len + 5)), 0, ($descr_len + 5))."'";
$rrd_options .= " COMMENT:'" . substr(str_pad('Aggregate In', ($descr_len + 5)), 0, ($descr_len + 5)) . "'";
$rrd_options .= " GPRINT:aggrinbits:LAST:%6.2lf%s$units";
$rrd_options .= " GPRINT:aggrinbits:AVERAGE:%6.2lf%s$units";
$rrd_options .= " GPRINT:aggrinbits:MAX:%6.2lf%s$units";
@@ -127,7 +141,7 @@ if (!$noagg) {
}
$rrd_options .= "\\\\n";
$rrd_options .= " COMMENT:'".substr(str_pad('Aggregate Out', ($descr_len + 5)), 0, ($descr_len + 5))."'";
$rrd_options .= " COMMENT:'" . substr(str_pad('Aggregate Out', ($descr_len + 5)), 0, ($descr_len + 5)) . "'";
$rrd_options .= " GPRINT:aggroutbits:LAST:%6.2lf%s$units";
$rrd_options .= " GPRINT:aggroutbits:AVERAGE:%6.2lf%s$units";
$rrd_options .= " GPRINT:aggroutbits:MAX:%6.2lf%s$units";
@@ -144,3 +158,5 @@ if ($custom_graph) {
$rrd_options .= $rrd_optionsb;
$rrd_options .= ' HRULE:0#999999';
unset($stacked);