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.47 by tdb, Sat May 18 18:15:56 2002 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines