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

fixed nototal option which was not properly set in common.inc.php

Browse Source 
add new nodetails option to not display each device/port on the legend when graphing lots of devices
add new aggregates on multibits graphs
This commit is contained in:
Mickael Marchand
2015-05-10 17:52:46 +02:00
parent 960ecadf31
commit a43165ec1b
2 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,8 @@ if($config['trim_tobias']) { $width+=12; }
if ($_GET['height']) { $height = mres($_GET['height']); }
if ($_GET['inverse']) { $in = 'out'; $out = 'in'; $inverse=TRUE; } else { $in = 'in'; $out = 'out'; }
if ($_GET['legend'] == "no") { $rrd_options .= " -g"; }
if ($_GET['nototal']) { $nototal=TRUE;} else { $nototal=FALSE;}
if ($_GET['nodetails']) { $nodetails=TRUE; } else { $nodetails=FALSE; }
if ($_GET['title'] == "yes") { $rrd_options .= " --title='".$graph_title."' "; }
if (isset($_GET['graph_title'])) { $rrd_options .= " --title='".$_GET['graph_title']."' "; }

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

@@ -19,8 +19,8 @@ if($width > "500")
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'";
}
if(!isset($multiplier)) { $multiplier = "8"; }
@@ -32,8 +32,8 @@ foreach ($rrd_list as $rrd)
$colour_in=$config['graph_colours'][$colours_in][$iter];
$colour_out=$config['graph_colours'][$colours_out][$iter];
if (isset($rrd['descr_in']))
{
if (!$nodetails) {
if (isset($rrd['descr_in'])) {
$descr = rrdtool_escape($rrd['descr_in'], $descr_len) . " In";
} else {
$descr = rrdtool_escape($rrd['descr'], $descr_len) . " In";
@@ -41,6 +41,7 @@ foreach ($rrd_list as $rrd)
$descr_out = rrdtool_escape($rrd['descr_out'], $descr_len) . " Out";
$descr = str_replace("'", "", $descr); // FIXME does this mean ' should be filtered in rrdtool_escape? probably...
$descr_out = str_replace("'", "", $descr_out);
}
$rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$ds_in.":AVERAGE ";
$rrd_options .= " DEF:".$out.$i."=".$rrd['filename'].":".$ds_out.":AVERAGE ";
@@ -49,8 +50,7 @@ foreach ($rrd_list as $rrd)
$rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*";
$rrd_options .= " CDEF:octets".$i."=inB".$i.",outB".$i.",+";
if (!$args['nototal'])
{
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";
@@ -59,24 +59,69 @@ foreach ($rrd_list as $rrd)
if ($i) { $stack="STACK"; }
$rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . $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\l";
if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_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 .= "\l";
}
$rrd_options .= " 'HRULE:0#" . $colour_out.":".$descr_out."'";
$rrd_optionsb .= " 'AREA:outB".$i."_neg#" . $colour_out . "::$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\l";
if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
$rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units";
if (!$nototal) {
$rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit";
}
$rrd_options .= "\l";
}
$rrd_options .= " 'COMMENT:\l'";
if ($i >= 1) {
$aggr_in .= ",";
$aggr_out .= ",";
}
if ($i > 1) {
$aggr_in .= "ADDNAN,";
$aggr_out .= "ADDNAN,";
}
$aggr_in .= $in.$i ;
$aggr_out .= $out.$i ;
$i++; $iter++;
}
$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 .= " 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";
if (!$nototal) {
$rrd_options .= " GPRINT:totalin:%6.2lf%s$total_units";
}
$rrd_options .= "\\\\n";
$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";
if (!$nototal) {
$rrd_options .= " GPRINT:totalout:%6.2lf%s$total_units";
}
$rrd_options .= "\\\\n";
if ($custom_graph) { $rrd_options .= $custom_graph; }
$rrd_options .= $rrd_optionsb;