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

more improvements to graphing

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3066 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-20 13:00:00 +00:00
parent a3b2db29b4
commit 0b667ffc93
3 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/generic_multi_simplex_seperated.inc.php
+33 -1
View File
@@ -52,6 +52,16 @@ foreach ($rrd_list as $i => $rrd)
$rrd_options .= " DEF:".$rrd['ds'].$i."max=".$rrd['filename'].":".$rrd['ds'].":MAX ";
}
if($_GET['previous'])
{
$rrd_options .= " DEF:".$i . "X=".$rrd['filename'].":".$rrd['ds'].":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$i . "X:$period";
$thingX .= $seperatorX . $i . "X,UN,0," . $i . "X,IF";
$plusesX .= $plusX;
$seperatorX = ",";
$plusX = ",+";
}
## Suppress totalling?
if (!$nototal)
{
@@ -60,7 +70,6 @@ foreach ($rrd_list as $i => $rrd)
## This this not the first entry?
if ($i) { $stack="STACK"; }
# if we've been passed a multiplier we must make a CDEF based on it!
$g_defname = $rrd['ds'];
if (is_numeric($multiplier))
@@ -79,6 +88,8 @@ foreach ($rrd_list as $i => $rrd)
$rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['ds'] . $i . "max," . $divider . ",/";
}
## Are our text values related to te multiplier/divisor or not?
if (isset($text_orig) && $text_orig)
{
@@ -97,4 +108,25 @@ foreach ($rrd_list as $i => $rrd)
$rrd_options .= " COMMENT:'\\n'";
}
if($_GET['previous'] == "yes")
{
if (is_numeric($multiplier))
{
$rrd_options .= " CDEF:X=" . $thingX . $plusesX.",".$multiplier. ",*";
} elseif (is_numeric($divider))
{
$rrd_options .= " CDEF:X=" . $thingX . $plusesX.",".$divider. ",/";
} else
{
$rrd_options .= " CDEF:X=" . $thingX . $plusesX;
}
$rrd_options .= " AREA:X#99999999:";
$rrd_options .= " LINE1.25:X#666666:";
}
?>