Cleanup graphs code

git-svn-id: http://www.observium.org/svn/observer/trunk@1898 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-17 10:57:51 +00:00
parent 834989df95
commit 6708b67694
17 changed files with 269 additions and 223 deletions

View File

@@ -6,18 +6,18 @@ $units_descr = substr(str_pad($units_descr, 18),0,18);
$i = 0;
$rrd_options .= " COMMENT:'$units_descr Current Average Maximum\\n'";
if(!$nototal) {$rrd_options .= " COMMENT:' Tot'";}
if (!$nototal) { $rrd_options .= " COMMENT:' Tot'"; }
$rrd_options .= " COMMENT:'\\n'";
foreach($rrd_list as $rrd)
foreach ($rrd_list as $rrd)
{
if(!$config['graph_colours'][$colours_in][$iter] || !$config['graph_colours'][$colours_out][$iter]) { $iter = 0; }
if (!$config['graph_colours'][$colours_in][$iter] || !$config['graph_colours'][$colours_out][$iter]) { $iter = 0; }
$colour_in=$config['graph_colours'][$colours_in][$iter];
$colour_out=$config['graph_colours'][$colours_out][$iter];
if($rrd['colour_area_in']) { $colour_in = $rrd['colour_area_in']; }
if($rrd['colour_area_out']) {$colour_out = $rrd['colour_area_out']; }
if ($rrd['colour_area_in']) { $colour_in = $rrd['colour_area_in']; }
if ($rrd['colour_area_out']) { $colour_out = $rrd['colour_area_out']; }
$rrd_options .= " DEF:in".$i."=".$rrd['filename'].":".$rrd['rra_in'].":AVERAGE ";
$rrd_options .= " DEF:out".$i."=".$rrd['filename'].":".$rrd['rra_out'].":AVERAGE ";
@@ -25,31 +25,31 @@ foreach($rrd_list as $rrd)
$rrd_options .= " CDEF:outB".$i."=out".$i.",$multiplier,*";
$rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*";
$rrd_options .= " CDEF:octets".$i."=inB".$i.",outB".$i.",+";
if(!$args['nototal'])
if (!$args['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";
}
if($i) {$stack="STACK";}
if ($i) { $stack="STACK"; }
$rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . substr(str_pad($rrd['descr'], 10),0,10) . "In ':$stack";
$rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:inB".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s";
if(!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
$rrd_options .= " COMMENT:'\\n'";
$rrd_optionsb .= " AREA:outB".$i."_neg#" . $colour_out . "::$stack";
$rrd_options .= " HRULE:999999999999999#" . $colour_out . ":'" . substr(str_pad('', 10),0,10) . "Out':";
$rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s";
if(!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
$rrd_options .= " COMMENT:'\\n'";
$i++; $iter++;
}
@@ -57,4 +57,4 @@ foreach($rrd_list as $rrd)
$rrd_options .= $rrd_optionsb;
$rrd_options .= " HRULE:0#999999";
?>
?>