--- projects/cms/source/reports/rrdgraphing/watch.pl	2005/02/10 17:35:58	1.9
+++ projects/cms/source/reports/rrdgraphing/watch.pl	2006/11/23 16:37:44	1.13
@@ -28,10 +28,10 @@
 # the i-scream server and collecting data.
 #
 # $Author: tdb $
-# $Id: watch.pl,v 1.9 2005/02/10 17:35:58 tdb Exp $
+# $Id: watch.pl,v 1.13 2006/11/23 16:37:44 tdb Exp $
 #------------------------------------------------------------
 
-my($version) = '$Id: watch.pl,v 1.9 2005/02/10 17:35:58 tdb Exp $';
+my($version) = '$Id: watch.pl,v 1.13 2006/11/23 16:37:44 tdb Exp $';
 
 $| = 1;
 
@@ -44,9 +44,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
+    $imgdir $imgwidth $imgheight $rrddir
     $maxrrdage $maximgage $deleterrds $deleteimgs
-    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash
+    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash $hex_rbracket
+    $hex_lbracket $hex_plus $hex_hash
     $rrdstep $retry_wait
     $verbose $quiet
 };
@@ -343,6 +344,10 @@ sub processdata() {
                 $name =~ s/\\/$hex_bslash/g;
                 $name =~ s/ /$hex_space/g;
                 $name =~ s/:/$hex_colon/g;
+                $name =~ s/\(/$hex_lbracket/g;
+                $name =~ s/\)/$hex_rbracket/g;
+                $name =~ s/\+/$hex_plus/g;
+                $name =~ s/#/$hex_hash/g;
                 @data = ( "packet.net.p$i.attributes.rx:rx:GAUGE",
                           "packet.net.p$i.attributes.tx:tx:GAUGE",
                          );