From 1c5f50f29651de13d1326ffcdbaf0738dd3929e9 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 11 Aug 2010 11:11:09 +0000
Subject: [PATCH] move diskio to bytes instead of bits

git-svn-id: http://www.observium.org/svn/observer/trunk@1663 61d68cd4-352d-0410-923a-c4978735b2b8
---
 .../graphs/device/screenos_sessions.inc.php   | 35 +++++++++++
 html/includes/graphs/diskio/bits.inc.php      |  2 +-
 html/includes/graphs/generic_bytes.inc.php    | 63 +++++++++++++++++++
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 html/includes/graphs/device/screenos_sessions.inc.php
 create mode 100644 html/includes/graphs/generic_bytes.inc.php

diff --git a/html/includes/graphs/device/screenos_sessions.inc.php b/html/includes/graphs/device/screenos_sessions.inc.php
new file mode 100644
index 0000000000..bd4d6a4f40
--- /dev/null
+++ b/html/includes/graphs/device/screenos_sessions.inc.php
@@ -0,0 +1,35 @@
+<?php
+
+
+#$device = device_by_id_cache($id);
+
+include("includes/graphs/common.inc.php");
+
+$file = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("screenos_sessions.rrd");
+
+$rrd_list[0]['filename'] = $file;
+$rrd_list[0]['descr'] = "Maxiumum";
+$rrd_list[0]['rra'] = "max";
+
+$rrd_list[1]['filename'] = $file;
+$rrd_list[1]['descr'] = "Allocated";
+$rrd_list[1]['rra'] = "allocate";
+
+$rrd_list[2]['filename'] = $file;
+$rrd_list[2]['descr'] = "Failed";
+$rrd_list[2]['rra'] = "failed";
+
+
+if ($_GET['debug']) { print_r($rrd_list); } 
+
+$colours   = "mixed";
+$nototal   = 1;
+$unit_text = "Sessions";
+$scale_min = "0";
+
+
+include ("includes/graphs/generic_multi_line.inc.php");
+
+
+
+?>
diff --git a/html/includes/graphs/diskio/bits.inc.php b/html/includes/graphs/diskio/bits.inc.php
index 5b6058f2d6..9ddb1f5b12 100644
--- a/html/includes/graphs/diskio/bits.inc.php
+++ b/html/includes/graphs/diskio/bits.inc.php
@@ -3,6 +3,6 @@
 $rra_in = "read";
 $rra_out = "written";
 
-include("includes/graphs/generic_bits.inc.php");
+include("includes/graphs/generic_bytes.inc.php");
 
 ?>
diff --git a/html/includes/graphs/generic_bytes.inc.php b/html/includes/graphs/generic_bytes.inc.php
new file mode 100644
index 0000000000..d4f238363c
--- /dev/null
+++ b/html/includes/graphs/generic_bytes.inc.php
@@ -0,0 +1,63 @@
+<?php
+
+/// Draw generic octets graph
+/// args: rra_in, rra_out, rrd_filename, bg, legend, from, to, width, height, inverse
+
+include("includes/graphs/common.inc.php");
+
+if($rrd_filename) { $rrd_filename_out = $rrd_filename; $rrd_filename_in = $rrd_filename; }
+
+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";
+  $rrd_options .= " DEF:p".$in."octets=".$rrd_filename_in.":".$rra_in.":AVERAGE";
+  $rrd_options .= " DEF:p".$out."octets_max=".$rrd_filename_out.":".$rra_out.":MAX";
+  $rrd_options .= " DEF:p".$in."octets_max=".$rrd_filename_in.":".$rra_in.":MAX";
+  $rrd_options .= " CDEF:inoctets=pinoctets,$multiplier,*";
+  $rrd_options .= " CDEF:outoctets=poutoctets,$multiplier,*";
+  $rrd_options .= " CDEF:inoctets_max=pinoctets_max,$multiplier,*";
+  $rrd_options .= " CDEF:outoctets_max=poutoctets_max,$multiplier,*";
+} else {
+  $rrd_options .= " DEF:".$out."octets=".$rrd_filename_out.":".$rra_out.":AVERAGE";
+  $rrd_options .= " DEF:".$in."octets=".$rrd_filename_in.":".$rra_in.":AVERAGE";
+  $rrd_options .= " DEF:".$out."octets_max=".$rrd_filename_out.":".$rra_out.":MAX";
+  $rrd_options .= " DEF:".$in."octets_max=".$rrd_filename_in.":".$rra_in.":MAX";
+}
+
+$rrd_options .= " CDEF:octets=inoctets,outoctets,+";
+$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
+$rrd_options .= " CDEF:doutoctets_max=outoctets_max,-1,*";
+
+$rrd_options .= " VDEF:totin=inoctets,TOTAL";
+$rrd_options .= " VDEF:totout=outoctets,TOTAL";
+$rrd_options .= " VDEF:tot=octets,TOTAL";
+
+#$rrd_options .= " VDEF:95thin=inoctets,95,PERCENT";
+#$rrd_options .= " VDEF:95thout=outoctets,95,PERCENT";
+#$rrd_options .= " VDEF:d95thout=doutoctets,5,PERCENT";
+
+$rrd_options .= " AREA:inoctets_max#aDEB7B:";
+$rrd_options .= " AREA:inoctets#CDEB8B:";
+$rrd_options .= " COMMENT:'Bytes\sec           Now       Ave      Max\\n'";
+$rrd_options .= " LINE1.25:inoctets#006600:'In            '";
+$rrd_options .= " GPRINT:inoctets:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:inoctets:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:inoctets_max:MAX:%6.2lf%s\\\\n";
+#$rrd_options .= " GPRINT:95thin:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:doutoctets_max#a3b9FF:";
+$rrd_options .= " AREA:doutoctets#C3D9FF:";
+$rrd_options .= " LINE1.25:doutoctets#000099:'Out           '";
+$rrd_options .= " GPRINT:outoctets:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:outoctets:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:outoctets_max:MAX:%6.2lf%s\\\\n";
+#$rrd_options .= " GPRINT:95thout:%6.2lf%s\\\\n";
+$rrd_options .= " GPRINT:tot:'Total %6.2lf%s'";
+$rrd_options .= " GPRINT:totin:'(In %6.2lf%s'";
+$rrd_options .= " GPRINT:totout:'Out %6.2lf%s)\\\\l'";
+#$rrd_options .= " LINE1:95thin#aa0000";
+#$rrd_options .= " LINE1:d95thout#aa0000";
+
+?>