--- projects/cms/source/host/generic/statgrab.pl	2001/01/22 16:51:02	1.8
+++ projects/cms/source/host/generic/statgrab.pl	2001/02/05 08:27:38	1.23
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------
 # Machine statistics grabber
 #     $Author: pjm2 $
-#     $Id: statgrab.pl,v 1.8 2001/01/22 16:51:02 pjm2 Exp $
+#     $Id: statgrab.pl,v 1.23 2001/02/05 08:27:38 pjm2 Exp $
 #
 # A Perl script to return various information about a host machine
 # by examining the output of some common Unix/Linux commands.
@@ -21,9 +21,17 @@ $| = 1;
 # You'd be silly not to use this ;)
 use strict;
 
+# Paths
+my($topbin) = "/usr/local/sbin/top";
+my($dfbin) = "/usr/bin/df";
+my($usersbin) = "/usr/ucb/users";
+my($unamebin) = "/usr/bin/uname";
+my($uptimebin) = "/usr/bin/uptime";
+
 # Run the following components: -
 &print_ident();
 &include_osver();
+&include_uptime();
 &include_users();
 &include_top();
 &include_disk();
@@ -42,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.8 $';
+    print 'version statgrab.pl $Revision: 1.23 $';
     print "\n";
 }
 
@@ -55,7 +63,7 @@ sub print_pair($$$) {
 
     if (!defined $value) {
         if ($type) {
-            $value = 0;
+            $value = "0.00";
         }
         else {
             $value = "unknown";
@@ -74,7 +82,7 @@ sub print_pair($$$) {
 sub include_disk() {
     
     # Run the df program.
-    my(@df) = `df -ak`;
+    my(@df) = `$dfbin -ak`;
 
     # Go through each line of the program, looking for each thing we want.
     my($partition_no) = 0;
@@ -100,12 +108,13 @@ sub include_disk() {
 sub include_users() {
 
     # Find out all users on this machine.
-    my($users) = `users`;
-    my(@users) = split(/\s+/, $users);
+    my($users) = `$usersbin`;
+    $users = "\n" unless defined $users;
+    chop $users;
+    my($users_count) = 0;
+    $users_count++ while $users =~ /\w+/g;
+    my($users_list) = $users." ";
 
-    my($users_count) = $#users + 1;
-    my($users_list) = $users;
-
     &print_pair(1, "packet.users.count", $users_count);
     &print_pair(0, "packet.users.list", $users_list);
 }
@@ -116,13 +125,13 @@ sub include_users() {
 sub include_top() {
 
     # Find out some numbers from top.
-    my(@top) = `top -d2 -s1 0`;
+    my(@top) = `$topbin -d2 -s1 0`;
     my($top) = join(" ", @top);
     $top =~ s/\n//g;
 
     &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/);
@@ -133,11 +142,32 @@ sub include_top() {
     &print_pair(1, "packet.cpu.kernel", $top =~ /([^\s]+?)% kernel/);
     &print_pair(1, "packet.cpu.iowait", $top =~ /([^\s]+?)% iowait/);
     &print_pair(1, "packet.cpu.swap", $top =~ /([^\s]+?)% swap/);
-    &print_pair(1, "packet.memory.real", $top =~ /([^\s]+?)[MG] real/);
-    &print_pair(1, "packet.memory.free", $top =~ /([^\s]+?)[MG] free/);
-    &print_pair(1, "packet.memory.swap_in_use", $top =~ /([^\s]+?)[MG] swap in use/);
-    &print_pair(1, "packet.memory.swap_free", $top =~ /([^\s]+?)[MG] swap free/);
-    
+
+    # The following need to be specified in megabytes.
+    # If they are preceeded by a G, then multiply by 1024.   
+
+    $top =~ /([^\s]+?)([MG]) real/;
+    my($real) = $1;
+    $real*=1024 if $2 eq "G";
+    &print_pair(1, "packet.memory.real", $real);
+
+    $top =~ /([^\s]+?)([MG]) free/;
+    my($free) = $1;
+    $free*=1024 if $2 eq "G";
+    &print_pair(1, "packet.memory.free", $free);
+
+    $top =~ /([^\s]+?)([MG]) swap in use/;
+    my($swap_in_use) = $1;
+    $swap_in_use*=1024 if $2 eq "G";
+    # DO NOT print this one out... save it for in a moment...
+
+    $top =~ /([^\s]+?)([MG]) swap free/;
+    my($swap_free) = $1;
+    $swap_free*=1024 if $2 eq "G";
+    &print_pair(1, "packet.memory.swap_free", $swap_free);
+
+    # AJ requested total swap instead of swap_in_use, so here we go!
+    &print_pair(1, "packet.memory.swap_total", $swap_free + $swap_in_use);
 }
 
 # sub to get details of the machine's operating system.
@@ -146,16 +176,49 @@ sub include_osver() {
     # Find out details about the operating system
     # If these values remain undefined, then the print_pair
     # function shall show the value to be the string "unknown".
-    my($os_name) = `uname -s`;
-    my($os_release) = `uname -r`;
-    my($os_platform) = `uname -m`;
-    my($os_sysname) = `uname -n`;
-    my($os_version) = `uname -v`;
+    my($os_name) = `$unamebin -s`;
+    my($os_release) = `$unamebin -r`;
+    my($os_platform) = `$unamebin -m`;
+    my($os_sysname) = `$unamebin -n`;
+    my($os_version) = `$unamebin -v`;
 
     &print_pair(0, "packet.os.name", $os_name);
     &print_pair(0, "packet.os.release", $os_release);
     &print_pair(0, "packet.os.platform", $os_platform);
     &print_pair(0, "packet.os.sysname", $os_sysname);
     &print_pair(0, "packet.os.version", $os_version);
+
+}
+
+# sub to get system uptime.
+sub include_uptime() {
+
+    # grab the uptime
+    my($uptime) = `$uptimebin`;
+
+    # work out the days, hours, and minutes
+    if ($uptime =~ /hr/) {
+      # 0 minutes
+        $uptime =~ s/up ([0-9]+) .*, ([0-9]+) .*,/$1:$2:0/;
+    }
+    elsif ($uptime =~ /min/) {
+      # 0 hours
+        $uptime =~ s/up ([0-9]+) .*, ([0-9]+) .*,/$1:0:$2/;
+    }
+    elsif ($uptime =~ /day/) {
+      # normal
+        $uptime =~ s/up ([0-9]+) .*, ([0-9]+):([0-9]+)/$1:$2:$3/;
+    }
+    else {
+      # 0 days
+        $uptime =~ s/up ([0-9]+):([0-9]+)/0:$1:$2/;
+    }
+
+    # turn into minutes
+
+    $uptime =~ /([0-9]+):([0-9]+):([0-9]+)/;
+    $uptime = $3 + ($2 + $1*24)*60;
+
+    &print_pair(0, "packet.os.uptime", $uptime);
 
 }