Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

1 files changed, 0 insertions, 65 deletions

diff --git a/Monitoring/nagios/plugins/check_sensors b/Monitoring/nagios/plugins/check_sensors
deleted file mode 100755
index 857a4d5a..00000000
--- a/Monitoring/nagios/plugins/check_sensors
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/bash
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-
-PROGNAME=`basename $0`
-PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION="1.4.15"
-
-. $PROGPATH/utils.sh
-
-
-print_usage() {
-	echo "Usage: $PROGNAME"
-}
-
-print_help() {
-	print_revision $PROGNAME $REVISION
-	echo ""
-	print_usage
-	echo ""
-	echo "This plugin checks hardware status using the lm_sensors package."
-	echo ""
-	support
-	exit 0
-}
-
-case "$1" in
-	--help)
-		print_help
-		exit 0
-		;;
-	-h)
-		print_help
-		exit 0
-		;;
-	--version)
-   	print_revision $PROGNAME $REVISION
-		exit 0
-		;;
-	-V)
-		print_revision $PROGNAME $REVISION
-		exit 0
-		;;
-	*)
-		sensordata=`sensors 2>&1`
-		status=$?
-		if test "$1" = "-v" -o "$1" = "--verbose"; then
-			echo ${sensordata}
-		fi
-		if test ${status} -eq 127; then
-			echo "SENSORS UNKNOWN - command not found (did you install lmsensors?)"
-			exit -1
-		elif test ${status} -ne 0 ; then
-			echo "WARNING - sensors returned state $status"
-			exit 1
-		fi
-		if echo ${sensordata} | egrep ALARM > /dev/null; then
-			echo SENSOR CRITICAL - Sensor alarm detected!
-			exit 2
-		else
-			echo sensor ok
-			exit 0
-		fi
-		;;
-esac