From 7e33e13abc7019c12ab17593d92848cc412a2416 Mon Sep 17 00:00:00 2001
From: Elyrith <elyrith@gmail.com>
Date: Fri, 30 Nov 2012 00:08:45 -0500
Subject: [PATCH 1/2] Increased version to 0.7 because of new "advanced" sensor
 parsing (line 191) -Added following line edits info to comments at the top
 and increased version number -Line 193, modified sensor parsing to cut after
 the first '+' since all positive temperatures are preceded by a + and the one
 we want is labeled first -Line 211, reduced "verbosity" needed to see verbose
 info (was 2: -v -v) -Line 229-232, now checks if no sensor data was found and
 exits with STATE_UNKNOWN -Fixed 2 typos, one in output and other an in-line
 comment -Updated line numbers in previous version info lines in comments
 since my comments pushed the lines down

---
 check_temp.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/check_temp.sh b/check_temp.sh
index 0a6dce6..a1f28f2 100755
--- a/check_temp.sh
+++ b/check_temp.sh
@@ -27,9 +27,13 @@
 # Version 0.2: Line 98, fixed the missing "-n" option (Thanks to Chad who     #
 # pointed this out for me). Also added a "shopt -s extglob". (Thx to Chad)    #
 # Version 0.5: Line 162, fixed a typo (EXIT_UNKNOWN to STATE_UNKNOWN)         #
+# Version 0.7:                                                                #
+#    Line 191, modified sensor grab from "3rd section" to "after first '+'"   #
+#    Line 227-230, now checks if no sensor data was found and exits with      #
+#                  STATE_UNKNOWN                                              #
 ###############################################################################
 
-VERSION="Version 0.6"
+VERSION="Version 0.7"
 AUTHOR="(c) 2011 Jack-Benny Persson (jack-benny@cyberinfo.se)"
 
 # Sensor program
@@ -56,7 +60,7 @@ print_help()
 {
 	print_version
 	printf "$AUTHOR\n"
-	printf "Monitor temperatur with the use of sensors\n"
+	printf "Monitor temperature with the use of sensors\n"
 /bin/cat <<EOT
 
 Options:
@@ -184,10 +188,10 @@ fi
 
 
 #Get the temperature
-TEMP=`${SENSORPROG} | grep "$sensor Temp" | awk '{print $3}' | cut -c2-3`
+TEMP=`${SENSORPROG} | grep "$sensor" | cut -d+ -f2 | cut -c1-2 `
 
 
-# Check if the tresholds has been set correctly
+# Check if the thresholds have been set correctly
 if [[ -z "$thresh_warn" || -z "$thresh_crit" ]]; then
 	# One or both thresholds were not specified
 	printf "\nThreshold not set"
@@ -202,7 +206,7 @@ fi
 
 
 # Verbose output
-if [[ "$verbosity" -ge 2 ]]; then
+if [[ "$verbosity" -ge 1 ]]; then
    /bin/cat <<__EOT
 Debugging information:
   Warning threshold: $thresh_warn 
@@ -211,7 +215,7 @@ Debugging information:
   Current $sensor temperature: $TEMP
 __EOT
 printf "\n  Temperature lines directly from sensors:\n"
-${SENSORPROG} | grep "Temp"
+${SENSORPROG}
 printf "\n\n"
 fi
 
@@ -220,7 +224,12 @@ PERFDATA=`${SENSORPROG} | grep "$sensor"`
 
 
 # And finally check the temperature against our thresholds
-if [[ "$TEMP" -gt "$thresh_crit" ]]; then
+if [[ "$TEMP" != +([0-9]) ]]; then
+	# Temperature not found for that sensor
+	printf "No data found for that sensor ($sensor)\n"
+	exit $STATE_UNKNOWN
+	
+  elif [[ "$TEMP" -gt "$thresh_crit" ]]; then
 	# Temperature is above critical threshold
 	echo "$sensor CRITICAL - Temperature is $TEMP | $PERFDATA"
 	exit $STATE_CRITICAL

From 92a9b70125bfea27f7ed1ad9f41b468a34a22a95 Mon Sep 17 00:00:00 2001
From: Elyrith <elyrith@gmail.com>
Date: Fri, 30 Nov 2012 00:29:22 -0500
Subject: [PATCH 2/2] Fixed line numbers mentioned in comments due to my
 comments pushing the code down

---
 check_temp.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/check_temp.sh b/check_temp.sh
index a1f28f2..e9c6b0f 100755
--- a/check_temp.sh
+++ b/check_temp.sh
@@ -24,13 +24,15 @@
 #                                                                             #	
 # Nagios plugin to monitor CPU and M/B temperature with sensors.              #
 # Written in Bash (and uses sed & awk).                                       #
-# Version 0.2: Line 98, fixed the missing "-n" option (Thanks to Chad who     #
+# Version 0.2: Line 103, fixed the missing "-n" option (Thanks to Chad who     #
 # pointed this out for me). Also added a "shopt -s extglob". (Thx to Chad)    #
-# Version 0.5: Line 162, fixed a typo (EXIT_UNKNOWN to STATE_UNKNOWN)         #
+# Version 0.5: Line 168, fixed a typo (EXIT_UNKNOWN to STATE_UNKNOWN)         #
 # Version 0.7:                                                                #
-#    Line 191, modified sensor grab from "3rd section" to "after first '+'"   #
-#    Line 227-230, now checks if no sensor data was found and exits with      #
-#                  STATE_UNKNOWN                                              #
+#    Line 193, modified sensor parsing to cut after the first '+' since all   #
+#        positive temperatures are preceded by a '+'                          #
+#    Line 211, reduced "verbosity" needed to see verbose info (was 2: -v -v)  #
+#    Line 229-232, now checks to see if no sensor data was found and          #
+#       exits with STATE_UNKNOWN                                              #
 ###############################################################################
 
 VERSION="Version 0.7"