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

Overlay new filtering and fix multi-sensor call

Browse Source 
- introduced -n to use sed-based filtering
- multi-sensor call yields output for all sensors instead of only last
This commit is contained in:
onkobu 2020-12-27 10:30:32 +01:00
parent b504956f4f
commit 9a3f4cc3a9
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
check_temp.sh
View File

@ -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
WHOLE_TEMP=$(${SENSORPROG} -A "$sensor" | sed -n '2 p' | grep -o "+[0-9]\+\(\.[0-9]\+\)\?[^ \t,()]*" | head -n1)
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
@ -252,19 +260,31 @@ while [[ -n "$1" ]]; do
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
unset thresh_crit
unset thresh_warn
unset sensors_to_check
fi
done
if [ "$sensor_declared" = false ]; then
process_sensor "$default_sensor"
else
process_sensor "$sensors_to_check"
fi
case "$STATE" in
"$STATE_OK") STATE_TEXT="OK" ;;