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

Comparing projects/cms/source/host/generic/statgrab.pl (file contents):
Revision 1.41 by tdb, Tue Mar 20 13:04:22 2001 UTC vs.
Revision 1.48 by tdb, Tue May 21 16:47:11 2002 UTC

# Line 1 | Line 1
1   #!/usr/bin/perl -w
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
9 + # modify it under the terms of the GNU General Public License
10 + # as published by the Free Software Foundation; either version 2
11 + # of the License, or (at your option) any later version.
12 + #
13 + # This program is distributed in the hope that it will be useful,
14 + # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16 + # GNU General Public License for more details.
17 + #
18 + # You should have received a copy of the GNU General Public License
19 + # along with this program; if not, write to the Free Software
20 + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
21 + #
22 +
23   #-----------------------------------------------------------------
24   # Machine statistics grabber
25   #     $Author$
# Line 78 | Line 98 | exit(0);
98   # the host should check this when reading data
99   # means the host must be checked and updated to work with newer versions.
100   sub print_ident() {
101 <    print 'version statgrab.pl $Revision$';
101 >    print 'packet.version statgrab.pl $Revision$';
102      print "\n";
103   }
104  
# Line 105 | Line 125 | sub print_pair($$$) {
125   sub include_disk() {
126      
127      # Run the df program.
128 <    my(@df) = `$dfbin -ak`;
128 >    my(@df) = `$dfbin -akl`;
129  
130      # Go through each line of the program, looking for each thing we want.
131      my($partition_no) = 0;
# Line 268 | Line 288 | sub include_top() {
288          # The following need to be specified in megabytes.
289          # If they are preceeded by a G, then multiply by 1024.  
290          
291 <        $top =~ / ([0-9]+?)([KMG]) av/;
291 >        $top =~ /Mem:.*?([0-9]+)([KMG])\s+(av|total)/;
292          my($real) = $1;
293          $real*=1024 if $2 eq "G";
294          $real/=1024 if $2 eq "K";
295          &print_pair(0, "packet.memory.total", int($real));
296          
297 <        $top =~ / ([0-9]+?)([KMG]) free/;
297 >        $top =~ /Mem:.*?([0-9]+)([KMG])\s+free/;
298          my($free) = $1;
299          $free*=1024 if $2 eq "G";
300          $free/=1024 if $2 eq "K";
301          &print_pair(0, "packet.memory.free", int($free));
302          
303 <        $top =~ /Swap:\s+([0-9]]+?)([KMG]) av/;
303 >        $top =~ /Swap:.*?([0-9]+)([KMG])\s+(av|total)/;
304          my($swap_total) = $1;
305          $swap_total*=1024 if $2 eq "G";
306          $swap_total/=1024 if $2 eq "K";
307          &print_pair(0, "packet.swap.total", int($swap_total));
308          
309 <        $top =~ /Swap:.*, ([0-9]+?)([KMG]) free/;
309 >        $top =~ /Swap:.*?([0-9]+)([KMG])\s+free/;
310          my($swap_free) = $1;
311          $swap_free*=1024 if $2 eq "G";
312          $swap_free/=1024 if $2 eq "K";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines