jackbenny/check_temp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from onkobu/master

Browse Source 
Argument order irrelevant/ sensor parsing improved/ fixed multi-sensor and added new-style/old-style parsing
This commit is contained in:
Jack-Benny Persson 2021-01-11 01:08:36 +01:00 committed by GitHub
commit 3c0407dc11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -34,3 +34,8 @@ Version 1.0:
- Enriched performance data output. For example, "CPU=34;40;55 MB=32;40;55"
- Changed (and improved) the way temperatures are retrieved
- Other fixes and touch-ups, such as the help text now shows long options
Version 1.1:
Improvements for Icinga 2, made by Onkobu
- order of arguments is irrelevant now, --sensor first ignored following -c & -w
- current sensors' multiline output needs sophisticated treatment

37
check_temp.sh
View File

@ -33,8 +33,8 @@
# #
###############################################################################
VERSION="Version 1.0"
AUTHOR="(c) 2011 Jack-Benny Persson (jack-benny@cyberinfo.se)"
VERSION="Version 1.1"
AUTHOR="(c) 2011 Jack-Benny Persson (jack-benny@cyberinfo.se), (c) 2020 Onkobu Tanaake (oss@onkobutanaake.de)"
# Sensor program
SENSORPROG=$(whereis -b -B /{bin,sbin,usr} /{bin,sbin,usr}/* -f sensors | awk '{print $2}')
@ -88,11 +88,13 @@ Options:
-c, --critical <INTEGER>
Exit with CRITICAL status if above INTEGER degrees
Warning and critical thresholds must be provided before the corresponding --sensor option.
-n
Use the new sed based filter in case classic filter yields no temperature.
Examples:
./check_temp.sh -w 65 -c 75 --sensor CPU
./check_temp.sh -w 65 -c 75 --sensor CPU --sensor temp1
./check_temp.sh -w 65 -c 75 --sensor CPU -w 75 -c 85 --sensor temp1,GPU
./check_temp.sh [-n] -w 65 -c 75 --sensor CPU
./check_temp.sh [-n] -w 65 -c 75 --sensor CPU --sensor temp1
./check_temp.sh [-n] -w 65 -c 75 --sensor CPU -w 75 -c 85 --sensor temp1,GPU
EOT
}
@ -144,7 +146,11 @@ function process_sensor {
fi
# Get the temperature
# Grep the first float with a plus sign and keep only the integer
if [ $CLASSIC_FILTER -eq 1 ]; then
WHOLE_TEMP=$(${SENSORPROG} | grep "$sensor" | head -n1 | grep -o "+[0-9]\+\(\.[0-9]\+\)\?[^ \t,()]*" | head -n1)
else
WHOLE_TEMP=$(${SENSORPROG} -A "$sensor" | sed -n '2 p' | grep -o "+[0-9]\+\(\.[0-9]\+\)\?[^ \t,()]*" | head -n1)
fi
TEMPF=$(echo "$WHOLE_TEMP" | grep -o "[0-9]\+\(\.[0-9]\+\)\?")
TEMP=$(echo "$TEMPF" | cut -d. -f1)
@ -184,6 +190,8 @@ __EOT
fi
}
CLASSIC_FILTER=1
# Parse command line options
while [[ -n "$1" ]]; do
case "$1" in
@ -248,21 +256,32 @@ while [[ -n "$1" ]]; do
exit $STATE_UNKNOWN
fi
sensor_declared=true
process_sensor "$2"
sensors_to_check="$2"
shift 2
;;
-n | --new-filter)
CLASSIC_FILTER=0
shift 1
;;
*)
echo "Invalid option '$1'"
print_help
exit $STATE_UNKNOWN
;;
esac
# argument order is irrelevant, Icinga2 gives no guarantees
# as soon as there are enough output is generated
if [ ! -z "$thresh_warn" ] && [ ! -z "$thresh_crit" ] && [ ! -z "$sensors_to_check" -o $# -eq 0 ]; then
if [ "$sensor_declared" = false ]; then
process_sensor "$default_sensor"
else
process_sensor "$sensors_to_check"
fi
fi
done
if [ "$sensor_declared" = false ]; then
process_sensor "$default_sensor"
fi
case "$STATE" in
"$STATE_OK") STATE_TEXT="OK" ;;