--- projects/cms/source/host/generic/statgrab.pl	2001/02/05 17:21:04	1.27
+++ projects/cms/source/host/generic/statgrab.pl	2001/02/05 19:59:35	1.30
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------
 # Machine statistics grabber
 #     $Author: tdb $
-#     $Id: statgrab.pl,v 1.27 2001/02/05 17:21:04 tdb Exp $
+#     $Id: statgrab.pl,v 1.30 2001/02/05 19:59:35 tdb Exp $
 #
 # A Perl script to return various information about a host machine
 # by examining the output of some common Unix/Linux commands.
@@ -21,13 +21,43 @@ $| = 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";
+# Have to hope this will work really.
+my($ostype) = `uname -s`; chop($ostype);
 
+# Decide which paths we should use.
+my($topbin); my($dfbin); my($usersbin); my($unamebin); my($uptimebin);
+
+if ($ostype eq "SunOS") {
+    # covers: Solaris 8
+    $topbin = "/usr/local/sbin/top";
+    $dfbin = "/usr/bin/df";
+    $usersbin = "/usr/ucb/users";
+    $unamebin = "/usr/bin/uname";
+    $uptimebin = "/usr/bin/uptime";
+}
+elsif ($ostype eq "Linux") {
+    # covers: Debian r2.2
+    $topbin = "/usr/bin/top";
+    $dfbin = "/bin/df";
+    $usersbin = "/usr/bin/users";
+    $unamebin = "/bin/uname";
+    $uptimebin = "/usr/bin/uptime";
+}
+elsif ($ostype eq "FreeBSD") {
+    # covers: FreeBSD 4.2-STABLE
+    $topbin = "/usr/bin/top";
+    $dfbin = "/bin/df";
+    $usersbin = "/usr/bin/users";
+    $unamebin = "/usr/bin/uname";
+    $uptimebin = "/usr/bin/uptime";
+}
+else {
+    print "statgrab.pl Error: Unable to identify system type - \"$ostype\".\n";
+    print "\"uname -s\" does not report one of the following known types;\n";
+    print "      SunOS, Linux, FreeBSD\n";
+    exit(1);
+}
+
 # Run the following components: -
 &print_ident();
 &include_osver();
@@ -42,15 +72,11 @@ exit(0);
 
 
 
-
-
-
-
 # prints out an identifier for this version of statgrab.pl
 # 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.27 $';
+    print 'version statgrab.pl $Revision: 1.30 $';
     print "\n";
 }
 
@@ -124,9 +150,6 @@ sub include_top() {
     my($top) = join(" ", @top);
     $top =~ s/\n//g;
 
-    &print_pair(0, "packet.load.load1", $top =~ /load averages:\s*([^\s]+?),/);
-    &print_pair(0, "packet.load.load5", $top =~ /load averages:\s*.+?,\s*([^\s]+?),/);
-    &print_pair(0, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s/);
     &print_pair(0, "packet.processes.total", $top =~ /([^\s]+?) processes:/);
     &print_pair(0, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/);
     &print_pair(0, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);
@@ -185,7 +208,7 @@ sub include_osver() {
 
 }
 
-# sub to get system uptime.
+# sub to get system uptime in seconds.
 sub include_uptime() {
 
     # debug stuff, all the different cases
@@ -207,57 +230,58 @@ sub include_uptime() {
 
     # grab the uptime
     my($uptime) = `$uptimebin`;
+    
+    &print_pair(0, "packet.load.load1", $uptime =~ /load average.?:\s*([^\s]+?),/);
+    &print_pair(0, "packet.load.load5", $uptime =~ /load average.?:\s*.+?,\s*([^\s]+?),/);
+    &print_pair(0, "packet.load.load15", $uptime =~ /load average.?:\s*.+?,\s*.+?,\s*([^\s]+)/);
 
     # work out the days, hours, and minutes
-    if ($uptime =~ /hr/) {
-      # two possible cases here
-        if($uptime =~ /day/) {
-          # 0 minutes
-            $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
-            $uptime = "$1:$2:0";
+
+    if ($uptime =~ /day.*,\s+([0-9]+):([0-9]+)/) {
+      # normal
+        $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+):([0-9]+)/;
+        $uptime = "$1:$2:$3";
+    }
+    else {
+        if ($uptime =~ /day/) {
+            if ($uptime =~ /hr/) {
+              # 0 minutes
+                $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
+                $uptime = "$1:$2:0";
+            }
+            elsif ($uptime =~ /min/) {
+              # 0 hours
+                $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
+                $uptime = "$1:0:$2";
+            }
+            else {
+              # 0 hours and 0 mins
+                $uptime =~ /up\s+([0-9]+)/;
+                $uptime = "$1:0:0";
+            }
         }
-        else {
+        elsif ($uptime =~ /hr/) {
           # 0 days and 0 minutes
             $uptime =~ /up\s+([0-9]+)\s+/;
             $uptime = "0:$1:0";
         }
-    }
-    elsif ($uptime =~ /min/) {
-      # two possible cases here
-        if($uptime =~ /day/) {
-          # 0 hours
-            $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
-            $uptime = "$1:0:$2";
-        }
-        else {
+        elsif ($uptime =~ /min/) {
           # 0 days and 0 hours
             $uptime =~ /up\s+([0-9]+)\s+/;
             $uptime = "0:0:$1";
         }
-    }
-    elsif ($uptime =~ /day/) {
-        if ($uptime =~ /day.*,\s+([0-9]+):([0-9]+)/) {
-          # normal
-            $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+):([0-9]+)/;
-            $uptime = "$1:$2:$3";
-        }
         else {
-          # 0 hours and 0 mins
-            $uptime =~ /up\s+([0-9]+)/;
-            $uptime = "$1:0:0";
+          # 0 days
+            $uptime =~ /up\s+([0-9]+):([0-9]+)/;
+            $uptime = "0:$1:$2";
         }
     }
-    else {
-      # 0 days
-        $uptime =~ /up\s+([0-9]+):([0-9]+)/;
-        $uptime = "0:$1:$2";
-    }
 
-    # turn into minutes
-
+    # turn into seconds
     $uptime =~ /([0-9]+):([0-9]+):([0-9]+)/;
-    $uptime = $3 + ($2 + $1*24)*60;
-
+    $uptime = ($3+($2+($1*24))*60)*60;
+    
+    # print the value out
     &print_pair("unknown", "packet.os.uptime", $uptime);
 
 }