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

@@ -1,43 +1,46 @@
<?php
include("includes/graphs/common.inc.php");
include("includes/graphs/common.inc.php");
$unit_text = str_pad($unit_text, 13);
$unit_text = substr($unit_text,0,13);
$unit_text = str_pad($unit_text, 13);
$unit_text = substr($unit_text,0,13);
$i = 0;
$iter = 0;
$i = 0;
$iter = 0;
$rrd_options .= " COMMENT:'".$unit_text." Cur Min Max Avg\\n'";
$rrd_options .= " COMMENT:'".$unit_text." Cur Min Max Avg\\n'";
foreach($rrd_list as $rrd) {
if(!$config['graph_colours'][$colours][$iter]) { $iter = 0; }
foreach ($rrd_list as $rrd)
{
if (!$config['graph_colours'][$colours][$iter]) { $iter = 0; }
$colour=$config['graph_colours'][$colours][$iter];
$colour=$config['graph_colours'][$colours][$iter];
$rra = $rrd['rra'];
$filename = $rrd['filename'];
$descr = $rrd['descr'];
$descr = substr(str_pad($descr, 10),0,10);
$descr = str_replace(":", "\:", $descr);
$rra = $rrd['rra'];
$filename = $rrd['filename'];
$descr = $rrd['descr'];
$descr = substr(str_pad($descr, 10),0,10);
$descr = str_replace(":", "\:", $descr);
$id = $rra."_".$i;
$rrd_options .= " DEF:".$id."=$filename:$rra:AVERAGE";
$rrd_options .= " DEF:".$id."min=$filename:$rra:MIN";
$rrd_options .= " DEF:".$id."max=$filename:$rra:MAX";
if($rrd['invert'] == "1") {
$rrd_options .= " CDEF:".$id."graph=".$id.",-1,*";
$rrd_options .= " LINE1.25:".$id."graph#".$colour.":'$descr'";
} else {
$rrd_options .= " LINE1.25:".$id."#".$colour.":'$descr'";
}
$id = $rra."_".$i;
$rrd_options .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
$rrd_options .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:%5.2lf%s\\\\n";
$rrd_options .= " DEF:".$id."=$filename:$rra:AVERAGE";
$rrd_options .= " DEF:".$id."min=$filename:$rra:MIN";
$rrd_options .= " DEF:".$id."max=$filename:$rra:MAX";
$i++; $iter++;
if ($rrd['invert'] == "1")
{
$rrd_options .= " CDEF:".$id."graph=".$id.",-1,*";
$rrd_options .= " LINE1.25:".$id."graph#".$colour.":'$descr'";
} else {
$rrd_options .= " LINE1.25:".$id."#".$colour.":'$descr'";
}
?>
$rrd_options .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
$rrd_options .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:%5.2lf%s\\\\n";
$i++; $iter++;
}
?>