===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -r1.10 -r1.14
--- nagios/check_hw_sensors/check_hw_sensors	2006/05/03 04:31:22	1.10
+++ nagios/check_hw_sensors/check_hw_sensors	2006/05/04 02:30:29	1.14
@@ -1,23 +1,26 @@
-#!/usr/bin/perl
-# $RedRiver: check_hw_sensors,v 1.9 2006/05/03 02:26:47 andrew Exp $
+#!/usr/bin/perl -T
+# $RedRiver: check_hw_sensors,v 1.13 2006/05/03 22:16:42 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD hw.sensors
 # 
 # 2006.05.01 #*#*# andrew fresh <andrew@mad-techies.org>
 ########################################################################
 # TODO: 
-#   Really need to fix the documentation issue.
+#   Really need real documentation.
 # 
-#   I want the ability to just check the "status" entry that is in some output.  For example the OK here:
+#   I want the ability to just check the "status" entry that is in 
+#   some output.  For example the OK here:
 #     hw.sensors.1=esm0, CPU 1, OK, temp, 31.00 degC / 87.80 degF
 ########################################################################
 use strict;
 use warnings;
 
-use Data::Dumper;
+#use Data::Dumper;
 
-use constant NAGIOS_OUTPUT => 0;
+%ENV = ();
 
+use constant NAGIOS_OUTPUT => 1;
+
 use POSIX;
 use lib "/usr/local/libexec/nagios";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
@@ -64,7 +67,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.10 $ ');
+	print_revision($PROGNAME,'$Revision: 1.14 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -401,34 +404,55 @@
 sub print_help {
 	print <<EOL;
 $PROGNAME plugin for Nagios monitors sysctl hw.sensors on OpenBSD
-	$PROGNAME (-f [<FILENAME>]|(-s <hw.sensors id> -w limit -c limit))
+    $PROGNAME (-f [<FILENAME>]|(-s <hw.sensors id> -w limit -c limit))
 
 Usage:
-	-f, --filename=FILE
-		FILE to load checks from (defaults to /etc/sensorsd.conf)
-	-s, --sensor=ID
-		ID of a single sensor.  "-s 0" means hw.sensors.0.
-	-w, --warning=RANGE or single ENTRY
-		Exit with WARNING status if outside of RANGE or if != ENTRY
-	-c, --critical=INTEGER
-		Exit with CRITICAL status if outside of RANGE or if != ENTRY
+    -f, --filename=FILE
+        FILE to load checks from (defaults to /etc/sensorsd.conf)
+    -s, --sensor=ID
+        ID of a single sensor.  "-s 0" means hw.sensors.0.
+    -w, --warning=RANGE or single ENTRY
+        Exit with WARNING status if outside of RANGE or if != ENTRY
+    -c, --critical=RANGE or single ENTRY
+        Exit with CRITICAL status if outside of RANGE or if != ENTRY
 
-	-h (--help)       usage help
+    -h (--help)       usage help
 
-FILE is in the same format as sensorsd.conf(5).  These additional entries in the file are ignored by sensorsd(8).  $PROGNAME understands the following entries:
-	low, high, crit, warn, crit.low, crit.high, warn.low, warn.high
+FILE is in the same format as sensorsd.conf(5) plus some additional
+entries.  These additional entries in the file are ignored by
+sensorsd(8).  
 
-An ENTRY depends on the type.  The descriptions in sensorsd.conf(5) can be used when appropriate, or you can use the following:
-	volts_dc, fanrpm or raw - Anything that includes digits.  Anything that isn't a digit or period is stripped from the entry and the sensor output and they are compared.
-	temp - Can be as above, but if the entry has an F in it, it compares farenheit, otherwise it uses celcius.
-	indicator or drive - does a case sensitive match of each entry in the comma separated list and if it does not match any of the entries, it matches the status.
+$PROGNAME understands the following entries:
 
-The entries 'crit' or 'warn' (or the -c or -w on the command line) may be a RANGE or a comma separated list of acceptable values.  The comma separated list of values contains a list of things that will NOT cause the status.  This is possibly counterintuitive, but you are more likely to know good values than bad values.
+    low, high, crit, warn, crit.low, crit.high, warn.low, warn.high
 
-A RANGE is a low ENTRY and a high ENTRY separated by a colon (:).  It can also be low: or :high with the other side left blank to only make the single check..  
+An ENTRY depends on the type.  The descriptions in sensorsd.conf(5)
+can be used when appropriate, or you can use the following:
 
+    volts_dc, fanrpm or raw - Anything that includes digits.
+    Both the value of the check and the value of the sensor
+    response that are not either a digit or period are stripped
+    and then the two resultant values are compared.
+
+    temp - Can be as above, but if the entry has an F in it,
+    it compares farenheit, otherwise it uses celcius.
+
+    indicator or drive - does a case sensitive match of each
+    entry in the comma separated list and if it does not match
+    any of the entries, it matches the status.
+
+The entries 'crit' or 'warn' (or the -c or -w on the command line)
+may be a RANGE or a comma separated list of acceptable values.
+The comma separated list of values contains a list of things that
+will NOT cause the status.  This is possibly counterintuitive, but
+you are more likely to know good values than bad values.
+
+A RANGE is a low ENTRY and a high ENTRY separated by a colon (:).
+It can also be low: or :high with the other side left blank to only
+make the single check..
+
 EOL
 	
-	print_revision($PROGNAME, '$Revision: 1.10 $');
+	print_revision($PROGNAME, '$Revision: 1.14 $');
 }