--- projects/cms/source/host/generic/statgrab.pl	2001/02/05 17:05:22	1.25
+++ projects/cms/source/host/generic/statgrab.pl	2001/02/05 17:13:26	1.26
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------
 # Machine statistics grabber
 #     $Author: pjm2 $
-#     $Id: statgrab.pl,v 1.25 2001/02/05 17:05:22 pjm2 Exp $
+#     $Id: statgrab.pl,v 1.26 2001/02/05 17:13:26 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.25 $';
+    print 'version statgrab.pl $Revision: 1.26 $';
     print "\n";
 }
 
@@ -144,7 +144,7 @@ sub include_top() {
     $top =~ /([^\s]+?)([MG]) real/;
     my($real) = $1;
     $real*=1024 if $2 eq "G";
-    &print_pair(0, "packet.memory.real", $real);
+    &print_pair(0, "packet.memory.total", $real);
 
     $top =~ /([^\s]+?)([MG]) free/;
     my($free) = $1;
@@ -159,10 +159,10 @@ sub include_top() {
     $top =~ /([^\s]+?)([MG]) swap free/;
     my($swap_free) = $1;
     $swap_free*=1024 if $2 eq "G";
-    &print_pair(0, "packet.memory.swap_free", $swap_free);
+    &print_pair(0, "packet.swap.free", $swap_free);
 
     # AJ requested total swap instead of swap_in_use, so here we go!
-    &print_pair(0, "packet.memory.swap_total", $swap_free + $swap_in_use);
+    &print_pair(0, "packet.swap.total", $swap_free + $swap_in_use);
 }
 
 # sub to get details of the machine's operating system.