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

add previous period overlay to generic_bits/bytes and generic_duplex

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3063 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-20 10:35:13 +00:00
parent df58d56bb6
commit ee65ae5350
19 changed files with 92 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
html/includes/graphs/generic_duplex.inc.php
View File

@@ -20,30 +20,61 @@ $rrd_options .= " DEF:".$out."=".$rrd_filename.":".$ds_out.":AVERAGE";
$rrd_options .= " DEF:".$in."=".$rrd_filename.":".$ds_in.":AVERAGE";
$rrd_options .= " DEF:".$out."_max=".$rrd_filename.":".$ds_out.":MAX";
$rrd_options .= " DEF:".$in."_max=".$rrd_filename.":".$ds_in.":MAX";
$rrd_options .= " CDEF:dout_max=out_max,-1,*";
$rrd_options .= " CDEF:dout=out,-1,*";
$rrd_options .= " CDEF:both=in,out,+";
if ($print_total)
{
$rrd_options .= " VDEF:totin=in,TOTAL";
$rrd_options .= " VDEF:totout=out,TOTAL";
$rrd_options .= " VDEF:tot=both,TOTAL";
}
if ($percentile)
{
$rrd_options .= " VDEF:percentile_in=in,".$percentile.",PERCENT";
$rrd_options .= " VDEF:percentile_out=out,".$percentile.",PERCENT";
$rrd_options .= " VDEF:dpercentile_out=dout,".$percentile.",PERCENT";
}
if ($graph_max)
{
$rrd_options .= " AREA:in_max#".$colour_area_in_max.":";
$rrd_options .= " AREA:dout_max#".$colour_area_out_max.":";
}
if($_GET['previous'] == "yes")
{
$rrd_options .= " DEF:".$out."X=".$rrd_filename.":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$in."X=".$rrd_filename.":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$out."_maxX=".$rrd_filename.":".$ds_out.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$in."_maxX=".$rrd_filename.":".$ds_in.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$out."X:$period";
$rrd_options .= " SHIFT:".$in."X:$period";
$rrd_options .= " SHIFT:".$out."_maxX:$period";
$rrd_options .= " SHIFT:".$in."_maxX:$period";
$rrd_options .= " CDEF:dout_maxX=out_maxX,-1,*";
$rrd_options .= " CDEF:doutX=outX,-1,*";
$rrd_options .= " CDEF:bothX=inX,outX,+";
if ($print_total)
{
$rrd_options .= " VDEF:totinX=inX,TOTAL";
$rrd_options .= " VDEF:totoutX=outX,TOTAL";
$rrd_options .= " VDEF:totX=bothX,TOTAL";
}
if ($percentile)
{
$rrd_options .= " VDEF:percentile_inX=inX,".$percentile.",PERCENT";
$rrd_options .= " VDEF:percentile_outX=outX,".$percentile.",PERCENT";
$rrd_options .= " VDEF:dpercentile_outX=doutX,".$percentile.",PERCENT";
}
if ($graph_max)
{
$rrd_options .= " AREA:in_max#".$colour_area_in_max.":";
$rrd_options .= " AREA:dout_max#".$colour_area_out_max.":";
}
}
$rrd_options .= " AREA:in#".$colour_area_in.":";
$rrd_options .= " COMMENT:'".$unit_text." Now Ave Max";
@@ -90,4 +121,12 @@ if ($percentile)
$rrd_options .= " LINE1:dpercentile_out#aa0000";
}
if($_GET['previous'] == "yes")
{
$rrd_options .= " LINE1.25:in".$format."X#666666:'Prev In \\\\n'";
$rrd_options .= " LINE1.25:dout".$format."X#666666:'Prev Out'";
}
?>