--- projects/cms/source/host/generic/statgrab.pl 2001/02/05 00:08:45 1.22 +++ projects/cms/source/host/generic/statgrab.pl 2001/02/05 08:33:51 1.24 @@ -2,8 +2,8 @@ #----------------------------------------------------------------- # Machine statistics grabber -# $Author: tdb $ -# $Id: statgrab.pl,v 1.22 2001/02/05 00:08:45 tdb Exp $ +# $Author: pjm2 $ +# $Id: statgrab.pl,v 1.24 2001/02/05 08:33:51 pjm2 Exp $ # # A Perl script to return various information about a host machine # by examining the output of some common Unix/Linux commands. @@ -50,7 +50,7 @@ exit(0); # the host should check this when reading data # means the host must be checked and updated to work with newer versions. sub print_ident() { - print 'version statgrab.pl $Revision: 1.22 $'; + print 'version statgrab.pl $Revision: 1.24 $'; print "\n"; } @@ -131,7 +131,7 @@ sub include_top() { &print_pair(1, "packet.load.load1", $top =~ /load averages:\s*([^\s]+?),/); &print_pair(1, "packet.load.load5", $top =~ /load averages:\s*.+?,\s*([^\s]+?),/); - &print_pair(1, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s.*/); + &print_pair(1, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s/); &print_pair(1, "packet.processes.total", $top =~ /([^\s]+?) processes:/); &print_pair(1, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/); &print_pair(1, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);