ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/reports/rrdgraphing/graph.pl
(Generate patch)

Comparing projects/cms/source/reports/rrdgraphing/graph.pl (file contents):
Revision 1.16 by tdb, Thu Mar 31 20:49:33 2005 UTC vs.
Revision 1.20 by tdb, Thu Nov 23 16:37:44 2006 UTC

# Line 46 | Line 46 | use RRDs;
46   # define variables that will be read from the config
47   # nb. keep this insync with the config file!
48   use vars qw{
49 <    $imgdir $rrddir
49 >    $imgdir $imgwidth $imgheight $rrddir
50      $maxrrdage $maximgage $deleterrds $deleteimgs
51 <    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash
51 >    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash $hex_rbracket
52 >    $hex_lbracket $hex_plus $hex_hash
53      $rrdstep $retry_wait
54      $verbose $quiet
55   };
# Line 257 | Line 258 | foreach my $machine (@rrddirlist) {
258              push @data, "AREA:$1-$2:rbytes:rbytes#00FF00:OK:read bytes ";
259              push @data, "LINE2:$1-$2:wbytes:wbytes#0000FF:OK:write bytes";
260              push @rawdata, "--base=1024";
261 <            # some name tidting
261 >            # some name tidying
262              my($type) = $1;
263              my($name) = $2;
264              my($nicename) = $2;
# Line 274 | Line 275 | foreach my $machine (@rrddirlist) {
275              push @data, "AREA:$1-$2:rx:rx#00FF00:OK:received bytes  ";
276              push @data, "LINE2:$1-$2:tx:tx#0000FF:OK:transfered bytes";
277              push @rawdata, "--base=1024";
278 <            # some name tidting
278 >            # some name tidying
279              my($type) = $1;
280              my($name) = $2;
281              my($nicename) = $2;
# Line 283 | Line 284 | foreach my $machine (@rrddirlist) {
284              $nicename =~ s/$hex_bslash/\\/g;
285              $nicename =~ s/$hex_space/ /g;
286              $nicename =~ s/$hex_colon/:/g;
287 +            $nicename =~ s/$hex_lbracket/(/g;
288 +            $nicename =~ s/$hex_rbracket/)/g;
289 +            $nicename =~ s/$hex_plus/+/g;
290 +            $nicename =~ s/$hex_hash/#/g;
291              &makegraph($machine, "$type-$name", "Network IO for $machine on $nicename", "bytes per second", \@data, \@rawdata);
292          }
293          if($rrd =~ /^(mailq)-(\S+)\.rrd$/) {
# Line 419 | Line 424 | sub makegraph() {
424      push @rrdcmd, "--imgformat=PNG";
425      push @rrdcmd, "--lower-limit=0";
426      push @rrdcmd, "--vertical-label=$vlabel";
427 +    push @rrdcmd, "--width=$imgwidth";
428 +    push @rrdcmd, "--height=$imgheight";
429      # not entirely convinced this is good...
430      push @rrdcmd, "--alt-autoscale-max";
431      # add any further raw commands

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines