Merge branch 'atward', customink#5

Author: helmo

check_glusterfs

@@ -4,18 +4,9 @@
 ## http://exchange.nagios.org/directory/Plugins/System-Metrics/File-System/GlusterFS-checks/details
 
 ### CHANGELOG
-## 1.0.2
-# * 07/01/2014
-# * Modified by Doug Wilson <[email protected]>
-# * includes carrillm’s fix to support TB sized volumes
-# * outputs all errors on a critical alarm, not just free space
-#
-# * 20/08/2014
-# * Modified by emitor
-# * fix the regular expresion where get the free space (it didn't work for me on centOS)
-# * fix OK status to print the free space as it is
+# See Git history
 
-# This Nagios script was written against version 3.3 & 3.4 of Gluster.  Older
+# This Nagios script was written against version 3.5 of Gluster.  Older
 # versions will most likely not work at all with this monitoring script.
 #
 # Gluster currently requires elevated permissions to do anything.  In order to
@@ -24,7 +15,7 @@
 # following in /etc/sudoers (or something equivalent):
 #
 # Defaults:nagios !requiretty
-# nagios ALL=(root) NOPASSWD:/usr/sbin/gluster volume status [[\:graph\:]]* detail,/usr/sbin/gluster volume heal [[\:graph\:]]* info
+# nagios ALL=(root) NOPASSWD:/usr/sbin/gluster volume status [-_[\:alnum\:]]+ detail,/usr/sbin/gluster volume heal [-_[\:alnum\:]]+ info
 #
 # That should give us all the access we need to check the status of any
 # currently defined peers and volumes.
@@ -36,7 +27,7 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 PROGNAME=$(basename -- $0)
-PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+PROGPATH=$(sed -e 's,[\\/][^\\/][^\\/]*$,,' <<<$0)
 REVISION="1.0.3"
 
 if [ -f $PROGPATH/utils.sh ]
@@ -47,18 +38,21 @@ else
 		exit 1
 fi
 
+
 # parse command line
 usage () {
-	echo ""
-	echo "USAGE: "
-	echo "  $PROGNAME -v VOLUME -n BRICKS [-w GB -c GB]"
-	echo "     -n BRICKS: number of bricks"
-	echo "     -w and -c values in GB"
+	cat <<-USAGE
+	USAGE:
+	  $PROGNAME -v VOLUME -n BRICKS [-w GB -c GB]
+	     -n BRICKS: number of bricks
+	     -w and -c values in GB
+	USAGE
 	exit $STATE_UNKNOWN
 }
 
-while getopts "v:n:w:c:" opt; do
+while getopts "hv:n:w:c:" opt; do
 	case $opt in
+	h) usage ;;
 	v) VOLUME=${OPTARG} ;;
 	n) BRICKS=${OPTARG} ;;
 	w) WARN=${OPTARG} ;;
@@ -67,7 +61,7 @@ while getopts "v:n:w:c:" opt; do
 	esac
 done
 
-if [ -z "${VOLUME}" -o -z "${BRICKS}" ]; then
+if [[ -z $VOLUME ]] || [[ -z $BRICKS ]]; then
 	usage
 fi
 
@@ -97,12 +91,12 @@ fi
 # get volume heal status
 heal=0
 for entries in $(sudo gluster volume heal ${VOLUME} info | awk '/^Number of entries: /{print $4}'); do
-	if [ "$entries" -gt 0 ]; then
-		let $((heal+=entries))
+	if [[ $entries -gt 0 ]]; then
+		let heal+=entries
 	fi
 done
-if [ "$heal" -gt 0 ]; then
-	errors=("${errors[@]}" "$heal unsynched entries")
+if [[ "$heal" -gt 0 ]]; then
+	errors+=($heal unsynched entries)
 	ex_stat="WARNING_stat"
 fi
 
@@ -118,30 +112,30 @@ while read -r line; do
 		;;
 	Disk)
 		key=${field[@]:0:3}
-		if [ "${key}" = "Disk Space Free" ]; then
+		if [[ $key == "Disk Space Free" ]]; then
 			freeunit=${field[@]:4}
-			free=${freeunit:0:${#freeunit}-2}
+			free=${freeunit:0:$((${#freeunit}-2))}
 			freeconvgb=`echo "($free*1024)" | bc`
 			unit=${freeunit#$free}
-			if [ "$unit" = "TB" ]; then
-				free=$freeconvgb
+			if [[ $unit == "TB" ]]; then
+				free=$(( $freeconvgb * 1024 ))
 				unit="GB"
 			fi
-			if [ "$unit" != "GB" ]; then
+			if [[ $unit != "GB" ]]; then
 				Exit UNKNOWN "unknown disk space size $freeunit"
 			fi
-			free=$(echo "${free} / 1" | bc -q)
-			if [ $free -lt $freegb ]; then
+			free=$(bc -q <<<"$free / 1")
+			if [[ $free -lt $freegb ]]; then
 				freegb=$free
 			fi
 		fi
 		;;
 	Online)
 		online=${field[@]:2}
-		if [ "${online}" = "Y" ]; then
-			let $((bricksfound++))
+		if [[ ${online} = "Y" ]]; then
+			let bricksfound++
 		else
-			errors=("${errors[@]}" "$brick offline")
+			errors+=($brick offline)
 		fi
 		;;
 	Volume)
@@ -151,31 +145,32 @@ while read -r line; do
 	esac
 done < <(sudo gluster volume status ${VOLUME} detail 2>&1)
 
-if [ $bricksfound -eq 0 ]; then
+if [[ $bricksfound -eq 0 ]]; then
 	Exit CRITICAL "no bricks found"
-elif [ $bricksfound -lt $BRICKS ]; then
-	errors=("${errors[@]}" "found $bricksfound bricks, expected $BRICKS ")
+elif [[ $bricksfound -lt $BRICKS ]]; then
+	errors+=(found $bricksfound bricks, expected $BRICKS)
 	ex_stat="WARNING_stat"
 fi
 
-if [ -n "$CRIT" -a -n "$WARN" ]; then
-	if [ $CRIT -ge $WARN ]; then
+if [[ -n $CRIT ]] && [[ -n $WARN ]]; then
+	if [[ $CRIT -ge $WARN ]]; then
 		Exit UNKNOWN "critical threshold below warning"
-	elif [ $freegb -lt $CRIT ]; then
-		errors=("${errors[@]}" "free space ${freegb}GB")
+	elif [[ $freegb -lt $CRIT ]]; then
+		errors+=(free space ${freegb}GB)
 		ex_stat="CRITICAL_stat"
-	elif [ $freegb -lt $WARN ]; then
-		errors=("${errors[@]}" "free space ${freegb}GB")
+
+	elif [[ $freegb -lt $WARN ]]; then
+		errors+=(free space ${freegb}GB)
 		ex_stat="WARNING_stat"
 	fi
 fi
 
 # exit with warning if errors
-if [ -n "$errors" ]; then
+if [[ -n $errors ]]; then
 	sep='; '
 	msg=$(printf "${sep}%s" "${errors[@]}")
 	msg=${msg:${#sep}}
-	if [ "${ex_stat}" == "CRITICAL_stat" ]; then
+	if [[ ${ex_stat} == "CRITICAL_stat" ]]; then
 		Exit CRITICAL "${msg}"
 	else
 		Exit WARNING "${msg}"

ssh_wrapper

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Lock down ssh authorized_keys command
+#  command="/usr/bin/ssh_wrapper",no-agent-forwarding,no-port-forwarding,no-pty,no-X11-forwarding ssh-rsa ...
+
+CHECK_GLUSTER=/usr/bin/check_glusterfs
+GLUSTER_REGEX='^check_glusterfs -v [-_[:alnum:]]+ -n [0-9]+( -w [0-9.]+ -c [0-9.]+)?$'
+
+case "$SSH_ORIGINAL_COMMAND" in
+	check_glusterfs*)
+		# assert command looks good, assumes GNU grep
+		if grep -E "$GLUSTER_REGEX" <<<$SSH_ORIGINAL_COMMAND; then
+			exec $CHECK_GLUSTER ${SSH_ORIGINAL_COMMAND#* }
+		fi
+		;;
+esac
+
+echo "Sorry. Only these commands are available to you:"
+echo "check_glusterfs -v VOLUME -n BRICKS [-w GB -c GB]"
+exit 1