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

allow previous=yes graph variable

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3041 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-17 13:29:27 +00:00
parent bcc874ed94
commit 6c0ab6121d
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
html/includes/graphs/generic_bits.inc.php
View File

@ -1,7 +1,7 @@
<?php
/// Draw generic bits graph
/// args: ds_in, ds_out, rrd_filename, bg, legend, from, to, width, height, inverse
/// args: ds_in, ds_out, rrd_filename, bg, legend, from, to, width, height, inverse, previous
include("includes/graphs/common.inc.php");
@ -26,6 +26,39 @@ if ($multiplier)
$rrd_options .= " DEF:".$in."octets_max=".$rrd_filename_in.":".$ds_in.":MAX";
}
if($_GET['previous'] == "yes")
{
if ($multiplier)
{
$rrd_options .= " DEF:p".$out."octetsX=".$rrd_filename_out.":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:p".$in."octetsX=".$rrd_filename_in.":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:p".$out."octetsX:$period";
$rrd_options .= " SHIFT:p".$in."octetsX:$period";
$rrd_options .= " CDEF:inoctetsX=pinoctetsX,$multiplier,*";
$rrd_options .= " CDEF:outoctetsX=poutoctetsX,$multiplier,*";
} else {
$rrd_options .= " DEF:".$out."octetsX=".$rrd_filename_out.":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$in."octetsX=".$rrd_filename_in.":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$out."octetsX:$period";
$rrd_options .= " SHIFT:".$in."octetsX:$period";
}
$rrd_options .= " CDEF:octetsX=inoctetsX,outoctetsX,+";
$rrd_options .= " CDEF:doutoctetsX=outoctetsX,-1,*";
$rrd_options .= " CDEF:outbitsX=outoctetsX,8,*";
#$rrd_options .= " CDEF:outbits_maxX=outoctets_maxX,8,*";
#$rrd_options .= " CDEF:doutoctets_maxX=outoctets_maxX,-1,*";
$rrd_options .= " CDEF:doutbitsX=doutoctetsX,8,*";
#$rrd_options .= " CDEF:doutbits_maxX=doutoctets_maxX,8,*";
$rrd_options .= " CDEF:inbitsX=inoctetsX,8,*";
#$rrd_options .= " CDEF:inbits_maxX=inoctets_maxX,8,*";
$rrd_options .= " VDEF:totinX=inoctetsX,TOTAL";
$rrd_options .= " VDEF:totoutX=outoctetsX,TOTAL";
$rrd_options .= " VDEF:totX=octetsX,TOTAL";
}
$rrd_options .= " CDEF:octets=inoctets,outoctets,+";
$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
$rrd_options .= " CDEF:outbits=outoctets,8,*";
@ -79,4 +112,10 @@ $rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\\\\l'";
$rrd_options .= " LINE1:95thin#aa0000";
$rrd_options .= " LINE1:d95thout#aa0000";
if($_GET['previous'] == "yes")
{
$rrd_options .= " LINE1.25:inbitsX#009900:'Prev In \\\\n'";
$rrd_options .= " LINE1.25:doutbitsX#000099:'Prev Out'";
}
?>

4
html/includes/graphs/graph.inc.php
View File

@ -19,6 +19,10 @@ $to = (isset($_GET['to']) ? $_GET['to'] : time());
if ($from < 0) { $from = $to + $from; }
$period = $to - $from;
$prev_from = $from - $period;
$graphfile = $config['temp_dir'] . "/" . strgen() . ".png";
preg_match('/^(?P<type>[A-Za-z0-9]+)_(?P<subtype>.+)/', $_GET['type'], $graphtype);