From 04b754f51344fb58b26745ca16cef9c9777c52ce Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 4 Nov 2008 21:23:54 +0000 Subject: [PATCH] fix git-svn-id: http://www.observium.org/svn/observer/trunk@281 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/graphing.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/graphing.php b/includes/graphing.php index 6e058b6f4..0a4b5fe13 100644 --- a/includes/graphing.php +++ b/includes/graphing.php @@ -9,17 +9,19 @@ function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height) { $imgfile = "graphs/" . "$graph"; $options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height"; if($height < "33") { $options .= " --only-graph"; } + $i = 1; foreach(explode(",", $interfaces) as $ifid) { - $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); + $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { - $options .= " DEF:inoctets" . $int[0] . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; - $options .= " DEF:outoctets" . $int[0] . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; - $in_thing .= $seperator . "inoctets" . $int[0] . ",UN,0," . "inoctets" . $int[0] . ",IF"; - $out_thing .= $seperator . "outoctets" . $int[0] . ",UN,0," . "outoctets" . $int[0] . ",IF"; + $options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; + $options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; + $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF"; + $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF"; $pluses .= $plus; $seperator = ","; $plus = ",+"; + $i++; } } $options .= " CDEF:inoctets=" . $in_thing . $pluses;