1 files changed, 84 insertions, 84 deletions
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index 08e7fef..0f22156 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -74,27 +74,27 @@ REVISION=`echo '$Revision$' | /bin/sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
 print_usage() {
-        echo "Usage: $PROGNAME -F logfile -O oldlog -q query"
+    echo "Usage: $PROGNAME -F logfile -O oldlog -q query"
-        echo "Usage: $PROGNAME --help"
+    echo "Usage: $PROGNAME --help"
-        echo "Usage: $PROGNAME --version"
+    echo "Usage: $PROGNAME --version"
 }
 print_help() {
-        print_revision $PROGNAME $REVISION
+    print_revision $PROGNAME $REVISION
-        echo ""
+    echo ""
-        print_usage
+    print_usage
-        echo ""
+    echo ""
-        echo "Log file pattern detector plugin for Nagios"
+    echo "Log file pattern detector plugin for Nagios"
-        echo ""
+    echo ""
-        support
+    support
 }
 # Make sure the correct number of command line
 # arguments have been supplied
 if [ $# -lt 1 ]; then
-        print_usage
+    print_usage
-        exit $STATE_UNKNOWN
+    exit $STATE_UNKNOWN
 fi
 # Grab the command line arguments
@@ -104,69 +104,69 @@ fi
 #query=$3
 exitstatus=$STATE_WARNING #default
 while test -n "$1"; do
-        case "$1" in
+    case "$1" in
-                --help)
+        --help)
-                        print_help
+            print_help
-                        exit $STATE_OK
+            exit $STATE_OK
-                        ;;
+            ;;
-                -h)
+        -h)
-                        print_help
+            print_help
-                        exit $STATE_OK
+            exit $STATE_OK
-                        ;;
+            ;;
-                --version)
+        --version)
-                        print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $VERSION
-                        exit $STATE_OK
+            exit $STATE_OK
-                        ;;
+            ;;
-                -V)
+        -V)
-                        print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $VERSION
-                        exit $STATE_OK
+            exit $STATE_OK
-                        ;;
+            ;;
-                --filename)
+        --filename)
-                        logfile=$2
+            logfile=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                -F)
+        -F)
-                        logfile=$2
+            logfile=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                --oldlog)
+        --oldlog)
-                        oldlog=$2
+            oldlog=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                -O)
+        -O)
-                        oldlog=$2
+            oldlog=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                --query)
+        --query)
-                        query=$2
+            query=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                -q)
+        -q)
-                        query=$2
+            query=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                -x)
+        -x)
-                        exitstatus=$2
+            exitstatus=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                --exitstatus)
+        --exitstatus)
-                        exitstatus=$2
+            exitstatus=$2
-                        shift
+            shift
-                        ;;
+            ;;
-                *)
+        *)
-                        echo "Unknown argument: $1"
+            echo "Unknown argument: $1"
-                        print_usage
+            print_usage
-                        exit $STATE_UNKNOWN
+            exit $STATE_UNKNOWN
-                        ;;
+            ;;
-        esac
+    esac
-        shift
+    shift
 done
 # If the source log file doesn't exist, exit
 if [ ! -e $logfile ]; then
-        $ECHO "Log check error: Log file $logfile does not exist!\n"
+    $ECHO "Log check error: Log file $logfile does not exist!\n"
-        exit 2
+    exit $STATE_UNKNOWN
 fi
 # If the old log file doesn't exist, this must be the first time
@@ -174,21 +174,22 @@ fi
 # the old diff file and exit
 if [ ! -e $oldlog ]; then
-        $CAT $logfile > $oldlog
+    $CAT $logfile > $oldlog
-        $ECHO "Log check data initialized...\n"
+    $ECHO "Log check data initialized...\n"
-        exit 0
+    exit $STATE_OK
 fi
 # The old log file exists, so compare it to the original log now
 # The temporary file that the script should use while
 # processing the log file.
-if [-x /bin/mktemp]; then
+if [ -x /bin/mktemp ]; then
-        tempdiff="/bin/mktemp /tmp/check_log.XXXXXXXXXX"
+    tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
 else
-        tempdiff="/tmp/check_log.`/bin/date '+%H%M%S'`"
+    tempdiff=`/bin/date '+%H%M%S'`
-  /bin/touch $tempdiff
+    tempdiff="/tmp/check_log.${tempdiff}"
-        chmod 600 $tempdiff
+    /bin/touch $tempdiff
+    chmod 600 $tempdiff
 fi
 $DIFF $logfile $oldlog > $tempdiff
@@ -203,12 +204,11 @@ $RM -f $tempdiff
 $CAT $logfile > $oldlog
 if [ "$count" = "0" ]; then # no matches, exit with no error
-        $ECHO "Log check ok - 0 pattern matches found\n"
+    $ECHO "Log check ok - 0 pattern matches found\n"
-        exitstatus=0
+    exitstatus=$STATE_OK
 else # Print total matche count and the last entry we found
-        $ECHO "($count) $lastentry"
+    $ECHO "($count) $lastentry"
+    exitstatus=$STATE_CRITICAL
 fi
-exit exitstatus
+exit $exitstatus

diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index 08e7fef..0f22156 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh
@@ -74,27 +74,27 @@ REVISION=`echo '$Revision$' \| /bin/sed -e 's/[^0-9.]//g'`
74	. $PROGPATH/utils.sh	74	. $PROGPATH/utils.sh
75		75
76	print_usage() {	76	print_usage() {
77	echo "Usage: $PROGNAME -F logfile -O oldlog -q query"	77	echo "Usage: $PROGNAME -F logfile -O oldlog -q query"
78	echo "Usage: $PROGNAME --help"	78	echo "Usage: $PROGNAME --help"
79	echo "Usage: $PROGNAME --version"	79	echo "Usage: $PROGNAME --version"
80	}	80	}
81		81
82	print_help() {	82	print_help() {
83	print_revision $PROGNAME $REVISION	83	print_revision $PROGNAME $REVISION
84	echo ""	84	echo ""
85	print_usage	85	print_usage
86	echo ""	86	echo ""
87	echo "Log file pattern detector plugin for Nagios"	87	echo "Log file pattern detector plugin for Nagios"
88	echo ""	88	echo ""
89	support	89	support
90	}	90	}
91		91
92	# Make sure the correct number of command line	92	# Make sure the correct number of command line
93	# arguments have been supplied	93	# arguments have been supplied
94		94
95	if [ $# -lt 1 ]; then	95	if [ $# -lt 1 ]; then
96	print_usage	96	print_usage
97	exit $STATE_UNKNOWN	97	exit $STATE_UNKNOWN
98	fi	98	fi
99		99
100	# Grab the command line arguments	100	# Grab the command line arguments
@@ -104,69 +104,69 @@ fi
104	#query=$3	104	#query=$3
105	exitstatus=$STATE_WARNING #default	105	exitstatus=$STATE_WARNING #default
106	while test -n "$1"; do	106	while test -n "$1"; do
107	case "$1" in	107	case "$1" in
108	--help)	108	--help)
109	print_help	109	print_help
110	exit $STATE_OK	110	exit $STATE_OK
111	;;	111	;;
112	-h)	112	-h)
113	print_help	113	print_help
114	exit $STATE_OK	114	exit $STATE_OK
115	;;	115	;;
116	--version)	116	--version)
117	print_revision $PROGNAME $VERSION	117	print_revision $PROGNAME $VERSION
118	exit $STATE_OK	118	exit $STATE_OK
119	;;	119	;;
120	-V)	120	-V)
121	print_revision $PROGNAME $VERSION	121	print_revision $PROGNAME $VERSION
122	exit $STATE_OK	122	exit $STATE_OK
123	;;	123	;;
124	--filename)	124	--filename)
125	logfile=$2	125	logfile=$2
126	shift	126	shift
127	;;	127	;;
128	-F)	128	-F)
129	logfile=$2	129	logfile=$2
130	shift	130	shift
131	;;	131	;;
132	--oldlog)	132	--oldlog)
133	oldlog=$2	133	oldlog=$2
134	shift	134	shift
135	;;	135	;;
136	-O)	136	-O)
137	oldlog=$2	137	oldlog=$2
138	shift	138	shift
139	;;	139	;;
140	--query)	140	--query)
141	query=$2	141	query=$2
142	shift	142	shift
143	;;	143	;;
144	-q)	144	-q)
145	query=$2	145	query=$2
146	shift	146	shift
147	;;	147	;;
148	-x)	148	-x)
149	exitstatus=$2	149	exitstatus=$2
150	shift	150	shift
151	;;	151	;;
152	--exitstatus)	152	--exitstatus)
153	exitstatus=$2	153	exitstatus=$2
154	shift	154	shift
155	;;	155	;;
156	*)	156	*)
157	echo "Unknown argument: $1"	157	echo "Unknown argument: $1"
158	print_usage	158	print_usage
159	exit $STATE_UNKNOWN	159	exit $STATE_UNKNOWN
160	;;	160	;;
161	esac	161	esac
162	shift	162	shift
163	done	163	done
164		164
165	# If the source log file doesn't exist, exit	165	# If the source log file doesn't exist, exit
166		166
167	if [ ! -e $logfile ]; then	167	if [ ! -e $logfile ]; then
168	$ECHO "Log check error: Log file $logfile does not exist!\n"	168	$ECHO "Log check error: Log file $logfile does not exist!\n"
169	exit 2	169	exit $STATE_UNKNOWN
170	fi	170	fi
171		171
172	# If the old log file doesn't exist, this must be the first time	172	# If the old log file doesn't exist, this must be the first time
@@ -174,21 +174,22 @@ fi
174	# the old diff file and exit	174	# the old diff file and exit
175		175
176	if [ ! -e $oldlog ]; then	176	if [ ! -e $oldlog ]; then
177	$CAT $logfile > $oldlog	177	$CAT $logfile > $oldlog
178	$ECHO "Log check data initialized...\n"	178	$ECHO "Log check data initialized...\n"
179	exit 0	179	exit $STATE_OK
180	fi	180	fi
181		181
182	# The old log file exists, so compare it to the original log now	182	# The old log file exists, so compare it to the original log now
183		183
184	# The temporary file that the script should use while	184	# The temporary file that the script should use while
185	# processing the log file.	185	# processing the log file.
186	if [-x /bin/mktemp]; then	186	if [ -x /bin/mktemp ]; then
187	tempdiff="/bin/mktemp /tmp/check_log.XXXXXXXXXX"	187	tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
188	else	188	else
189	tempdiff="/tmp/check_log.`/bin/date '+%H%M%S'`"	189	tempdiff=`/bin/date '+%H%M%S'`
190	/bin/touch $tempdiff	190	tempdiff="/tmp/check_log.${tempdiff}"
191	chmod 600 $tempdiff	191	/bin/touch $tempdiff
		192	chmod 600 $tempdiff
192	fi	193	fi
193		194
194	$DIFF $logfile $oldlog > $tempdiff	195	$DIFF $logfile $oldlog > $tempdiff
@@ -203,12 +204,11 @@ $RM -f $tempdiff
203	$CAT $logfile > $oldlog	204	$CAT $logfile > $oldlog
204		205
205	if [ "$count" = "0" ]; then # no matches, exit with no error	206	if [ "$count" = "0" ]; then # no matches, exit with no error
206	$ECHO "Log check ok - 0 pattern matches found\n"	207	$ECHO "Log check ok - 0 pattern matches found\n"
207	exitstatus=0	208	exitstatus=$STATE_OK
208	else # Print total matche count and the last entry we found	209	else # Print total matche count and the last entry we found
209	$ECHO "($count) $lastentry"	210	$ECHO "($count) $lastentry"
		211	exitstatus=$STATE_CRITICAL
210	fi	212	fi
211		213
212	exit exitstatus	214	exit $exitstatus
213
214