--- projects/cms/source/reports/rrdgraphing/graph.pl	2004/08/01 10:40:32	1.14
+++ projects/cms/source/reports/rrdgraphing/graph.pl	2005/02/10 17:35:58	1.15
@@ -27,7 +27,7 @@
 # Generates graphs from rrd databases for i-scream data.
 #
 # $Author: tdb $
-# $Id: graph.pl,v 1.14 2004/08/01 10:40:32 tdb Exp $
+# $Id: graph.pl,v 1.15 2005/02/10 17:35:58 tdb Exp $
 #------------------------------------------------------------
 
 ## TODO
@@ -35,12 +35,8 @@
 #  -- allow configurable periods of graphs
 #  -- comments, types, etc
 
-BEGIN {
-    push (@INC, "/usr/local/packages/rrdtool/lib/perl5/site_perl/5.8.2/sun4-solaris");
-}
+my($version) = '$Id: graph.pl,v 1.15 2005/02/10 17:35:58 tdb Exp $';
 
-my($version) = '$Id: graph.pl,v 1.14 2004/08/01 10:40:32 tdb Exp $';
-
 $| = 1;
 
 use strict;
@@ -49,10 +45,10 @@ use RRDs;
 
 # define variables that will be read from the config
 # nb. keep this insync with the config file!
-use vars qw{ 
-    $imgdir $rrddir                     
+use vars qw{
+    $imgdir $rrddir
     $maxrrdage $maximgage $deleterrds $deleteimgs
-    $hex_slash $hex_underscore  
+    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash
     $rrdstep $retry_wait
     $verbose $quiet
 };
@@ -143,10 +139,15 @@ foreach my $machine (@rrddirlist) {
             push @data, "STACK:$1:iowait:iowait#FF0000:OK:iowait cpu";
             push @data, "STACK:$1:kernel:kernel#00FFFF:OK:kernel cpu";
             push @data, "STACK:$1:user:user#0000FF:OK:user cpu  ";
-            #push @data, "STACK:$1:idle:idle#00FF00:OK:idle cpu  ";
+            push @data, "LINE2:$1:idle:idle#00FF00:OK:idle cpu  ";
             push @rawdata, "--upper-limit=100";
             &makegraph($machine, $1, "CPU Usage for $machine", "% cpu time", \@data, \@rawdata);
         }
+        if($rrd =~ /^(uptime)\.rrd$/) {
+            my(@data);
+            push @data, "LINE2:$1:uptime:uptime#0000FF:OK:uptime";
+            &makegraph($machine, $1, "Uptime for $machine", "uptime in seconds", \@data);
+        }
         if($rrd =~ /^(mem)\.rrd$/) {
             my(@data);
             my(@rawdata);
@@ -183,7 +184,7 @@ foreach my $machine (@rrddirlist) {
             push @data, "STACK:$1:zombie:zombie#FF0000:OK:zombie processes  ";
             push @data, "STACK:$1:cpu:cpu#00FF00:OK:cpu processes     ";
             push @data, "STACK:$1:sleeping:sleeping#0000FF:OK:sleeping processes";
-            #push @data, "LINE2:$1:total:total#FF00FF:OK:total processes   ";
+            push @data, "LINE2:$1:total:total#FF00FF:OK:total processes   ";
             &makegraph($machine, $1, "Processes on $machine", "no. of processes", \@data);
         }
         if($rrd =~ /^(swap)\.rrd$/) {
@@ -245,6 +246,9 @@ foreach my $machine (@rrddirlist) {
             my($nicename) = $2;
             $nicename =~ s/$hex_slash/\//g;
             $nicename =~ s/$hex_underscore/_/g;
+            $nicename =~ s/$hex_bslash/\\/g;
+            $nicename =~ s/$hex_space/ /g;
+            $nicename =~ s/$hex_colon/:/g;
             &makegraph($machine, "$type-$name", "Disk Usage for $machine on $nicename", "% usage", \@data, \@rawdata);
         }
         if($rrd =~ /^(diskio)-(\S+)\.rrd$/) {
@@ -253,7 +257,16 @@ foreach my $machine (@rrddirlist) {
             push @data, "AREA:$1-$2:rbytes:rbytes#00FF00:OK:read bytes ";
             push @data, "LINE2:$1-$2:wbytes:wbytes#0000FF:OK:write bytes";
             push @rawdata, "--base=1024";
-            &makegraph($machine, "$1-$2", "Disk IO for $machine on $2", "bytes per second", \@data, \@rawdata);
+            # some name tidting
+            my($type) = $1;
+            my($name) = $2;
+            my($nicename) = $2;
+            $nicename =~ s/$hex_slash/\//g;
+            $nicename =~ s/$hex_underscore/_/g;
+            $nicename =~ s/$hex_bslash/\\/g;
+            $nicename =~ s/$hex_space/ /g;
+            $nicename =~ s/$hex_colon/:/g;
+            &makegraph($machine, "$type-$name", "Disk IO for $machine on $nicename", "bytes per second", \@data, \@rawdata);
         }
         if($rrd =~ /^(net)-(\S+)\.rrd$/) {
             my(@data);
@@ -261,7 +274,16 @@ foreach my $machine (@rrddirlist) {
             push @data, "AREA:$1-$2:rx:rx#00FF00:OK:received bytes  ";
             push @data, "LINE2:$1-$2:tx:tx#0000FF:OK:transfered bytes";
             push @rawdata, "--base=1024";
-            &makegraph($machine, "$1-$2", "Network IO for $machine on $2", "bytes per second", \@data, \@rawdata);
+            # some name tidting
+            my($type) = $1;
+            my($name) = $2;
+            my($nicename) = $2;
+            $nicename =~ s/$hex_slash/\//g;
+            $nicename =~ s/$hex_underscore/_/g;
+            $nicename =~ s/$hex_bslash/\\/g;
+            $nicename =~ s/$hex_space/ /g;
+            $nicename =~ s/$hex_colon/:/g;
+            &makegraph($machine, "$type-$name", "Network IO for $machine on $nicename", "bytes per second", \@data, \@rawdata);
         }
         if($rrd =~ /^(mailq)-(\S+)\.rrd$/) {
             my(@data);
@@ -311,7 +333,7 @@ if($deleteimgs) {
     my(@imgdirlist) = sort grep { -d "$imgdir/$_" && !/^\.$/ && !/^\.\.$/ } readdir(DIR);
     closedir DIR;
 
-    # look through each directoty, as they might
+    # look through each directory, as they might
     # contain images for a particular machine
     foreach my $machine (@imgdirlist) {
         # Read the contents of the directory