=================================================================== RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nagios/check_hw_sensors/check_hw_sensors 2006/12/05 00:17:47 1.20 +++ nagios/check_hw_sensors/check_hw_sensors 2006/12/05 16:26:27 1.21 @@ -1,5 +1,5 @@ #!/usr/bin/perl -T -# $RedRiver: check_hw_sensors,v 1.19 2006/12/04 23:33:53 andrew Exp $ +# $RedRiver: check_hw_sensors,v 1.20 2006/12/05 00:17:47 andrew Exp $ ######################################################################## # check_hw_sensors *** A nagios check for OpenBSD hw.sensors # @@ -13,7 +13,7 @@ %ENV = (); -use constant NAGIOS_OUTPUT => 1; +use constant NAGIOS_OUTPUT => 0; use POSIX; use Config; @@ -117,7 +117,7 @@ } if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.20 $ '); + print_revision($PROGNAME,'$Revision: 1.21 $ '); exit $ERRORS{'OK'}; } @@ -469,7 +469,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} }) { @@ -556,6 +556,6 @@ EOL - print_revision($PROGNAME, '$Revision: 1.20 $'); + print_revision($PROGNAME, '$Revision: 1.21 $'); }