=================================================================== RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- nagios/check_hw_sensors/check_hw_sensors 2008/03/10 17:21:53 1.25 +++ nagios/check_hw_sensors/check_hw_sensors 2009/11/09 21:25:07 1.26 @@ -1,14 +1,10 @@ #!/usr/bin/perl -T -# $RedRiver: check_hw_sensors,v 1.24 2007/02/14 21:59:10 andrew Exp $ +# $RedRiver: check_hw_sensors,v 1.25 2008/03/10 16:21:53 andrew Exp $ ######################################################################## -# check_hw_sensors *** A nagios check for OpenBSD hw.sensors -# +# check_hw_sensors *** A nagios check for OpenBSD sysctl hw.sensors +# # 2006.05.01 #*#*# andrew fresh ######################################################################## -# TODO: -# Really need real documentation. -# allow checking of hw.sensors on a remote host with ssh somehow -######################################################################## use strict; use warnings; @@ -16,24 +12,39 @@ use constant NAGIOS_OUTPUT => 1; +my $License = <<'EOL'; +Copyright (c) 2009 Andrew Fresh +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +EOL + use POSIX; use Config; use lib "/usr/local/libexec/nagios"; -use utils qw($TIMEOUT %ERRORS &print_revision &support); +use utils qw($TIMEOUT %ERRORS &support); use Getopt::Long; Getopt::Long::Configure('bundling'); my $PROGNAME = "check_hw_sensors"; -my $SYSCTL = '/sbin/sysctl'; -my $GETCAP = '/usr/bin/getcap'; -my $BASE = 'hw.sensors'; +my $SYSCTL = '/sbin/sysctl'; +my $GETCAP = '/usr/bin/getcap'; +my $BASE = 'hw.sensors'; my $DEFAULT_CONFIG = '/etc/sensorsd.conf'; -my $OSVer = $Config{'osvers'} || 0; +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; +my $state = 'UNKNOWN'; # tells whether the it is warning, critical, or OK +my %states; # This stores the count of states; my $filename; my $ignore_status; my $sensor; @@ -48,476 +59,485 @@ #Option checking my $status = GetOptions( - "version|V" => \$opt_V, - "filename|f:s" => \$filename, - "ignore-status|i" => \$ignore_status, - "sensor|s=s" => \$sensor, - "warning|w=s" => \$warning, - "critical|c=s" => \$critical, + "version|V" => \$opt_V, + "filename|f:s" => \$filename, + "ignore-status|i" => \$ignore_status, + "sensor|s=s" => \$sensor, + "warning|w=s" => \$warning, + "critical|c=s" => \$critical, ); # set the default this way so it only happens if someone typed -f or --filename -$filename = $DEFAULT_CONFIG if (defined $filename && $filename eq ''); +$filename = $DEFAULT_CONFIG if ( defined $filename && $filename eq '' ); # Stuff is output in this file by print_sensor() # http://www.openbsd.org/cgi-bin/cvsweb/src/sbin/sysctl/sysctl.c my @Type_Map = ( - { - type => 'temp', - regex => qr/\sdegC$/, - }, - { - type => 'fanrpm', - regex => qr/\sRPM$/, - }, - { - type => 'volts_dc', - regex => qr/\sV\sDC$/, - }, - { - type => 'amps', - regex => qr/\sA$/, - }, - { - type => 'watthour', - regex => qr/\sWh$/, - }, - { - type => 'amphour', - regex => qr/\sAh$/, - }, - { - type => 'indicator', - regex => qr/^(On|Off)$/, - }, - { - type => 'integer', - regex => qr/\sraw$/, - }, - { - type => 'percent', - regex => qr/\s\%$/, - }, - { - type => 'lux', - regex => qr/\slx$/, - }, - { - type => 'drive', - regex => qr/^drive\s/, - }, - { - type => 'timedelta', - regex => qr/\ssecs$/, - }, -); + { type => 'temp', + regex => qr/\sdegC$/, + }, + { type => 'fanrpm', + regex => qr/\sRPM$/, + }, + { type => 'volts_dc', + regex => qr/\sV\sDC$/, + }, + { type => 'amps', + regex => qr/\sA$/, + }, + { type => 'watthour', + regex => qr/\sWh$/, + }, + { type => 'amphour', + regex => qr/\sAh$/, + }, + { type => 'indicator', + regex => qr/^(On|Off)$/, + }, + { type => 'integer', + regex => qr/\sraw$/, + }, + { type => 'percent', + regex => qr/\s\%$/, + }, + { type => 'lux', + regex => qr/\slx$/, + }, + { type => 'drive', + regex => qr/^drive\s/, + }, + { type => 'timedelta', + regex => qr/\ssecs$/, + }, +); -if ($status == 0) { - print_help() ; - exit $ERRORS{'OK'}; +if ( $status == 0 ) { + print_help(); + exit $ERRORS{'OK'}; } if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.25 $ '); - exit $ERRORS{'OK'}; + print_revision( $PROGNAME, '$Revision: 1.26 $ ' ); + exit $ERRORS{'OK'}; } -unless ( - ( - defined $filename || - (not defined $ignore_status) || - (defined $sensor && ($warning || $critical)) - ) && - ( (!defined $filename) || (!defined $sensor) ) -) { - print_help(); - exit $ERRORS{'OK'}; +if ( + $opt_h + || ( ( !defined $filename ) && ( !defined $sensor ) ) + #|| ( defined $sensor && !( $warning || $critical ) ) + ) +{ + print_help(); + exit $ERRORS{'OK'}; } +if ( defined $sensor ) { + if ( $sensor !~ /^$BASE/ ) { + $sensor = $BASE . '.' . $sensor; + } + $CHECK_SENSOR = $sensor; -if (defined $sensor) { - if ($sensor !~ /^$BASE/) { - $sensor = $BASE . '.' . $sensor; - } - $CHECK_SENSOR = $sensor; + $CHECKS{$sensor}{'warn'} = $warning if defined $warning; + $CHECKS{$sensor}{'crit'} = $critical if defined $critical; - $CHECKS{$sensor}{'warn'} = $warning if defined $warning; - $CHECKS{$sensor}{'crit'} = $critical if defined $critical; - -} elsif (defined $filename) { - %CHECKS = parse_file($filename); } +elsif ( defined $filename ) { + %CHECKS = parse_file($filename); +} -open my $sysctl, "-|", $SYSCTL, $CHECK_SENSOR +open my $sysctl, "-|", $SYSCTL, $CHECK_SENSOR or die "Couldn't open sysctl: $!"; while (<$sysctl>) { -#while (<>) { - chomp; - my ($id, $output) = split /=/; - my @s = split /\./, $id; - my @o = split /,\s*/, $output; - my ($type, $source, $descr, $data, $status); + #while (<>) { + chomp; + my ( $id, $output ) = split /=/; + my @s = split /\./, $id; + my @o = split /,\s*/, $output; - $source = $o[0]; - $descr = $o[1]; + my ( $type, $source, $descr, $data, $status ); - if ($OSVer >= 4.1) { - $data = $o[0]; - if ($data =~ s/\s+\((.*)\).*$//) { - $descr = $1; - } - $status = $o[1]; - ($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]; - } + $source = $o[0]; + $descr = $o[1]; - $type ||= 'unknown'; + if ( $OSVer >= 4.1 ) { + $data = $o[0]; + if ( $data =~ s/\s+\((.*)\).*$// ) { + $descr = $1; + } + $status = $o[1]; + ( $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]; + } - $SENSORS{$id} = { - id => $id, - output => $output, - source => $source, - description => $descr, - status => $status, - type => $type, - data => $data, - }; - + $type ||= 'unknown'; + + $SENSORS{$id} = { + id => $id, + output => $output, + source => $source, + description => $descr, + status => $status, + type => $type, + data => $data, + }; + } close $sysctl; sub as_if_numeric { - my $_a = $a; - my $_b = $b; - $_a =~ s/\D//g; - $_b =~ s/\D//g; - $_a <=> $_b; + my $_a = $a; + my $_b = $b; + $_a =~ s/\D//g; + $_b =~ s/\D//g; + $_a <=> $_b; } -foreach my $s (sort as_if_numeric keys %SENSORS) { - my ($r, $data); - if (exists $CHECKS{$s}) { - $r = check_sensor($SENSORS{$s}, $CHECKS{$s}); - $data = $s . '=' . $SENSORS{$s}{'output'}; - } elsif (not $ignore_status) { - $r = check_sensor($SENSORS{$s}); - $data = $s . '=' . $SENSORS{$s}{'output'}; - } else { - # ignore this sensor - } - next unless defined $r; - push @{ $states{ $r } }, $data; +foreach my $s ( sort as_if_numeric keys %SENSORS ) { + my ( $r, $data ); + if ( exists $CHECKS{$s} ) { + $r = check_sensor( $SENSORS{$s}, $CHECKS{$s} ); + $data = $s . '=' . $SENSORS{$s}{'output'}; + } + elsif ( not $ignore_status ) { + $r = check_sensor( $SENSORS{$s} ); + $data = $s . '=' . $SENSORS{$s}{'output'}; + } + else { + + # ignore this sensor + } + next unless defined $r; + push @{ $states{$r} }, $data; } $state = 'OK'; my $have_results = 0; -foreach my $error (sort { $ERRORS{$a} <=> $ERRORS{$b} } keys %ERRORS) { - if (exists $states{$error}) { - $have_results++; - $state = $error; - } +foreach my $error ( sort { $ERRORS{$a} <=> $ERRORS{$b} } keys %ERRORS ) { + if ( exists $states{$error} ) { + $have_results++; + $state = $error; + } } -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 '
'; - print map {" - $_
"} @{ $states{ $error } }; - } - } else { - 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} } ) . ")"; + if ( $error ne 'OK' ) { + print '
'; + print map {" - $_
"} @{ $states{$error} }; + } + } + else { + print "$error (" . scalar( @{ $states{$error} } ) . "):\n"; + foreach ( @{ $states{$error} } ) { + print " $_\n"; + } + } + } } -if ($have_results == 0) { - print "No results found\n"; +if ( $have_results == 0 ) { + print "No results found\n"; } exit $ERRORS{$state}; - sub parse_file { - my $filename = shift; - my %contents; - - die "file '$filename' does not exist." unless -e $filename; + my $filename = shift; + my %contents; - open my $fh, '-|', $GETCAP, '-a', '-f', $filename - or die "Couldn't open FILE '$GETCAP -a -f $filename': $!"; - LINE: while (<$fh>) { - chomp; - my ($key, @c) = split /\:/; - foreach (@c) { - my ($k, $v) = split /\=/; - if (lc($k) eq 'ignore') { - $contents{$key}{'IGNORE'} = 1; - } elsif (lc($k) eq 'status') { - $contents{$key}{'STATUS'} = 1; - } else { - $contents{$key}{$k} = $v; - } - } - } - close $fh; + die "file '$filename' does not exist." unless -e $filename; - return %contents; + open my $fh, '-|', $GETCAP, '-a', '-f', $filename + or die "Couldn't open FILE '$GETCAP -a -f $filename': $!"; + while (<$fh>) { + chomp; + my ( $key, @c ) = split /\:/; + foreach (@c) { + my ( $k, $v ) = split /\=/; + if ( lc($k) eq 'ignore' ) { + $contents{$key}{'IGNORE'} = 1; + } + elsif ( lc($k) eq 'status' ) { + $contents{$key}{'STATUS'} = 1; + } + else { + $contents{$key}{$k} = $v; + } + } + } + close $fh; + + return %contents; } sub parse_check { - my $type = shift; - my $check = shift; + my $check = shift; - return undef unless $check; - return undef if $check->{'STATUS'}; - return 'IGNORE' if $check->{'IGNORE'}; + return unless $check; + return if $check->{'STATUS'}; + return 'IGNORE' if $check->{'IGNORE'}; - 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}; - } + foreach my $code ( 'crit', 'warn' ) { + if ( defined $check->{$code} && $check->{$code} =~ /:/ ) { + if ( my ( $low, $high ) = split /:/, $check->{$code} ) { + $check->{ $code . '.low' } = $low if length $low; + $check->{ $code . '.high' } = $high if length $high; + } + delete $check->{$code}; + } - foreach my $severity ('low', 'high') { - if (defined $check->{$severity}) { - $check->{ $code . '.' . $severity } = $check->{$severity} - unless defined $check->{ $code . '.' . $severity }; - } - } - no warnings 'uninitialized'; - $check->{$code} = [ split /,\s*/, $check->{$code} ]; - } + foreach my $severity ( 'low', 'high' ) { + if ( defined $check->{$severity} ) { + $check->{ $code . '.' . $severity } = $check->{$severity} + if !defined $check->{ $code . '.' . $severity }; + } + } + no warnings 'uninitialized'; + $check->{$code} = [ split /,\s*/, $check->{$code} ]; + } - return $check; + return $check; } sub check_sensor { - my $sensor = shift; - my $check = shift; - my $result = 'UNKNOWN'; - my %errors = ( - 'warn' => 'WARNING', - 'crit' => 'CRITICAL', - ); + my $sensor = shift; + my $check = shift; + my $result = 'UNKNOWN'; + my %errors = ( + 'warn' => 'WARNING', + 'crit' => 'CRITICAL', + ); - return $result unless ref $sensor eq 'HASH'; - $check = parse_check($sensor->{'type'}, $check) if $check; + return $result unless ref $sensor eq 'HASH'; + $check = parse_check($check) if $check; - # It looks like doing this should be safe, from - # src/sbin/sysctl/sysctl.c - return $sensor->{'status'} unless $check; + if (! $check) { + # It looks like doing this should be safe, from + # src/sbin/sysctl/sysctl.c + return $sensor->{'status'} if $sensor->{'status'}; - return undef if $check eq 'IGNORE'; + return; + } + elsif ($check eq 'IGNORE') { + return; + } - $result = 'OK'; - foreach my $code ('warn', 'crit') { - if ( - $sensor->{'type'} eq 'fan' || - $sensor->{'type'} eq 'fanrpm' || - $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; - unless (length $data) { - warn "INVALID DATA ($sensor->{'data'}) for '$sensor->{'id'}'"; - next; - } + use YAML; + print Dump $check; - if ( - defined $check->{$code . ".low"} || - defined $check->{$code . ".high"} - ) { - if (defined $check->{$code . ".low"}) { - my $c = $check->{$code . ".low"}; - $c =~ s/[^\d\.]//g; - - unless (length $c) { - warn "INVALID CHECK (" . $check->{$code . ".low"} . - ") for '$sensor->{'id'}:$code.low'"; - next; - } + $result = 'OK'; + foreach my $code ( 'warn', 'crit' ) { + if ( $sensor->{'type'} eq 'fan' + || $sensor->{'type'} eq 'fanrpm' + || $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; + if (! length $data ) { + warn "INVALID DATA ($sensor->{'data'}) for '$sensor->{'id'}'"; + next; + } - $result = $errors{$code} - if ($c >= $data); - } - if (defined $check->{$code . ".high"}) { - my $c = $check->{$code . ".high"}; - $c =~ s/[^\d\.]//g; - unless (length $c) { - warn "INVALID CHECK (" . $check->{$code . ".high"} . - ") for '$sensor->{'id'}:$code.high'"; - next; - } + if ( defined $check->{ $code . ".low" } + || defined $check->{ $code . ".high" } ) + { + if ( defined $check->{ $code . ".low" } ) { + my $c = $check->{ $code . ".low" }; + $c =~ s/[^\d\.]//g; - $result = $errors{$code} - if ($c <= $data); - } - } elsif (@{ $check->{$code} }) { - my $matched = 0; - foreach my $c (@{ $check->{$code} }) { - $c =~ s/[^\d\.]//g; - unless (length $c) { - warn "INVALID CHECK (" . $c . - ") for '$sensor->{'id'}:$code'"; - next; - } + if (! length $c ) { + warn "INVALID CHECK (" + . $check->{ $code . ".low" } + . ") for '$sensor->{'id'}:$code.low'"; + next; + } - if ($c eq $data) { - $matched = 1; - last; - } - } - $result = $errors{$code} unless $matched; - } + $result = $errors{$code} + if ( $c >= $data ); + } + if ( defined $check->{ $code . ".high" } ) { + my $c = $check->{ $code . ".high" }; + $c =~ s/[^\d\.]//g; + if (! length $c ) { + warn "INVALID CHECK (" + . $check->{ $code . ".high" } + . ") for '$sensor->{'id'}:$code.high'"; + next; + } - } elsif ($sensor->{'type'} eq 'temp') { - my ($degC, $degF) = split /\//, $sensor->{'data'}; - $degC =~ s/[^\d\.]//g; - $degF ||= $degC * 9 / 5 + 32; - $degF =~ s/[^\d\.]//g; - if ( - defined $check->{$code . ".low"} || - defined $check->{$code . ".high"} - ) { - if (defined $check->{$code . ".low"}) { - my $c = $check->{$code . ".low"}; - my $data = $degC; + $result = $errors{$code} + if ( $c <= $data ); + } + } + elsif ( @{ $check->{$code} } ) { + my $matched = 0; + foreach my $c ( @{ $check->{$code} } ) { + $c =~ s/[^\d\.]//g; + if (! length $c ) { + warn "INVALID CHECK (" . $c + . ") for '$sensor->{'id'}:$code'"; + next; + } - $data = $degF if ($c =~ /F/i); - unless (length $data) { - warn "INVALID DATA (" . $sensor->{'data'} . - ") for '$sensor->{'id'}'"; - next; - } + if ( $c eq $data ) { + $matched = 1; + last; + } + } + $result = $errors{$code} unless $matched; + } - $c =~ s/[^\d\.]//g; - unless (length $c) { - warn "INVALID CHECK (" . $check->{$code . ".low"} . - ") for '$sensor->{'id'}':$code.low"; - next; - } + } + elsif ( $sensor->{'type'} eq 'temp' ) { + my ( $degC, $degF ) = split /\//, $sensor->{'data'}; + $degC =~ s/[^\d\.]//g; + $degF ||= $degC * 9 / 5 + 32; + $degF =~ s/[^\d\.]//g; + if ( defined $check->{ $code . ".low" } + || defined $check->{ $code . ".high" } ) + { + if ( defined $check->{ $code . ".low" } ) { + my $c = $check->{ $code . ".low" }; + my $data = $degC; - $result = $errors{$code} - if ($c >= $data); - } - if (defined $check->{$code . ".high"}) { - my $c = $check->{$code . ".high"}; + $data = $degF if ( $c =~ /F/i ); + if (! length $data ) { + warn "INVALID DATA (" + . $sensor->{'data'} + . ") for '$sensor->{'id'}'"; + next; + } - my $data = $degC; - $data = $degF if ($c =~ /F/i); - unless (length $data) { - warn "INVALID DATA (" . $sensor->{'data'} . - ") for '$sensor->{'id'}'"; - next; - } + $c =~ s/[^\d\.]//g; + if (! length $c ) { + warn "INVALID CHECK (" + . $check->{ $code . ".low" } + . ") for '$sensor->{'id'}':$code.low"; + next; + } - $c =~ s/[^\d\.]//g; - unless (length $c) { - warn "INVALID CHECK (" . $check->{$code . ".high"} . - ") for '$sensor->{'id'}:$code.high'"; - next; - } + $result = $errors{$code} + if ( $c >= $data ); + } + if ( defined $check->{ $code . ".high" } ) { + my $c = $check->{ $code . ".high" }; - $result = $errors{$code} - if ($c <= $data); - } - } elsif (@{ $check->{$code} }) { + my $data = $degC; + $data = $degF if ( $c =~ /F/i ); + if (! length $data ) { + warn "INVALID DATA (" + . $sensor->{'data'} + . ") for '$sensor->{'id'}'"; + next; + } - my $matched = 0; - foreach my $c (@{ $check->{$code} }) { - my $data = $degC; + $c =~ s/[^\d\.]//g; + if (! length $c ) { + warn "INVALID CHECK (" + . $check->{ $code . ".high" } + . ") for '$sensor->{'id'}:$code.high'"; + next; + } - $data = $degF if ($c =~ /F/i); - unless (length $data) { - warn "INVALID DATA (" . $sensor->{'data'} . - ") for '$sensor->{'id'}'"; - next; - } + $result = $errors{$code} + if ( $c <= $data ); + } + } + elsif ( @{ $check->{$code} } ) { - $c =~ s/[^\d\.]//g; - unless (length $c) { - warn "INVALID CHECK (" . $c . - ") for '$sensor->{'id'}':$code"; - next; - } + my $matched = 0; + foreach my $c ( @{ $check->{$code} } ) { + my $data = $degC; - if ($c eq $data) { - $matched = 1; - last; - } - } - $result = $errors{$code} unless $matched; - } + $data = $degF if ( $c =~ /F/i ); + if (! length $data ) { + warn "INVALID DATA (" + . $sensor->{'data'} + . ") for '$sensor->{'id'}'"; + next; + } - } elsif ( - $sensor->{'type'} eq 'drive' || - $sensor->{'type'} eq 'indicator' - ) { - $sensor->{'data'} =~ s/^drive\s+//; - if (@{ $check->{$code} }) { - my $matched = 0; - foreach (@{ $check->{$code} }) { - if ($_ eq $sensor->{'data'}) { - $matched = 1; - last; - } - } - $result = $errors{$code} unless $matched; - } + $c =~ s/[^\d\.]//g; + if (! length $c ) { + warn "INVALID CHECK (" . $c + . ") for '$sensor->{'id'}':$code"; + next; + } - } else { - print STDERR 'Unknown Sensor Type: ', - $sensor->{'id'}, - '=', - $sensor->{'type'}, - "\n"; - $result = 'UNKNOWN'; - } + if ( $c eq $data ) { + $matched = 1; + last; + } + } + $result = $errors{$code} unless $matched; + } - } + } + elsif ($sensor->{'type'} eq 'drive' + || $sensor->{'type'} eq 'indicator' ) + { + $sensor->{'data'} =~ s/^drive\s+//; + if ( @{ $check->{$code} } ) { + my $matched = 0; + foreach ( @{ $check->{$code} } ) { + if ( $_ eq $sensor->{'data'} ) { + $matched = 1; + last; + } + } + $result = $errors{$code} unless $matched; + } - return $result; + } + else { + print STDERR 'Unknown Sensor Type: ', + $sensor->{'id'}, + '=', + $sensor->{'type'}, + "\n"; + $result = 'UNKNOWN'; + } + + } + + return $result; } sub print_help { - print <]|(-s [-w limit] [-c limit])) Usage: -i, --ignore-status - Don't check the status of sensors that report it. + Don't automatically check the status of sensors that report it. -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. + ID of a single sensor. "-s kate0.temp0" means hw.sensors.kate0.temp0 -w, --warning=RANGE or single ENTRY Exit with WARNING status if outside of RANGE or if != ENTRY -c, --critical=RANGE or single ENTRY @@ -525,7 +545,8 @@ 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). +sensorsd(8) this means you can use the same config file for $PROGNAME +as well as sensorsd(8). $PROGNAME understands the following entries: @@ -556,7 +577,7 @@ 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.. +make the single check. An entry marked "ignore" will cause that sensor to be skipped. Generally used with state checking of all sensors to ignore sensors you @@ -567,6 +588,18 @@ EOL - print_revision($PROGNAME, '$Revision: 1.25 $'); + print_revision( $PROGNAME, '$Revision: 1.26 $' ); + + print $License; } + + +sub print_revision { + my ($prog, $rev) = @_; + $rev =~ s/^\D+([\d\.]+)\D+$/v$1/xms; + + print "$prog $rev\n"; +} + +