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

Comparing projects/cms/source/reports/rrdgraphing/watch.pl (file contents):
Revision 1.8 by tdb, Sun Aug 1 10:40:32 2004 UTC vs.
Revision 1.9 by tdb, Thu Feb 10 17:35:58 2005 UTC

# Line 31 | Line 31
31   # $Id$
32   #------------------------------------------------------------
33  
34 – BEGIN {
35 –    push (@INC, "/usr/local/packages/rrdtool/lib/perl5/site_perl/5.8.2/sun4-solaris");
36 – }
37 –
34   my($version) = '$Id$';
35  
36   $| = 1;
# Line 47 | Line 43 | use RRDs;
43  
44   # define variables that will be read from the config
45   # nb. keep this insync with the config file!
46 < use vars qw{
47 <    $imgdir $rrddir                    
46 > use vars qw{
47 >    $imgdir $rrddir
48      $maxrrdage $maximgage $deleterrds $deleteimgs
49 <    $hex_slash $hex_underscore  
49 >    $hex_slash $hex_underscore $hex_space $hex_colon $hex_bslash
50      $rrdstep $retry_wait
51      $verbose $quiet
52   };
# Line 260 | Line 256 | sub processdata() {
256                       );
257              &updaterrd($machine, "cpu", $date, $rrdstep, \%xmlhash, @data);
258                    
259 +            # uptime
260 +            @data = ( "packet.os.uptime:uptime:GAUGE" );
261 +            &updaterrd($machine, "uptime", $date, $rrdstep, \%xmlhash, @data);
262 +                  
263              # mem
264              @data = ( "packet.memory.free:free:GAUGE",
265                        "packet.memory.total:total:GAUGE",
# Line 306 | Line 306 | sub processdata() {
306                  my($mount) = $xmlhash{"packet.disk.p$i.attributes.mount"};
307                  $mount =~ s/_/$hex_underscore/g;
308                  $mount =~ s/\//$hex_slash/g;
309 +                $mount =~ s/\\/$hex_bslash/g;
310 +                $mount =~ s/ /$hex_space/g;
311 +                $mount =~ s/:/$hex_colon/g;
312                  @data = ( "packet.disk.p$i.attributes.total:total:GAUGE",
313                            "packet.disk.p$i.attributes.used:used:GAUGE",
314                            "packet.disk.p$i.attributes.totalinodes:totalinodes:GAUGE",
# Line 319 | Line 322 | sub processdata() {
322              $i = 0;
323              while(defined $xmlhash{"packet.diskio.p$i.attributes.name"}) {
324                  my($name) = $xmlhash{"packet.diskio.p$i.attributes.name"};
325 +                $name =~ s/_/$hex_underscore/g;
326 +                $name =~ s/\//$hex_slash/g;
327 +                $name =~ s/\\/$hex_bslash/g;
328 +                $name =~ s/ /$hex_space/g;
329 +                $name =~ s/:/$hex_colon/g;
330                  @data = ( "packet.diskio.p$i.attributes.rbytes:rbytes:GAUGE",
331                            "packet.diskio.p$i.attributes.wbytes:wbytes:GAUGE",
332                           );
# Line 330 | Line 338 | sub processdata() {
338              $i = 0;
339              while(defined $xmlhash{"packet.net.p$i.attributes.name"}) {
340                  my($name) = $xmlhash{"packet.net.p$i.attributes.name"};
341 +                $name =~ s/_/$hex_underscore/g;
342 +                $name =~ s/\//$hex_slash/g;
343 +                $name =~ s/\\/$hex_bslash/g;
344 +                $name =~ s/ /$hex_space/g;
345 +                $name =~ s/:/$hex_colon/g;
346                  @data = ( "packet.net.p$i.attributes.rx:rx:GAUGE",
347                            "packet.net.p$i.attributes.tx:tx:GAUGE",
348                           );
# Line 341 | Line 354 | sub processdata() {
354              $i = 0;
355              while(defined $xmlhash{"packet.mailq.p$i.attributes.name"}) {
356                  my($name) = $xmlhash{"packet.mailq.p$i.attributes.name"};
357 <                $name =~ s/\s+//g;
357 >                $name =~ s/\s+//g;
358                  @data = ( "packet.mailq.p$i.attributes.size:size:GAUGE",
359                           );
360                  &updaterrd($machine, "mailq-$name", $date, $rrdstep, \%xmlhash, @data);

Diff Legend

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