nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-20 08:03:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

more graph improvements

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3065 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-20 11:27:31 +00:00
parent 483b86d92f
commit a3b2db29b4
5 changed files with 184 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/generic_simplex.inc.php
+37 -2
View File
@@ -18,7 +18,6 @@ if ($multiplier)
$rrd_options .= " DEF:".$ds."=".$rrd_filename.":".$ds.":AVERAGE";
$rrd_options .= " DEF:".$ds."_max=".$rrd_filename.":".$ds.":MAX";
}
if ($print_total)
{
$rrd_options .= " VDEF:".$ds."_total=ds,TOTAL";
@@ -28,11 +27,42 @@ if ($percentile)
{
$rrd_options .= " VDEF:".$ds."_percentile=".$ds.",".$percentile.",PERCENT";
}
if ($graph_max)
{
$rrd_options .= " AREA:".$ds."_max#".$colour_area_max.":";
}
if($_GET['previous'] == "yes")
{
if ($multiplier)
{
$rrd_options .= " DEF:".$ds."_oX=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$ds."_max_oX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."_oX:$period";
$rrd_options .= " SHIFT:".$ds."_max_oX:$period";
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,*";
$rrd_options .= " CDEF:".$ds."_maxX=".$ds."_max_oX,$multiplier,*";
} else {
$rrd_options .= " DEF:".$ds."X=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$ds."_maxX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."X:$period";
$rrd_options .= " SHIFT:".$ds."_maxX:$period";
}
if ($print_total)
{
$rrd_options .= " VDEF:".$ds."_totalX=ds,TOTAL";
}
if ($percentile)
{
$rrd_options .= " VDEF:".$ds."_percentileX=".$ds.",".$percentile.",PERCENT";
}
# if ($graph_max)
# {
# $rrd_options .= " AREA:".$ds."_max#".$colour_area_max.":";
# }
}
$rrd_options .= " AREA:".$ds."#".$colour_area.":";
$rrd_options .= " COMMENT:'".$unit_text."Now Ave Max";
@@ -65,4 +95,9 @@ if ($percentile)
$rrd_options .= " LINE1:".$ds."_percentile#aa0000";
}
if($_GET['previous'] == "yes")
{
$rrd_options .= " LINE1.25:".$ds."X#666666:'Prev \\\\n'";
}
?>