--- projects/cms/source/reports/rrdgraphing/graph.pl	2002/06/20 13:46:54	1.7
+++ projects/cms/source/reports/rrdgraphing/graph.pl	2002/10/13 15:14:00	1.10
@@ -26,7 +26,7 @@
 # Generates graphs from rrd databases for i-scream data.
 #
 # $Author: tdb $
-# $Id: graph.pl,v 1.7 2002/06/20 13:46:54 tdb Exp $
+# $Id: graph.pl,v 1.10 2002/10/13 15:14:00 tdb Exp $
 #------------------------------------------------------------
 
 ## TODO
@@ -34,7 +34,7 @@
 #  -- allow configurable periods of graphs
 #  -- comments, types, etc
 
-my($version) = '$Id: graph.pl,v 1.7 2002/06/20 13:46:54 tdb Exp $';
+my($version) = '$Id: graph.pl,v 1.10 2002/10/13 15:14:00 tdb Exp $';
 
 $| = 1;
 
@@ -97,7 +97,6 @@ if($opts{q}) {
     $verbose = 0;
 }
 
-
 # Read the contents of the base directory
 # and pull out the list of subdirectories (except . and .. :)
 opendir(DIR, $rrddir);
@@ -135,13 +134,13 @@ foreach my $machine (@rrddirlist) {
         if($rrd =~ /^(cpu)\.rrd$/) {
             my(@data);
             my(@rawdata);
-            push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu";
-            push @data, "LINE2:$1:user:user#0000FF:OK:user cpu";
+            push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu  ";
+            push @data, "LINE2:$1:user:user#0000FF:OK:user cpu  ";
             push @data, "LINE2:$1:kernel:kernel#00FFFF:OK:kernel cpu";
-            push @data, "LINE2:$1:swap:swap#FF00FF:OK:swap cpu";
+            push @data, "LINE2:$1:swap:swap#FF00FF:OK:swap cpu  ";
             push @data, "LINE2:$1:iowait:iowait#FF0000:OK:iowait cpu";
             push @rawdata, "--upper-limit=100";
-            &makegraph($machine, $1, "CPU Usage for $machine", \@data, \@rawdata);
+            &makegraph($machine, $1, "CPU Usage for $machine", "% cpu time", \@data, \@rawdata);
         }
         if($rrd =~ /^(mem)\.rrd$/) {
             my(@data);
@@ -149,31 +148,31 @@ foreach my $machine (@rrddirlist) {
             # we don't actually want to display free memory,
             # although we need it to do inuse...
             push @data, "NONE:$1:free:free#CCCCFF:NONE:free memory";
-            push @data, "LINE2:$1:total:total#0000FF:NONE:total memory";
+            push @data, "LINE2:$1:total:total#0000FF:NONE:total memory\\n";
             # calculate inuse
             push @rawdata, "CDEF:inuse=total,free,-";
             # and add it to the graph
-            push @rawdata, "AREA:inuse#CCCCFF:memory in use\\l";
+            push @rawdata, "AREA:inuse#CCCCFF:memory in use";
             push @rawdata, "--base=1024";
             # add some nice values to the legend
             &addlegend(\@rawdata, "inuse");
-            &makegraph($machine, $1, "Memory Usage for $machine", \@data, \@rawdata);
+            &makegraph($machine, $1, "Memory Usage for $machine", "megabytes", \@data, \@rawdata);
         }
         if($rrd =~ /^(load)\.rrd$/) {
             my(@data);
-            push @data, "LINE2:$1:load1:load1#CCCCFF:OK:1 minute load average";
-            push @data, "LINE2:$1:load5:load5#7777FF:OK:5 minute load average";
-            push @data, "LINE2:$1:load15:load15#0000FF:OK:15 minute load average";
-            &makegraph($machine, $1, "Loads for $machine", \@data);
+            push @data, "LINE2:$1:load1:load1#CCCCFF:OK: 1 min load average";
+            push @data, "LINE2:$1:load5:load5#7777FF:OK: 5 min load average";
+            push @data, "LINE2:$1:load15:load15#0000FF:OK:15 min load average";
+            &makegraph($machine, $1, "Loads for $machine", "load average", \@data);
         }
         if($rrd =~ /^(proc)\.rrd$/) {
             my(@data);
-            push @data, "LINE2:$1:cpu:cpu#00FF00:OK:cpu processes";
+            push @data, "LINE2:$1:cpu:cpu#00FF00:OK:cpu processes     ";
             push @data, "LINE2:$1:sleeping:sleeping#0000FF:OK:sleeping processes";
-            push @data, "LINE2:$1:stopped:stopped#00FFFF:OK:stopped processes";
-            push @data, "LINE2:$1:total:total#FF00FF:OK:total processes";
-            push @data, "LINE2:$1:zombie:zombie#FF0000:OK:zombie processes";
-            &makegraph($machine, $1, "Processes on $machine", \@data);
+            push @data, "LINE2:$1:stopped:stopped#00FFFF:OK:stopped processes ";
+            push @data, "LINE2:$1:total:total#FF00FF:OK:total processes   ";
+            push @data, "LINE2:$1:zombie:zombie#FF0000:OK:zombie processes  ";
+            &makegraph($machine, $1, "Processes on $machine", "no. of processes", \@data);
         }
         if($rrd =~ /^(swap)\.rrd$/) {
             my(@data);
@@ -181,33 +180,33 @@ foreach my $machine (@rrddirlist) {
             # we don't actually want to display free swap,
             # although we need it to do inuse...
             push @data, "NONE:$1:free:free#CCCCFF:NONE:free swap";
-            push @data, "LINE2:$1:total:total#0000FF:NONE:total swap";
+            push @data, "LINE2:$1:total:total#0000FF:NONE:total swap\\n";
             # calculate inuse
             push @rawdata, "CDEF:inuse=total,free,-";
             # and add it to the graph
-            push @rawdata, "AREA:inuse#CCCCFF:swap in use\\l";
+            push @rawdata, "AREA:inuse#CCCCFF:swap in use";
             push @rawdata, "--base=1024";
             # add some nice values to the legend
             &addlegend(\@rawdata, "inuse");
-            &makegraph($machine, $1, "Swap Usage for $machine", \@data, \@rawdata);
+            &makegraph($machine, $1, "Swap Usage for $machine", "megabytes", \@data, \@rawdata);
         }
         if($rrd =~ /^(users)\.rrd$/) {
             my(@data);
             push @data, "AREA:$1:count:count#CCCCFF:OK:user count";
-            &makegraph($machine, $1, "User Count for $machine", \@data);
+            &makegraph($machine, $1, "User Count for $machine", "no. of users", \@data);
         }
         if($rrd =~ /^(disk)-(\S+).rrd$/) {
             my(@data);
             my(@rawdata);
-            push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:NONE:total size";
-            push @data, "AREA:$1-$2:used:used#CCCCFF:OK:used";
+            push @data, "LINE2:$1-$2:kbytes:kbytes#0000FF:NONE:total size\\n";
+            push @data, "AREA:$1-$2:used:used#CCCCFF:OK:used space";
             push @rawdata, "--base=1024";
             my($type) = $1;
             my($name) = $2;
             my($nicename) = $2;
             $nicename =~ s/$hex_slash/\//g;
             $nicename =~ s/$hex_underscore/_/g;
-            &makegraph($machine, "$type-$name", "Disk Usage for $machine on $nicename", \@data, \@rawdata);
+            &makegraph($machine, "$type-$name", "Disk Usage for $machine on $nicename", "kilobytes", \@data, \@rawdata);
         }
         # probably a queue with a name like this :)
         if($rrd =~ /^(\d+)_0\.rrd$/) {
@@ -219,7 +218,7 @@ foreach my $machine (@rrddirlist) {
                 push @data, "LINE2:$baserrd\_$i:size:size$i" . &get_colour($i) . ":OK:queue$i size ";
                 ++$i;
             }
-            push @data, "LINE2:$baserrd\_0:total:total#FF0000:OK:packets/sec";
+            push @data, "LINE2:$baserrd\_0:total:total#FF0000:OK:packets/sec ";
             my($comment);
             if(-f "$rrddir/$machine/$baserrd.def") {
                 open(DEF, "$rrddir/$machine/$baserrd.def");
@@ -227,7 +226,7 @@ foreach my $machine (@rrddirlist) {
                 chomp $comment if defined $comment;
             }
             $comment = "unknown queue" if not defined $comment;
-            &makegraph($machine, $baserrd, $comment, \@data, \@rawdata);
+            &makegraph($machine, $baserrd, $comment, "", \@data, \@rawdata);
         }
     }
     # have a last check, maybe we can remove the directory now?
@@ -296,6 +295,8 @@ exit(0);
 #              (eg. cpu)
 # $title     = the title for the graph
 #              (eg. kernow CPU usage)
+# $vlabel    = the vertical label to apply to the left side of the graph
+#              (eg. kb/s)
 # $dataref   = a reference to an array containing information for the graph
 #              elements of format: "gtype:rrdname:dsname:name#colour:legend:comment with spaces"
 #              (if gtype is "NONE" only a DEF of 'name' will be defined, no line will be plotted)
@@ -305,7 +306,7 @@ exit(0);
 #
 
 sub makegraph() {
-    my($machine, $type, $title, $dataref, $rawcmdref) = @_;
+    my($machine, $type, $title, $vlabel, $dataref, $rawcmdref) = @_;
     # pass in these arrays by reference
     my(@data) = @$dataref if defined $dataref;
     my(@rawcmd) = @$rawcmdref if defined $rawcmdref;
@@ -323,7 +324,7 @@ sub makegraph() {
         if($dataitem =~ /^(\S+):(\S+):(\S+):(\S+)#(.{6}):(\S+):(.*)$/) {
             push @rrdcmd, "DEF:$4=$rrddir/$machine/$2.rrd:$3:AVERAGE";
             if($1 ne "NONE") {
-                push @rrdcmd, "$1:$4#$5:$7\\s";
+                push @rrdcmd, "$1:$4#$5:$7";
                 if($6 ne "NONE") {
                     # add some nice values to the legend
                     &addlegend(\@rrdcmd, $4);
@@ -334,6 +335,7 @@ sub makegraph() {
     push @rrdcmd, "--title=$title";
     push @rrdcmd, "--imgformat=PNG";
     push @rrdcmd, "--lower-limit=0";
+    push @rrdcmd, "--vertical-label=$vlabel";
     # not entirely convinced this is good...
     push @rrdcmd, "--alt-autoscale-max";
     # add any further raw commands
@@ -365,10 +367,10 @@ sub makegraph() {
 # accepts reference to an array and a name
 sub addlegend() {
     my($dataref, $name) = @_;
-    push @$dataref, "GPRINT:$name:LAST:latest=\%lf\\r";
-    push @$dataref, "GPRINT:$name:AVERAGE:average=\%lf";
-    push @$dataref, "GPRINT:$name:MAX:max=\%lf";
-    push @$dataref, "GPRINT:$name:MIN:min=\%lf\\r";
+    push @$dataref, "GPRINT:$name:LAST:Current\\: \%8.2lf %s";
+    push @$dataref, "GPRINT:$name:AVERAGE:Average\\: \%8.2lf %s";
+    push @$dataref, "GPRINT:$name:MAX:Max\\: \%8.2lf %s\\n";
+    #push @$dataref, "GPRINT:$name:MIN:Min\\: \%8.2lf %s\\n";
 }
 
 # hacky subroutine to return a colour