From 94d9e0efd48025714005edb3efd831d5a278b470 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 29 Nov 2011 10:46:02 +0000
Subject: [PATCH] fix location bits graphs :)

git-svn-id: http://www.observium.org/svn/observer/trunk@2743 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/location/bits.inc.php | 26 ++++++++++++++++++----
 html/pages/locations.inc.php               |  1 +
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/html/includes/graphs/location/bits.inc.php b/html/includes/graphs/location/bits.inc.php
index c8296d4b98..a593da84db 100644
--- a/html/includes/graphs/location/bits.inc.php
+++ b/html/includes/graphs/location/bits.inc.php
@@ -2,6 +2,10 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
+$ds_in  = "INOCTETS";
+$ds_out = "OUTOCTETS";
+
+$i=1;
 foreach($devices as $device)
 {
  foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($device['device_id'])) as $int)
@@ -30,21 +34,35 @@ foreach($devices as $device)
 
   if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1)
   {
-    $rrd_filenames[] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
+    $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $port['label'];
+    $rrd_list[$i]['descr_in'] = $port['label'];
+    $rrd_list[$i]['descr_out'] = $port['ifAlias'];
+    $rrd_list[$i]['ds_in'] = $ds_in;
+    $rrd_list[$i]['ds_out'] = $ds_out;
+    $i++;
   }
   unset($ignore);
  }
 }
 
-$rra_in  = "INOCTETS";
-$rra_out = "OUTOCTETS";
+$units ='b';
+$total_units ='B';
+$colours_in ='greens';
+$multiplier = "8";
+$colours_out = 'blues';
+
+$nototal = 1;
+
+$graph_title .= "::bits";
 
 $colour_line_in = "006600";
 $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include("includes/graphs/generic_multi_bits.inc.php");
+include("includes/graphs/generic_multi_bits_separated.inc.php");
 
 
 ?>
diff --git a/html/pages/locations.inc.php b/html/pages/locations.inc.php
index 2221b99c99..0ece462d34 100644
--- a/html/pages/locations.inc.php
+++ b/html/pages/locations.inc.php
@@ -74,6 +74,7 @@ foreach (getlocations() as $location)
   $graph_array['height'] = "100";
   $graph_array['width']  = "220";
   $graph_array['to']     = $config['time']['now'];
+  $graph_array['legend'] = "no";
   $graph_array['id']     = $location;
 
   include("includes/print-quadgraphs.inc.php");