=================================================================== RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v retrieving revision 1.8 retrieving revision 1.12 diff -u -r1.8 -r1.12 --- nagios/check_hw_sensors/check_hw_sensors 2006/05/02 22:23:29 1.8 +++ nagios/check_hw_sensors/check_hw_sensors 2006/05/03 22:54:43 1.12 @@ -1,14 +1,15 @@ #!/usr/bin/perl -# $RedRiver: check_hw_sensors,v 1.7 2006/05/02 20:03:53 andrew Exp $ +# $RedRiver: check_hw_sensors,v 1.11 2006/05/03 20:01:09 holligan Exp $ ######################################################################## # check_hw_sensors *** A nagios check for OpenBSD hw.sensors # # 2006.05.01 #*#*# andrew fresh ######################################################################## # 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; @@ -20,7 +21,6 @@ use POSIX; use lib "/usr/local/libexec/nagios"; -#use lib $ENV{'HOME'}; use utils qw($TIMEOUT %ERRORS &print_revision &support); use Getopt::Long; @@ -39,8 +39,8 @@ my $sensor; my $warning; my $critical; -my $opt_h ; -my $opt_V ; +my $opt_h; +my $opt_V; my $CHECK_SENSOR = $BASE; my %CHECKS; @@ -65,7 +65,7 @@ } if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.8 $ '); + print_revision($PROGNAME,'$Revision: 1.12 $ '); exit $ERRORS{'OK'}; } @@ -75,10 +75,10 @@ } unless ( ( - defined $filename || - (defined $sensor && ($warning || $critical)) - ) && - ( (!defined $filename) || (!defined $sensor) ) + defined $filename || + (defined $sensor && ($warning || $critical)) + ) && + ( (!defined $filename) || (!defined $sensor) ) ) { print_help(); exit $ERRORS{'OK'}; @@ -140,7 +140,6 @@ push @{ $states{ $r } }, $check . '=' . $SENSORS{$check}{'output'}; } else { - # XXX Error missing sensor push @{ $states{'UNKNOWN'} }, $check . '=No sensor with this id'; } } @@ -160,8 +159,8 @@ if (NAGIOS_OUTPUT) { print "$error (" . scalar(@{ $states{ $error } }) . ")"; unless ($error eq 'OK') { - print '
'; - print map { " - $_
" } @{ $states{ $error } }; + print '
'; + print map { " - $_
" } @{ $states{ $error } }; } } else { print "$error (" . scalar(@{ $states{ $error } }) . "):\n"; @@ -200,38 +199,25 @@ my $type = shift; my $check = shift; - if (defined $check->{'warn'} && $check->{'warn'} =~ /:/) { - if (my ($low, $high) = split /:/, $check->{'warn'}) { - $check->{'warn.low'} = $low; - $check->{'warn.high'} = $high; + foreach my $code ('crit', 'warn') { + if (defined $check->{$code} && $check->{$code} =~ /:/) { + if (my ($low, $high) = split /:/, $check->{$code}) { + $check->{$code . '.low'} = $low; + $check->{$code . '.high'} = $high; + } + delete $check->{$code}; } - delete $check->{'warn'}; - } - if (defined $check->{'crit'} && $check->{'crit'} =~ /:/) { - if (my ($low, $high) = split /:/, $check->{'crit'}) { - $check->{'crit.low'} = $low; - $check->{'crit.high'} = $high; + + foreach my $severity ('low', 'high') { + if (defined $check->{$severity}) { + $check->{ $code . '.' . $severity } = $check->{$severity} + unless defined $check->{ $code . '.' . $severity }; + } } - delete $check->{'crit'}; + no warnings 'uninitialized'; + $check->{$code} = [ split /,\s*/, $check->{$code} ]; } - if (defined $check->{'low'}) { - $check->{'warn.low'} = $check->{'low'} - unless defined $check->{'warn.low'}; - $check->{'crit.low'} = $check->{'low'} - unless defined $check->{'crit.low'}; - } - if (defined $check->{'high'}) { - $check->{'warn.high'} = $check->{'high'} - unless defined $check->{'warn.high'}; - $check->{'crit.high'} = $check->{'high'} - unless defined $check->{'crit.high'}; - } - - no warnings 'uninitialized'; - $check->{'warn'} = [ split /,\s*/, $check->{'warn'} ]; - $check->{'crit'} = [ split /,\s*/, $check->{'crit'} ]; - return $check; } @@ -293,7 +279,7 @@ $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; @@ -361,7 +347,7 @@ $result = $errors{$code} if ($c <= $data); } - } elsif (defined $check->{$code}) { + } elsif (@{ $check->{$code} }) { my $matched = 0; foreach my $c (@{ $check->{$code} }) { @@ -393,7 +379,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'}) { @@ -416,34 +402,54 @@ sub print_help { print <]|(-s -w limit -c limit)) + $PROGNAME (-f []|(-s -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=INTEGER + 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). 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 (:). +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.8 $'); + print_revision($PROGNAME, '$Revision: 1.12 $'); }