===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.18
retrieving revision 1.22
diff -u -r1.18 -r1.22
--- nagios/check_hw_sensors/check_hw_sensors	2006/12/02 02:15:17	1.18
+++ nagios/check_hw_sensors/check_hw_sensors	2007/01/06 03:16:41	1.22
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_hw_sensors,v 1.17 2006/10/25 23:30:23 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.21 2006/12/05 16:26:27 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD hw.sensors
 # 
@@ -13,9 +13,10 @@
 
 %ENV = ();
 
-use constant NAGIOS_OUTPUT => 1;
+use constant NAGIOS_OUTPUT => 0;
 
 use POSIX;
+use Config;
 use lib "/usr/local/libexec/nagios";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
@@ -28,6 +29,7 @@
 my $GETCAP = '/usr/bin/getcap';
 my $BASE   = 'hw.sensors';
 my $DEFAULT_CONFIG = '/etc/sensorsd.conf';
+my $OSVer = $Config{'osvers'} || 0;
 
 my $state = 'UNKNOWN'; # tells whether the it is warning, critical, or OK
 my %states; # This stores the count of states;
@@ -92,6 +94,10 @@
 		regex => qr/\sraw$/,
 	},
 	{
+		type  => 'percent',
+		regex => qr/\s\%$/,
+	},
+	{
 		type  => 'lux',
 		regex => qr/\slx$/,
 	},
@@ -111,7 +117,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.18 $ ');
+	print_revision($PROGNAME,'$Revision: 1.22 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -147,24 +153,32 @@
 #while (<>) {
 	chomp;
 	my ($id, $output) = split /=/;
+	my @s = split /\./, $id;
 	my @o = split /,\s*/, $output;
 
 	my ($type, $source, $descr, $data, $status);
 
 	$source = $o[0];
 	$descr  = $o[1];
-	$type   = $o[-2] if @o >= 4;
-	$data   = $o[-1];
 
-	$status = $o[2] if ($type && @o == 5) || @o == 4;
-
-	unless ($type) {
+	if (@s == 4) { # XXX This mebbe needs to end up $OSVer >= 4.1
+		$data   = $o[0];
+		$descr =~ s/^\(|\)$//g;
+		$status = $o[2];
+		($source, $type) = $id =~ /([^\.]+)\.([^\.]+)\d+$/;
+	} elsif ($OSVer >= 4.0) {
+		$data   = $o[2];
+		$status = $o[3];
 		foreach my $t (@Type_Map) {
 			if ($data =~ /$t->{'regex'}/) {
 				$type = $t->{'type'};
 				last;
 			}
 		}
+	}  else {
+		$data   = $o[-1];
+		$status = $o[2] if @o == 5;
+		$type   = $o[-2];
 	}
 
 	$type ||= 'unknown';
@@ -304,25 +318,26 @@
 	return $result unless ref $sensor eq 'HASH';
 	$check = parse_check($sensor->{'type'}, $check) if $check;
 
-	unless ($check) {
-		if ($sensor->{'status'}) {
-			# It looks like doing this should be safe, from 
-			# src/sbin/sysctl/sysctl.c
-			$result = $sensor->{'status'} 
-		} else {
-			return undef;
-		}
-		return $result;
-	}
+	# It looks like doing this should be safe, from 
+	# src/sbin/sysctl/sysctl.c
+	return $sensor->{'status'} unless $check;
 
 	return undef if $check eq 'IGNORE';
 
 	$result = 'OK';
 	foreach my $code ('warn', 'crit') {
 		if (
-			$sensor->{'type'} eq 'volts_dc' ||
 			$sensor->{'type'} eq 'fanrpm'   ||
-			$sensor->{'type'} eq 'raw'
+			$sensor->{'type'} eq 'volt'     ||
+			$sensor->{'type'} eq 'volts_dc' ||
+			$sensor->{'type'} eq 'amps'     ||
+			$sensor->{'type'} eq 'watthour' ||
+			$sensor->{'type'} eq 'amphour'  ||
+			$sensor->{'type'} eq 'integer'  ||
+			$sensor->{'type'} eq 'raw'      ||
+			$sensor->{'type'} eq 'percent'  ||
+			$sensor->{'type'} eq 'lux'      ||
+			$sensor->{'type'} eq 'timedelta'
 		) {
 			my $data = $sensor->{'data'};
 			$data =~ s/[^\d\.]//g;
@@ -461,7 +476,7 @@
 			$sensor->{'type'} eq 'drive' ||
 			$sensor->{'type'} eq 'indicator'
 		) {
-			$sensor->{'type'} =~ s/^drive\s+//;
+			$sensor->{'data'} =~ s/^drive\s+//;
 			if (@{ $check->{$code} }) {
 				my $matched = 0;
 				foreach (@{ $check->{$code} }) {
@@ -474,6 +489,11 @@
 			}
 
 		} else {
+			print STDERR 'Unknown Sensor Type: ',
+			    $sensor->{'id'},
+			    '=',
+			    $sensor->{'type'},
+			    "\n";
 			$result = 'UNKNOWN';
 		}
 
@@ -511,17 +531,18 @@
 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.
+    fanrpm, volts_dc, amps, watthour, amphour, integer (raw), percent,
+    lux or timedelta - 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.
+    any of the entries, it sets 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.
@@ -542,6 +563,6 @@
 
 EOL
 
-        print_revision($PROGNAME, '$Revision: 1.18 $');
+        print_revision($PROGNAME, '$Revision: 1.22 $');
 }