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.3 by tdb, Tue May 21 15:01:43 2002 UTC vs.
Revision 1.6 by tdb, Mon Mar 10 11:34:43 2003 UTC

# Line 2 | Line 2
2  
3   #
4   # i-scream central monitoring system
5 + # http://www.i-scream.org.uk
6   # Copyright (C) 2000-2002 i-scream
7   #
8   # This program is free software; you can redistribute it and/or
# Line 287 | Line 288 | sub processdata() {
288              @data = ( "packet.users.count:count:GAUGE",
289                       );
290              &updaterrd($machine, "users", $date, $rrdstep, \%xmlhash, @data);
291 <            
291 >
292 >            # paging
293 >            @data = ( "packet.pages.pageins:pageins:GAUGE",
294 >                      "packet.pages.pageouts:pageouts:GAUGE",
295 >                     );
296 >            &updaterrd($machine, "paging", $date, $rrdstep, \%xmlhash, @data);
297 >
298              # disk
299              my($i) = 0;
300              while(defined $xmlhash{"packet.disk.p$i.attributes.mount"}) {
301                  my($mount) = $xmlhash{"packet.disk.p$i.attributes.mount"};
302                  $mount =~ s/_/$hex_underscore/g;
303                  $mount =~ s/\//$hex_slash/g;
304 <                @data = ( "packet.disk.p$i.attributes.kbytes:kbytes:GAUGE",
304 >                @data = ( "packet.disk.p$i.attributes.total:total:GAUGE",
305                            "packet.disk.p$i.attributes.used:used:GAUGE",
306 +                          "packet.disk.p$i.attributes.totalinodes:totalinodes:GAUGE",
307 +                          "packet.disk.p$i.attributes.freeinodes:freeinodes:GAUGE",
308                           );
309                  &updaterrd($machine, "disk-$mount", $date, $rrdstep, \%xmlhash, @data);
310                  ++$i;
311 +            }
312 +
313 +            # diskio
314 +            $i = 0;
315 +            while(defined $xmlhash{"packet.diskio.p$i.attributes.name"}) {
316 +                my($name) = $xmlhash{"packet.diskio.p$i.attributes.name"};
317 +                @data = ( "packet.diskio.p$i.attributes.rbytes:rbytes:GAUGE",
318 +                          "packet.diskio.p$i.attributes.wbytes:wbytes:GAUGE",
319 +                         );
320 +                &updaterrd($machine, "diskio-$name", $date, $rrdstep, \%xmlhash, @data);
321 +                ++$i
322 +            }
323 +
324 +            # net
325 +            $i = 0;
326 +            while(defined $xmlhash{"packet.net.p$i.attributes.name"}) {
327 +                my($name) = $xmlhash{"packet.net.p$i.attributes.name"};
328 +                @data = ( "packet.net.p$i.attributes.rx:rx:GAUGE",
329 +                          "packet.net.p$i.attributes.tx:tx:GAUGE",
330 +                         );
331 +                &updaterrd($machine, "net-$name", $date, $rrdstep, \%xmlhash,
332 + @data);
333 +                ++$i
334              }
335          }
336          

Diff Legend

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