===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -r1.2 -r1.9
--- nagios/check_hw_sensors/check_hw_sensors	2006/05/02 02:29:33	1.2
+++ nagios/check_hw_sensors/check_hw_sensors	2006/05/03 03:26:47	1.9
@@ -1,18 +1,26 @@
 #!/usr/bin/perl
-# $RedRiver: check_sensors,v 1.1 2006/05/01 18:11:23 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.8 2006/05/02 21:23:29 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.
+# 
+#   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 constant NAGIOS_OUTPUT => 1;
+
 use POSIX;
-#use lib "/usr/local/libexec/nagios";
-use lib $ENV{'HOME'};
+use lib "/usr/local/libexec/nagios";
+#use lib $ENV{'HOME'};
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 use Getopt::Long;
@@ -20,14 +28,11 @@
 
 my $PROGNAME = "check_hw_sensors";
 
-my $SYSCTL = 'sysctl';
-my $GETCAP = 'getcap';
+my $SYSCTL = '/sbin/sysctl';
+my $GETCAP = '/usr/bin/getcap';
 my $BASE   = 'hw.sensors';
+my $DEFAULT_CONFIG = '/etc/sensorsd.conf';
 
-my $CHECK_SENSOR = $BASE;
-my %CHECKS;
-my %SENSORS;
-
 my $state = 'UNKNOWN'; # tells whether the it is warning, critical, or OK
 my %states; # This stores the count of states;
 my $filename;
@@ -37,11 +42,14 @@
 my $opt_h ;
 my $opt_V ;
 
+my $CHECK_SENSOR = $BASE;
+my %CHECKS;
+my %SENSORS;
 
 #Option checking
 my $status = GetOptions(
-	"V"   => \$opt_V,    "version"    => \$opt_V,
-	"h"   => \$opt_h,    "help"       => \$opt_h,
+	"version|V"    => \$opt_V,
+	"help|h"       => \$opt_h,
 	"filename|f:s" => \$filename,
 	"sensor|s=s"   => \$sensor,
 	"warning|w=s"  => \$warning,
@@ -49,7 +57,7 @@
 );
 		
 # set the default this way so it only happens if someone typed -f or --filename
-$filename = '/etc/sensorsd.conf' if (defined $filename && $filename eq '');
+$filename = $DEFAULT_CONFIG if (defined $filename && $filename eq '');
 
 if ($status == 0) {
 	print_help() ;
@@ -57,7 +65,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.2 $ ');
+	print_revision($PROGNAME,'$Revision: 1.9 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -84,8 +92,8 @@
 	$CHECK_SENSOR = $sensor;
 
 	$CHECKS{$sensor} = {
-		'warning'  => $warning,
-		'critical' => $critical,
+		'warn' => $warning,
+		'crit' => $critical,
 	};
 } elsif (defined $filename) {
 	%CHECKS = parse_file($filename);
@@ -140,15 +148,32 @@
 #print Dumper \%states;
 
 $state = 'OK';
+my $have_results = 0;
 foreach my $error (sort { $ERRORS{$a} <=> $ERRORS{$b} } keys %ERRORS) {
 	if (exists $states{$error}) {
+		$have_results++;
 		$state = $error;
-		print "$error (" . scalar(@{ $states{ $error } }) . "):\n";
-		foreach (@{ $states{ $error } }) {
-			print "   $_\n";
+	}
+}
+foreach my $error (sort { $ERRORS{$b} <=> $ERRORS{$a} } keys %ERRORS) {
+	if (exists $states{$error}) {
+		if (NAGIOS_OUTPUT) {
+			print "$error (" . scalar(@{ $states{ $error } }) . ")";
+			unless ($error eq 'OK') {
+				print '<br>';
+				print map { " - $_<br>" } @{ $states{ $error } };
+			}
+		} else {
+			print "$error (" . scalar(@{ $states{ $error } }) . "):\n";
+			foreach (@{ $states{ $error } }) {
+				print "   $_\n";
+			}
 		}
 	}
 }
+if ($have_results == 0) {
+	print "No results found\n";
+}
 exit $ERRORS{$state};
 
 
@@ -175,9 +200,6 @@
 	my $type  = shift;
 	my $check = shift;
 
-	$check->{'warn'} = $check->{'warning'}  if (!defined $check->{'warn'});
-	$check->{'crit'} = $check->{'critical'} if (!defined $check->{'crit'});
-
 	if (defined $check->{'warn'} && $check->{'warn'} =~ /:/) {
 		if (my ($low, $high) = split /:/, $check->{'warn'}) {
 			$check->{'warn.low'}  = $low;
@@ -271,12 +293,12 @@
 					$result = $errors{$code} 
 						if ($c <= $data);
 				}
-			} elsif (defined $check->{$code}) {
+			} elsif (@{ $check->{$code} }) {
 				my $matched = 0;
 				foreach my $c (@{ $check->{$code} }) {
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 						      ") for '$sensor->{'id'}:$code'";
 						next;
 					}
@@ -339,7 +361,7 @@
 					$result = $errors{$code} 
 						if ($c <= $data);
 				}
-			} elsif (defined $check->{$code}) {
+			} elsif (@{ $check->{$code} }) {
 
 				my $matched = 0;
 				foreach my $c (@{ $check->{$code} }) {
@@ -354,7 +376,7 @@
 
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 							 ") for '$sensor->{'id'}':$code";
 						next;
 					}
@@ -371,7 +393,7 @@
 			$sensor->{'type'} eq 'drive' ||
 			$sensor->{'type'} eq 'indicator'
 		) {
-			if (defined $check->{$code}) {
+			if (@{ $check->{$code} }) {
 				my $matched = 0;
 				foreach (@{ $check->{$code} }) {
 					if ($_ eq $sensor->{'data'}) {
@@ -422,6 +444,6 @@
 
 EOL
 	
-	print_revision($PROGNAME, '$Revision: 1.2 $');
+	print_revision($PROGNAME, '$Revision: 1.9 $');
 }