summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2011-09-07 11:55:53 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2011-09-07 11:55:53 (GMT)
commit276c5b98bf619eabd8b0bd5fc3ff60c0a59489a7 (patch)
treefb55ae9e259321d7256affcef2791b2cd3bb64a8
parentf917244ab55917094bfe3bead0e905baad385821 (diff)
downloadmonitoring-plugins-276c5b98bf619eabd8b0bd5fc3ff60c0a59489a7.tar.gz
check_sensors: Detect FAULT status
Return an UNKNOWN status if a faulty sensor is detected. This can be suppressed with the new "--ignore-fault" option. (Fixes Debian bug #615133, patch suggested by Jan Wagner.)
-rw-r--r--NEWS1
-rwxr-xr-xplugins-scripts/check_sensors.sh11
2 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index fd9b8e8..a9f70c1 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ This file documents the major additions and syntax changes between releases.
8 check_http now checks for and prints the certificate cn (hostname) in SSL certificate checks (Stéphane Urbanovski) 8 check_http now checks for and prints the certificate cn (hostname) in SSL certificate checks (Stéphane Urbanovski)
9 Add perfdata to check_ssh (#3244097 - Marco Beck) 9 Add perfdata to check_ssh (#3244097 - Marco Beck)
10 New option to check_smtp to ignore failures when sending QUIT (#3358348 - Duncan Ferguson) 10 New option to check_smtp to ignore failures when sending QUIT (#3358348 - Duncan Ferguson)
11 check_sensors now detects faulty sensors unless --ignore-fault is specified (Jan Wagner)
11 12
12 FIXES 13 FIXES
13 Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603) 14 Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603)
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index ae80fc4..d108bcc 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -10,7 +10,7 @@ REVISION="@NP_VERSION@"
10 10
11 11
12print_usage() { 12print_usage() {
13 echo "Usage: $PROGNAME" 13 echo "Usage: $PROGNAME" [--ignore-fault]
14} 14}
15 15
16print_help() { 16print_help() {
@@ -57,9 +57,12 @@ case "$1" in
57 if echo ${sensordata} | egrep ALARM > /dev/null; then 57 if echo ${sensordata} | egrep ALARM > /dev/null; then
58 echo SENSOR CRITICAL - Sensor alarm detected! 58 echo SENSOR CRITICAL - Sensor alarm detected!
59 exit 2 59 exit 2
60 else 60 elif echo ${sensordata} | egrep FAULT > /dev/null \
61 echo sensor ok 61 && test "$1" != "-i" -a "$1" != "--ignore-fault"; then
62 exit 0 62 echo SENSOR UNKNOWN - Sensor reported fault
63 exit 3
63 fi 64 fi
65 echo sensor ok
66 exit 0
64 ;; 67 ;;
65esac 68esac