From 2c2f3d000578f050f2b3edf655c90bbd34bc9fd2 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 13 May 2011 13:06:20 +0000
Subject: [PATCH] more generic diskio :)

git-svn-id: http://www.observium.org/svn/observer/trunk@2307 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device/diskio_bits.inc.php   | 3 +++
 html/includes/graphs/device/diskio_common.inc.php | 5 ++---
 html/includes/graphs/device/diskio_ops.inc.php    | 5 +++++
 html/includes/graphs/generic_bits.inc.php         | 3 +--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/html/includes/graphs/device/diskio_bits.inc.php b/html/includes/graphs/device/diskio_bits.inc.php
index 9773781de1..dc0a868f1d 100755
--- a/html/includes/graphs/device/diskio_bits.inc.php
+++ b/html/includes/graphs/device/diskio_bits.inc.php
@@ -12,4 +12,7 @@ $rra_out = "written";
 
 include("includes/graphs/device/diskio_common.inc.php");
 
+include("includes/graphs/generic_multi_bits_separated.inc.php");
+
+
 ?>
diff --git a/html/includes/graphs/device/diskio_common.inc.php b/html/includes/graphs/device/diskio_common.inc.php
index eec485e06b..cbb74e3d29 100644
--- a/html/includes/graphs/device/diskio_common.inc.php
+++ b/html/includes/graphs/device/diskio_common.inc.php
@@ -9,12 +9,11 @@ foreach (dbFetchRows("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE D.de
   {
     $rrd_list[$i]['filename'] = $rrd_filename;
     $rrd_list[$i]['descr'] = $disk['diskio_descr'];
-    $rrd_list[$i]['rra_in'] = "reads";
-    $rrd_list[$i]['rra_out'] = "writes";
+    $rrd_list[$i]['rra_in'] = $rra_in;
+    $rrd_list[$i]['rra_out'] = $rra_out;
     $i++;
   }
 }
 
-include("includes/graphs/generic_multi_bits_separated.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device/diskio_ops.inc.php b/html/includes/graphs/device/diskio_ops.inc.php
index ba3c527213..ec46718964 100755
--- a/html/includes/graphs/device/diskio_ops.inc.php
+++ b/html/includes/graphs/device/diskio_ops.inc.php
@@ -7,8 +7,13 @@ $colours_in = 'greens';
 $multiplier = "1";
 $colours_out = 'blues';
 
+$rra_in  = "reads";
+$rra_out = "writes";
+
 $nototal = 1;
 
 include("includes/graphs/device/diskio_common.inc.php");
 
+include("includes/graphs/generic_multi_seperated.inc.php");
+
 ?>
diff --git a/html/includes/graphs/generic_bits.inc.php b/html/includes/graphs/generic_bits.inc.php
index dcbbb6afdf..54f57356ac 100644
--- a/html/includes/graphs/generic_bits.inc.php
+++ b/html/includes/graphs/generic_bits.inc.php
@@ -9,7 +9,6 @@ if ($rrd_filename) { $rrd_filename_out = $rrd_filename; $rrd_filename_in = $rrd_
 
 if ($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
 
-
 if ($multiplier)
 {
   $rrd_options .= " DEF:p".$out."octets=".$rrd_filename_out.":".$rra_out.":AVERAGE";
@@ -67,4 +66,4 @@ $rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\\\\l'";
 $rrd_options .= " LINE1:95thin#aa0000";
 $rrd_options .= " LINE1:d95thout#aa0000";
 
-?>
\ No newline at end of file
+?>