HISTORY

@@ -34,13 +34,3 @@ 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
-
-Version 1.2:
-   Improvements for Icinga 2, made by Onkobu
-   - Added the ability to switch between old and new style with an -n option
-   - Fixed multi-sensor with identical thresholds

THANKS

@@ -5,8 +5,6 @@ Some kind people have been contributing by reporting problems, suggesting
 improvements or submitting code.
 Here is a list of these kind people.
 
-Chad Columbus   ccolumbu@hotmail.com
+Chad Columbus	ccolumbu@hotmail.com
-Ryan Loudfoot   elyrith@gmail.com
+Ryan Loudfoot	elyrith@gmail.com
-Nikodimos       kikniknik on Github
+Nikodimos	kikniknik on Github
-Shakalandy      shakalandy on Github
-Onkobu Tanaake  onkobu on Github

check_temp.sh

@@ -33,8 +33,8 @@
 #                                                                             #
 ###############################################################################
 
-VERSION="Version 1.2"
+VERSION="Version 1.0"
-AUTHOR="(c) 2011 Jack-Benny Persson (jack-benny@cyberinfo.se), (c) 2020 Onkobu Tanaake (oss@onkobutanaake.de)"
+AUTHOR="(c) 2011 Jack-Benny Persson (jack-benny@cyberinfo.se)"
 
 # Sensor program
 SENSORPROG=$(whereis -b -B /{bin,sbin,usr} /{bin,sbin,usr}/* -f sensors | awk '{print $2}')
@@ -88,13 +88,11 @@ 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 [-n] -w 65 -c 75 --sensor CPU
+./check_temp.sh -w 65 -c 75 --sensor CPU
-./check_temp.sh [-n] -w 65 -c 75 --sensor CPU --sensor temp1
+./check_temp.sh -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
+./check_temp.sh -w 65 -c 75 --sensor CPU -w 75 -c 85 --sensor temp1,GPU
 EOT
 }
 
@@ -146,11 +144,7 @@ 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)
-		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)
 
@@ -190,8 +184,6 @@ __EOT
 	fi
 }
 
-CLASSIC_FILTER=1
-
 # Parse command line options
 while [[ -n "$1" ]]; do 
    case "$1" in
@@ -256,32 +248,21 @@ while [[ -n "$1" ]]; do
 		exit $STATE_UNKNOWN
 	   fi
 	   sensor_declared=true
-	   sensors_to_check="$2"
+	   process_sensor $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" ;;