Merge branch 'master' into mysql_detect_mysqldump

17 files changed, 450 insertions, 267 deletions

diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 088a4459..7879791f 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -16,13 +16,13 @@ VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/
 libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
         check_log check_oracle check_rpc check_sensors check_wave \
         check_ifstatus check_ifoperstatus check_mailq check_file_age \
-        check_uptime \
+        check_uptime check_mssql \
         utils.sh utils.pm
 
 EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
         check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \
         check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
-        check_uptime.pl \
+        check_uptime.pl check_mssql.pl \
         utils.sh.in utils.pm.in t
 
 EDIT = sed \
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl
index 05b99203..531625c4 100755
--- a/plugins-scripts/check_breeze.pl
+++ b/plugins-scripts/check_breeze.pl
@@ -14,8 +14,9 @@ sub print_help ();
 sub print_usage ();
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
-$ENV{'BASH_ENV'}=''; 
+$ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
+$ENV{'CDPATH'}='';
 
 Getopt::Long::Configure('bundling');
 GetOptions
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 28c49e84..f4d33a7b 100755..100644
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -22,13 +22,13 @@ require 5.004;
 use POSIX qw(setsid);
 use strict;
 use Getopt::Long;
-use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose);
+use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $opt_C $opt_t $verbose);
 use vars qw($PROGNAME);
 use FindBin;
 use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
-# make us session leader which makes all childs exit if we do
+# make us session leader which makes all children exit if we do
 setsid;
 
 sub print_help ();
@@ -43,6 +43,7 @@ $ENV{'ENV'}='';
 Getopt::Long::Configure('bundling');
 GetOptions
         ("v"   => \$verbose, "verbose"    => \$verbose,
+   "t=i" => \$opt_t,  "timeout=i"  => \$opt_t,
          "P=s" => \$opt_P, "port=s"     => \$opt_P,
          "V"   => \$opt_V, "version"    => \$opt_V,
          "h"   => \$opt_h, "help"       => \$opt_h,
@@ -53,7 +54,8 @@ GetOptions
          "s=s" => \$opt_s, "share=s"    => \$opt_s,
          "W=s" => \$opt_W, "workgroup=s" => \$opt_W,
          "H=s" => \$opt_H, "hostname=s" => \$opt_H,
-         "a=s" => \$opt_a, "address=s" => \$opt_a);
+         "a=s" => \$opt_a, "address=s" => \$opt_a,
+         "C=s" => \$opt_C, "configfile=s" => \$opt_C);
 
 if ($opt_V) {
         print_revision($PROGNAME,'@NP_VERSION@'); #'
@@ -91,6 +93,12 @@ my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
 my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
 ($crit) || usage("Invalid critical threshold: $opt_c\n");
 
+($opt_C) || ($opt_C = shift @ARGV) || ($opt_C = "");
+my $configfile = $opt_C if ($opt_C);
+usage("Unable to read config file $configfile\n") if ($configfile) && (! -r $configfile);
+
+if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; }
+
 # Execute the given command line and return anything it writes to STDOUT and/or
 # STDERR.  (This might be useful for other plugins, too, so it should possibly
 # be moved to utils.pm.)
@@ -193,6 +201,7 @@ my @cmd = (
         defined($workgroup) ? ("-W", $workgroup) : (),
         defined($address) ? ("-I", $address) : (),
         defined($opt_P) ? ("-p", $opt_P) : (),
+        defined($configfile) ? ("-s", $configfile) : (),
         "-c", "du"
 );
 
@@ -292,7 +301,8 @@ exit $ERRORS{$state};
 
 sub print_usage () {
         print "Usage: $PROGNAME -H <host> -s <share> -u <user> -p <password> 
-      -w <warn> -c <crit> [-W <workgroup>] [-P <port>] [-a <IP>]\n";
+      -w <warn> -c <crit> [-W <workgroup>] [-P <port>] [-a <IP>] [-t timeout]
+      [-C <configfile>]\n";
 }
 
 sub print_help () {
@@ -318,11 +328,14 @@ Perl Check SMB Disk plugin for monitoring
    Password to log in to server. (Defaults to an empty password)
 -w, --warning=INTEGER or INTEGER[kMG]
    Percent of used space at which a warning will be generated (Default: 85%)
-      
 -c, --critical=INTEGER or INTEGER[kMG]
    Percent of used space at which a critical will be generated (Defaults: 95%)
+-t, --timeout=INTEGER
+   Seconds before connection times out (Default: 15)
 -P, --port=INTEGER
    Port to be used to connect to. Some Windows boxes use 139, others 445 (Defaults to smbclient default)
+-C, --configfile=STRING
+   Path to configfile which should be used by smbclient (Defaults to smb.conf of your smb installation)
    
    If thresholds are followed by either a k, M, or G then check to see if that
    much disk space is available (kilobytes, Megabytes, Gigabytes)
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index 01b854a6..26281ddd 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -147,7 +147,7 @@ sub print_help () {
         print "\n";
         print "  -i | --ignore-missing :  return OK if the file does not exist\n";
         print "  <secs>  File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n";
-        print "  <size>  File must be at least this many bytes long (default: crit 0 bytes)\n\n";
+        print "  <size>  File must be at least this many bytes long (default: file size is ignored (0 bytes))\n\n";
         print "  Both <secs> and <size> can specify a range using the standard plugin syntax\n";
         print "  If any of the warning and critical arguments are in range syntax (not just bare numbers)\n";
         print "  then all warning and critical arguments will be interpreted as ranges.\n";
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index c190ce95..e335cdad 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -134,7 +134,7 @@ if (defined $ifdescr || defined $iftype) {
         }
         if ($status==0) {
                 $state = "UNKNOWN";
-                printf "$state: could not retrive ifdescr/iftype snmpkey - $status-$snmpkey\n";
+                printf "$state: could not retrieve ifdescr/iftype snmpkey - $status-$snmpkey\n";
                 $session->close;
                 exit $ERRORS{$state};
         }
@@ -187,7 +187,7 @@ if (defined $ifXTable) {
          $name = $response->{$snmpIfDescr} ;
 }
 
-## if AdminStatus is down - some one made a consious effort to change config
+## if AdminStatus is down - some one made a conscious effort to change config
 ##
 if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
         $answer = "Interface $name (index $snmpkey) is administratively down.";
@@ -286,7 +286,7 @@ sub print_usage() {
         printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n";
         printf "Copyright (C) 2000 Christoph Kron\n";
         printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n";
-        printf "This programm is licensed under the terms of the ";
+        printf "This program is licensed under the terms of the ";
         printf "GNU General Public License\n(check source code for details)\n";
         printf "\n\n";
 }
@@ -424,7 +424,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 32984e53..38b87fcc 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -354,7 +354,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index d869ae7b..84f20229 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -60,7 +60,7 @@ sub print_usage ();
 sub connection ($$$$);
 sub bindRemote ($$);
 
-# -------------------------------------------------------------[ Enviroment ]--
+# -------------------------------------------------------------[ Environment ]--
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
@@ -208,7 +208,7 @@ MAIN:
 
         # Just in case of problems, let's not hang the monitoring system
         $SIG{'ALRM'} = sub {
-                print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
+                print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                 exit $ERRORS{"UNKNOWN"};
         };
         
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index d28c8d0a..8ecdd316 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #
 # Log file pattern detector plugin for monitoring
-# Written by Ethan Galstad (nagios@nagios.org)
-# Last Modified: 07-31-1999
+# Written originally by Ethan Galstad (nagios@nagios.org)
 #
 # Usage: ./check_log <log_file> <old_log_file> <pattern>
 #
@@ -19,7 +18,7 @@
 # On the first run of the plugin, it will return an OK state with a message
 # of "Log check data initialized".  On successive runs, it will return an OK
 # state if *no* pattern matches have been found in the *difference* between the
-# log file and the older copy of the log file.  If the plugin detects any 
+# log file and the older copy of the log file.  If the plugin detects any
 # pattern matches in the log diff, it will return a CRITICAL state and print
 # out a message is the following format: "(x) last_match", where "x" is the
 # total number of pattern matches found in the file and "last_match" is the
@@ -44,6 +43,10 @@
 #        check the same <log_file> for pattern matches.  This is necessary
 #        because of the way the script operates.
 #
+#    4.  This plugin does NOT have an understanding of logrotation or similar
+#        mechanisms. Therefore bad timing could lead to missing events
+#
+#
 # Examples:
 #
 # Check for login failures in the syslog...
@@ -60,20 +63,26 @@
 
 PATH="@TRUSTED_PATH@"
 export PATH
-PROGNAME=`basename $0`
-PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+PROGNAME=$(basename "$0")
+PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,')
 REVISION="@NP_VERSION@"
 
-. $PROGPATH/utils.sh
+. "$PROGPATH"/utils.sh
 
 print_usage() {
     echo "Usage: $PROGNAME -F logfile -O oldlog -q query"
     echo "Usage: $PROGNAME --help"
     echo "Usage: $PROGNAME --version"
+        echo ""
+        echo "Other parameters:"
+        echo "  -a|--all : Print all matching lines"
+        echo "  --exclude: Exclude a pattern (-p or -e also applies here when used)"
+        echo "  -p|--perl-regex : Use perl style regular expressions in the query"
+        echo "  -e|--extended-regex : Use extended style regular expressions in the query (not necessary for GNU grep)"
 }
 
 print_help() {
-    print_revision $PROGNAME $REVISION
+    print_revision "$PROGNAME" "$REVISION"
     echo ""
     print_usage
     echo ""
@@ -87,81 +96,89 @@ print_help() {
 
 if [ $# -lt 1 ]; then
     print_usage
-    exit $STATE_UNKNOWN
+    exit "$STATE_UNKNOWN"
 fi
 
 # Grab the command line arguments
-
-#logfile=$1
-#oldlog=$2
-#query=$3
 exitstatus=$STATE_WARNING #default
 while test -n "$1"; do
     case "$1" in
-        --help)
+        -h | --help)
             print_help
-            exit $STATE_OK
+            exit "$STATE_UNKNOWN"
             ;;
-        -h)
-            print_help
-            exit $STATE_OK
-            ;;
-        --version)
-            print_revision $PROGNAME $REVISION
-            exit $STATE_OK
-            ;;
-        -V)
-            print_revision $PROGNAME $REVISION
-            exit $STATE_OK
-            ;;
-        --filename)
-            logfile=$2
-            shift
+        -V | --version)
+            print_revision "$PROGNAME" "$REVISION"
+            exit "$STATE_UNKNOWN"
             ;;
-        -F)
+        -F | --filename)
             logfile=$2
-            shift
+            shift 2
             ;;
-        --oldlog)
+        -O | --oldlog)
             oldlog=$2
-            shift
+            shift 2
             ;;
-        -O)
-            oldlog=$2
-            shift
-            ;;
-        --query)
+        -q | --query)
             query=$2
-            shift
+            shift 2
             ;;
-        -q)
-            query=$2
-            shift
+        --exclude)
+            exclude=$2
+            shift 2
             ;;
-        -x)
+        -x | --exitstatus)
             exitstatus=$2
+            shift 2
+            ;;
+        -e | --extended-regex)
+            ERE=1
             shift
             ;;
-        --exitstatus)
-            exitstatus=$2
+        -p | --perl-regex)
+            PRE=1
+            shift
+            ;;
+        -a | --all)
+            ALL=1
             shift
             ;;
         *)
             echo "Unknown argument: $1"
             print_usage
-            exit $STATE_UNKNOWN
+            exit "$STATE_UNKNOWN"
             ;;
     esac
-    shift
 done
 
+# Parameter sanity check
+if [ $ERE ] && [ $PRE ] ; then
+    echo "Can not use extended and perl regex at the same time"
+    exit "$STATE_UNKNOWN"
+fi
+
+GREP="grep"
+
+if [ $ERE ]; then
+    GREP="grep -E"
+fi
+
+if [ $PRE ]; then
+    GREP="grep -P"
+fi
+
 # If the source log file doesn't exist, exit
 
-if [ ! -e $logfile ]; then
+if [ ! -e "$logfile" ]; then
     echo "Log check error: Log file $logfile does not exist!"
-    exit $STATE_UNKNOWN
-elif [ ! -r $logfile ] ; then
+    exit "$STATE_UNKNOWN"
+elif [ ! -r "$logfile" ] ; then
     echo "Log check error: Log file $logfile is not readable!"
+    exit "$STATE_UNKNOWN"
+fi
+# If no oldlog was given this can not work properly, abort then
+if [ -z "$oldlog" ]; then
+    echo "Oldlog parameter is needed"
     exit $STATE_UNKNOWN
 fi
 
@@ -169,10 +186,10 @@ fi
 # we're running this test, so copy the original log file over to
 # the old diff file and exit
 
-if [ ! -e $oldlog ]; then
-    cat $logfile > $oldlog
+if [ ! -e "$oldlog" ]; then
+    cat "$logfile" > "$oldlog"
     echo "Log check data initialized..."
-    exit $STATE_OK
+    exit "$STATE_OK"
 fi
 
 # The old log file exists, so compare it to the original log now
@@ -180,31 +197,48 @@ fi
 # The temporary file that the script should use while
 # processing the log file.
 if [ -x /bin/mktemp ]; then
-    tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
+
+    tempdiff=$(/bin/mktemp /tmp/check_log.XXXXXXXXXX)
 else
-    tempdiff=`/bin/date '+%H%M%S'`
+    tempdiff=$(/bin/date '+%H%M%S')
     tempdiff="/tmp/check_log.${tempdiff}"
-    touch $tempdiff
-    chmod 600 $tempdiff
+    touch "$tempdiff"
+    chmod 600 "$tempdiff"
 fi
 
-diff $logfile $oldlog | grep -v "^>" > $tempdiff
+diff "$logfile" "$oldlog" | grep -v "^>" > "$tempdiff"
+
 
-# Count the number of matching log entries we have
-count=`grep -c "$query" $tempdiff`
+if [ $ALL ]; then
+    # Get all matching entries in the diff file
+    if [ -n "$exclude" ]; then
+        entry=$($GREP "$query" "$tempdiff" | $GREP -v "$exclude")
+        count=$($GREP "$query" "$tempdiff" | $GREP -vc "$exclude")
+    else
+        entry=$($GREP "$query" "$tempdiff")
+        count=$($GREP -c "$query" "$tempdiff")
+    fi
 
-# Get the last matching entry in the diff file
-lastentry=`grep "$query" $tempdiff | tail -1`
+else
+    # Get the last matching entry in the diff file
+    if [ -n "$exclude" ]; then
+        entry=$($GREP "$query" "$tempdiff" | $GREP -v "$exclude" | tail -1)
+        count=$($GREP "$query" "$tempdiff" | $GREP -vc "$exclude")
+    else
+        entry=$($GREP "$query" "$tempdiff" | tail -1)
+        count=$($GREP -c "$query" "$tempdiff")
+    fi
+fi
 
-rm -f $tempdiff
-cat $logfile > $oldlog
+rm -f "$tempdiff"
+cat "$logfile" > "$oldlog"
 
 if [ "$count" = "0" ]; then # no matches, exit with no error
     echo "Log check ok - 0 pattern matches found"
     exitstatus=$STATE_OK
-else # Print total matche count and the last entry we found
-    echo "($count) $lastentry"
+else # Print total match count and the last entry we found
+    echo "($count) $entry"
     exitstatus=$STATE_CRITICAL
 fi
 
-exit $exitstatus
+exit "$exitstatus"
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index aac1310e..49156af3 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -4,7 +4,7 @@
 #   transmittal.  
 #
 # Initial version support sendmail's mailq command
-#  Support for mutiple sendmail queues (Carlos Canau)
+#  Support for multiple sendmail queues (Carlos Canau)
 #  Support for qmail (Benjamin Schmid)
 
 # License Information:
@@ -28,9 +28,9 @@
 use POSIX;
 use strict;
 use Getopt::Long;
-use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s
-                                        $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
-                                        %srcdomains %dstdomains);
+use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s $opt_d
+                                        $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args
+                                        @lines %srcdomains %dstdomains);
 use FindBin;
 use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage );
@@ -48,6 +48,8 @@ $PROGNAME = "check_mailq";
 $mailq = 'sendmail';    # default
 $msg_q = 0 ;
 $msg_p = 0 ;
+# If appended, must start with a space
+$mailq_args = '' ;
 $state = $ERRORS{'UNKNOWN'};
 
 Getopt::Long::Configure('bundling');
@@ -68,6 +70,10 @@ if ($opt_s) {
         $sudo = "";
 }
 
+if ($opt_d) {
+        $mailq_args = $mailq_args . ' -C ' . $opt_d;
+}
+
 $SIG{'ALRM'} = sub {
         print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n");
         exit $ERRORS{"WARNING"};
@@ -143,7 +149,26 @@ if ($mailq eq "sendmail") {
 ##/var/spool/mqueue/qF/df is empty
 ##                Total Requests: 1
 
-        
+# separate submission/transport queues, empty
+## MSP Queue status...
+## /var/spool/mqueue-client is empty
+##                 Total requests: 0
+## MTA Queue status...
+## /var/spool/mqueue is empty
+##                 Total requests: 0
+# separate submission/transport queues: 1
+## MSP Queue status...
+##                 /var/spool/mqueue-client (1 request)
+## -----Q-ID----- --Size-- -----Q-Time----- ------------Sender/Recipient-----------
+## oAJEfhdW014123        5 Fri Nov 19 14:41 jwm
+##                  (Deferred: Connection refused by [127.0.0.1])
+##                                          root
+##                 Total requests: 1
+## MTA Queue status...
+## /var/spool/mqueue is empty
+##                 Total requests: 0
+
+        my $this_msg_q = 0;
         while (<MAILQ>) {
         
                 # match email addr on queue listing
@@ -183,13 +208,18 @@ if ($mailq eq "sendmail") {
                 #
                     # single queue: first line
                     # multi queue: one for each queue. overwrite on multi queue below
-                  $msg_q = $1 ;
+                  $this_msg_q = $1 ;
+                  $msg_q += $1 ;
                         }
                 } elsif (/^\s+Total\sRequests:\s(\d+)$/i) {
-                        print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
-                        #
-                        # multi queue: last line
-                        $msg_q = $1 ;
+                        if ($this_msg_q) {
+                                $this_msg_q = 0 ;
+                        } else {
+                                print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
+                                #
+                                # multi queue: last line
+                                $msg_q += $1 ;
+                        }
                 }
         
         }
@@ -309,8 +339,8 @@ elsif ( $mailq eq "postfix" ) {
 
      ## open mailq
         if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-                if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
-                        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \n";
                         exit $ERRORS{'UNKNOWN'};
                 }
         }elsif( defined $utils::PATH_TO_MAILQ){
@@ -330,7 +360,7 @@ elsif ( $mailq eq "postfix" ) {
         close MAILQ;
 
         if ( $? ) {
-                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
+                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/;
                 exit $ERRORS{CRITICAL};
         }
 
@@ -343,7 +373,7 @@ elsif ( $mailq eq "postfix" ) {
         }elsif ($lines[0]=~/Mail queue is empty/) {
                 $msg_q = 0;
         }else{
-                print "Couldn't match $utils::PATH_TO_MAILQ output\n";
+                print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n";
                 exit   $ERRORS{'UNKNOWN'};
         }
 
@@ -531,9 +561,9 @@ elsif ( $mailq eq "nullmailer" ) {
         }
 
         while (<MAILQ>) {
-            #2006-06-22 16:00:00  282 bytes
+            #2022-08-25 01:30:40 502 bytes from <user@example.com>
 
-            if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) {
+            if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\sbytes/) {
                 $msg_q++ ;
             }
         }
@@ -561,16 +591,17 @@ exit $state;
 
 sub process_arguments(){
         GetOptions
-                ("V"   => \$opt_V, "version"    => \$opt_V,
-                 "v"   => \$opt_v, "verbose"    => \$opt_v,
-                 "h"   => \$opt_h, "help"               => \$opt_h,
+                ("V"   => \$opt_V, "version"    => \$opt_V,
+                 "v"   => \$opt_v, "verbose"    => \$opt_v,
+                 "h"   => \$opt_h, "help"       => \$opt_h,
                  "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default     sendmail)
                  "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
-                 "c=i" => \$opt_c, "critical=i" => \$opt_c,       # critical if above this number
+                 "c=i" => \$opt_c, "critical=i" => \$opt_c,   # critical if above this number
+                 "W=i" => \$opt_W, "warning-domain=i"  => \$opt_W,   # Warning if above this number
+                 "C=i" => \$opt_C, "critical-domain=i" => \$opt_C,   # Critical if above this number
                  "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
                  "s"   => \$opt_s, "sudo"       => \$opt_s,
-                 "W=i" => \$opt_W,                            # warning if above this number
-                 "C=i" => \$opt_C,                            # critical if above this number
+                 "d:s" => \$opt_d, "configdir:s" => \$opt_d,
                  );
 
         if ($opt_V) {
@@ -651,7 +682,7 @@ sub process_arguments(){
 }
 
 sub print_usage () {
-        print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-s] [-v]\n";
+        print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-s] [-d <CONFIGDIR>] [-v]\n";
 }
 
 sub print_help () {
@@ -664,14 +695,15 @@ sub print_help () {
         print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
         print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
         print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
-        print "-W               = Min. number of messages for same domain in queue to generate warning\n";
-        print "-C               = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-W (--warning-domain)  = Min. number of messages for same domain in queue to generate warning\n";
+        print "-C (--critical-domain) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
         print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
         print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n";
         print "-s (--sudo)      = Use sudo to call the mailq command\n";
+        print "-d (--configdir) = Config file or directory\n";
         print "-h (--help)\n";
         print "-V (--version)\n";
-        print "-v (--verbose)   = debugging output\n";
+        print "-v (--verbose)         = debugging output\n";
         print "\n\n";
         print "Note: -w and -c are required arguments.  -W and -C are optional.\n";
         print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n";
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 96078aca..59981386 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -8,11 +8,11 @@
 
 PATH="@TRUSTED_PATH@"
 export PATH
-PROGNAME=`basename $0`
-PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+PROGNAME=$(basename "$0")
+PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,')
 REVISION="@NP_VERSION@"
 
-. $PROGPATH/utils.sh
+. "$PROGPATH"/utils.sh
 
 
 print_usage() {
@@ -29,7 +29,7 @@ print_usage() {
 }
 
 print_help() {
-  print_revision $PROGNAME $REVISION
+  print_revision "$PROGNAME" "$REVISION"
   echo ""
   print_usage
   echo ""
@@ -86,48 +86,48 @@ esac
 # Information options
 case "$cmd" in
 --help)
-                print_help
-    exit $STATE_OK
+    print_help
+    exit "$STATE_UNKNOWN"
     ;;
 -h)
-                print_help
-    exit $STATE_OK
+    print_help
+    exit "$STATE_UNKNOWN"
     ;;
 --version)
-                print_revision $PROGNAME $REVISION
-    exit $STATE_OK
+    print_revision "$PROGNAME" "$REVISION"
+    exit "$STATE_UNKNOWN"
     ;;
 -V)
-                print_revision $PROGNAME $REVISION
-    exit $STATE_OK
+    print_revision "$PROGNAME" "$REVISION"
+    exit "$STATE_UNKNOWN"
     ;;
 esac
 
 # Hunt down a reasonable ORACLE_HOME
 if [ -z "$ORACLE_HOME" ] ; then
-        # Adjust to taste
-        for oratab in /var/opt/oracle/oratab /etc/oratab
-        do
-        [ ! -f $oratab ] && continue
-        ORACLE_HOME=`IFS=:
-                while read SID ORACLE_HOME junk;
-                do
-                        if [ "$SID" = "$2" -o "$SID" = "*" ] ; then
-                                echo $ORACLE_HOME;
-                                exit;
-                        fi;
-                done < $oratab`
-        [ -n "$ORACLE_HOME" ] && break
-        done
+    # Adjust to taste
+    for oratab in /var/opt/oracle/oratab /etc/oratab
+    do
+    [ ! -f $oratab ] && continue
+    ORACLE_HOME=`IFS=:
+        while read -r SID ORACLE_HOME junk;
+        do
+            if [ "$SID" = "$2" ] || [ "$SID" = "*" ] ; then
+                echo "$ORACLE_HOME";
+                exit;
+            fi;
+        done < $oratab`
+    [ -n "$ORACLE_HOME" ] && break
+    done
 fi
 # Last resort
-[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle
+[ -z "$ORACLE_HOME" ] && [ -d "$PROGPATH"/oracle ] && ORACLE_HOME=$PROGPATH/oracle
 
 if [ "$cmd" != "--db" ]; then
-        if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
-                echo "Cannot determine ORACLE_HOME for sid $2"
-                exit $STATE_UNKNOWN
-        fi
+    if [ -z "$ORACLE_HOME" ] || [ ! -d "$ORACLE_HOME" ] ; then
+        echo "Cannot determine ORACLE_HOME for sid $2"
+        exit "$STATE_UNKNOWN"
+    fi
 fi
 PATH=$PATH:$ORACLE_HOME/bin
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
@@ -135,81 +135,81 @@ export ORACLE_HOME PATH LD_LIBRARY_PATH
 
 case "$cmd" in
 --tns)
-    tnschk=` tnsping $2`
-    tnschk2=` echo  $tnschk | grep -c OK`
-    if [ ${tnschk2} -eq 1 ] ; then 
-        tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*}
-        echo "OK - reply time ${tnschk3} from $2"
-        exit $STATE_OK
+    tnschk=$(tnsping "$2")
+    tnschk2=$(echo  "$tnschk" | grep -c OK)
+    if [ "${tnschk2}" -eq 1 ] ; then
+        tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*}
+        echo "OK - reply time ${tnschk3} from $2"
+        exit "$STATE_OK"
     else
-        echo "No TNS Listener on $2"
-        exit $STATE_CRITICAL
+        echo "No TNS Listener on $2"
+        exit "$STATE_CRITICAL"
     fi
     ;;
 --oranames)
-    namesctl status $2 | awk '
+    namesctl status "$2" | awk '
     /Server has been running for:/ {
-        msg = "OK: Up"
-        for (i = 6; i <= NF; i++) {
-            msg = msg " " $i
-        }
-        status = '$STATE_OK'
+    msg = "OK: Up"
+    for (i = 6; i <= NF; i++) {
+        msg = msg " " $i
+    }
+        status = '"$STATE_OK"'
     }
     /error/ {
-        msg = "CRITICAL: " $0
-        status = '$STATE_CRITICAL'
+        msg = "CRITICAL: " $0
+        status = '"$STATE_CRITICAL"'
     }
     END {
-        print msg
-        exit status
+        print msg
+        exit status
     }'
     ;;
 --db)
-    pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"`
-    if [ ${pmonchk} -ge 1 ] ; then
-        echo "${2} OK - ${pmonchk} PMON process(es) running"
-        exit $STATE_OK
+    pmonchk=$(pgrep -f "(asm|ora)_pmon_${2}$")
+    if [ "${pmonchk}" -ge 1 ] ; then
+        echo "${2} OK - ${pmonchk} PMON process(es) running"
+        exit "$STATE_OK"
     #if [ -f $ORACLE_HOME/dbs/sga*${2}* ] ; then
-        #if [ ${pmonchk} -eq 1 ] ; then
+         #if [ ${pmonchk} -eq 1 ] ; then
     #utime=`ls -la $ORACLE_HOME/dbs/sga*$2* | cut -c 43-55`
-            #echo "${2} OK - running since ${utime}"
-            #exit $STATE_OK
-        #fi
+            #echo "${2} OK - running since ${utime}"
+            #exit $STATE_OK
+         #fi
     else
-        echo "${2} Database is DOWN"
-        exit $STATE_CRITICAL
+        echo "${2} Database is DOWN"
+        exit "$STATE_CRITICAL"
     fi
     ;;
 --login)
-    loginchk=`sqlplus dummy/user@$2 < /dev/null`
-    loginchk2=` echo  $loginchk | grep -c ORA-01017`
-    if [ ${loginchk2} -eq 1 ] ; then 
-        echo "OK - dummy login connected"
-        exit $STATE_OK
+    loginchk=$(sqlplus dummy/user@"$2" < /dev/null)
+    loginchk2=$(echo "$loginchk" | grep -c ORA-01017)
+    if [ "${loginchk2}" -eq 1 ] ; then
+        echo "OK - dummy login connected"
+        exit "$STATE_OK"
     else
-        loginchk3=` echo "$loginchk" | grep "ORA-" | head -1`
-        echo "CRITICAL - $loginchk3"
-        exit $STATE_CRITICAL
+        loginchk3=$(echo "$loginchk" | grep "ORA-" | head -1)
+        echo "CRITICAL - $loginchk3"
+        exit "$STATE_CRITICAL"
     fi
     ;;
 --connect)
-    connectchk=`sqlplus $2 < /dev/null`
-    connectchk2=` echo  $connectchk | grep -c ORA-`
-    if [ ${connectchk2} -eq 0 ] ; then
-        echo "OK - login successful"
-        exit $STATE_OK
+    connectchk=$(sqlplus "$2" < /dev/null)
+    connectchk2=$(echo "$connectchk" | grep -c ORA-)
+    if [ "${connectchk2}" -eq 0 ] ; then
+        echo "OK - login successful"
+        exit "$STATE_OK"
     else
-        connectchk3=` echo "$connectchk" | grep "ORA-" | head -1`
-        echo "CRITICAL - $connectchk3"
-        exit $STATE_CRITICAL
+        connectchk3=$(echo "$connectchk" | grep "ORA-" | head -1)
+        echo "CRITICAL - $connectchk3"
+        exit "$STATE_CRITICAL"
     fi
     ;;
 --cache)
-    if [ ${5} -gt ${6} ] ; then
-        echo "UNKNOWN - Warning level is less then Crit"
-        exit $STATE_UNKNOWN
+    if [ "${5}" -gt "${6}" ] ; then
+        echo "UNKNOWN - Warning level is less then Crit"
+        exit "$STATE_UNKNOWN"
     fi
-    result=`sqlplus -s ${3}/${4}@${2} << EOF
+    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select (1-(pr.value/(dbg.value+cg.value)))*100
@@ -219,48 +219,48 @@ and dbg.name='db block gets'
 and cg.name='consistent gets';
 EOF`
 
-    if [ -n "`echo $result | grep ORA-`" ] ; then
-      error=` echo "$result" | grep "ORA-" | head -1`
-      echo "CRITICAL - $error"
-      exit $STATE_CRITICAL
+    if echo "$result" | grep -q 'ORA-' ; then
+        error=$(echo "$result" | grep "ORA-" | head -1)
+        echo "CRITICAL - $error"
+        exit "$STATE_CRITICAL"
     fi
 
-    buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` 
-    buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` 
-    result=`sqlplus -s ${3}/${4}@${2} << EOF
+    buf_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}')
+    buf_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}')
+    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
 from v\\$librarycache lc;
 EOF`
-        
-    if [ -n "`echo $result | grep ORA-`" ] ; then
-      error=` echo "$result" | grep "ORA-" | head -1`
-      echo "CRITICAL - $error"
-      exit $STATE_CRITICAL
+
+    if echo "$result" | grep -q 'ORA-' ; then
+        error=$(echo "$result" | grep "ORA-" | head -1)
+        echo "CRITICAL - $error"
+        exit "$STATE_CRITICAL"
     fi
 
-    lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'`
-    lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'`
+    lib_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}')
+    lib_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}')
 
-    if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then
-        echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
-        exit $STATE_CRITICAL
+    if [ "$buf_hr" -le "${5}" ] || [ "$lib_hr" -le "${5}" ] ; then
+        echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
+        exit "$STATE_CRITICAL"
     fi
-    if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then
-        echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
-        exit $STATE_WARNING
+    if [ "$buf_hr" -le "${6}" ] || [ "$lib_hr" -le "${6}" ] ; then
+        echo "${2} WARNING  - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
+        exit "$STATE_WARNING"
     fi
     echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100"
 
-    exit $STATE_OK
+    exit "$STATE_OK"
     ;;
 --tablespace)
-    if [ ${6} -lt ${7} ] ; then
-        echo "UNKNOWN - Warning level is more then Crit"
-        exit $STATE_UNKNOWN
+    if [ "${6}" -lt "${7}" ] ; then
+        echo "UNKNOWN - Warning level is more then Crit"
+        exit "$STATE_UNKNOWN"
     fi
-    result=`sqlplus -s ${3}/${4}@${2} << EOF
+    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
@@ -273,32 +273,32 @@ from dba_free_space group by tablespace_name) B
 ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
 EOF`
 
-    if [ -n "`echo $result | grep ORA-`" ] ; then
-      error=` echo "$result" | grep "ORA-" | head -1`
-      echo "CRITICAL - $error"
-      exit $STATE_CRITICAL
+    if echo "$result" | grep -q 'ORA-' ; then
+        error=$(echo "$result" | grep "ORA-" | head -1)
+        echo "CRITICAL - $error"
+        exit "$STATE_CRITICAL"
     fi
 
-    ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` 
-    ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` 
-    ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` 
-    ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` 
-    if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then
+    ts_free=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}')
+    ts_total=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}')
+    ts_pct=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}')
+    ts_pctx=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}')
+    if [ "$ts_free" -eq 0 ] && [ "$ts_total" -eq 0 ] && [ "$ts_pct" -eq 0 ] ; then
         echo "No data returned by Oracle - tablespace $5 not found?"
-        exit $STATE_UNKNOWN
+        exit "$STATE_UNKNOWN"
     fi
-    if [ "$ts_pct" -ge ${6} ] ; then
-        echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
-        exit $STATE_CRITICAL
+    if [ "$ts_pct" -ge "${6}" ] ; then
+        echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
+        exit "$STATE_CRITICAL"
     fi
-    if [ "$ts_pct" -ge ${7} ] ; then
-        echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
-        exit $STATE_WARNING
+    if [ "$ts_pct" -ge "${7}" ] ; then
+        echo "${2} : ${5} WARNING  - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
+        exit "$STATE_WARNING"
     fi
     echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100"
-    exit $STATE_OK
+    exit "$STATE_OK"
     ;;
 *)
     print_usage
-                exit $STATE_UNKNOWN
+                exit "$STATE_UNKNOWN"
 esac
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index 47d6e49e..8a56b9fc 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -5,7 +5,7 @@
 # usage:
 #    check_rpc host service
 #
-# Check if an rpc serice is registered and running
+# Check if an rpc service is registered and running
 # using rpcinfo - $proto $host $prognum 2>&1 |";
 #
 # Use these hosts.cfg entries as examples
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index f7428301..866e0e0f 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -2,57 +2,57 @@
 
 PATH="@TRUSTED_PATH@"
 export PATH
-PROGNAME=`basename $0`
-PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+PROGNAME=$(basename "$0")
+PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,')
 REVISION="@NP_VERSION@"
 
-. $PROGPATH/utils.sh
+. "$PROGPATH"/utils.sh
 
 print_usage() {
         echo "Usage: $PROGNAME" [--ignore-fault]
 }
 
 print_help() {
-        print_revision $PROGNAME $REVISION
+        print_revision "$PROGNAME" "$REVISION"
         echo ""
         print_usage
         echo ""
         echo "This plugin checks hardware status using the lm_sensors package."
         echo ""
         support
-        exit $STATE_OK
+        exit "$STATE_OK"
 }
 
 case "$1" in
         --help)
                 print_help
-                exit $STATE_OK
+                exit "$STATE_UNKNOWN"
                 ;;
         -h)
                 print_help
-                exit $STATE_OK
+                exit "$STATE_UNKNOWN"
                 ;;
         --version)
-                print_revision $PROGNAME $REVISION
-                exit $STATE_OK
+                print_revision "$PROGNAME" "$REVISION"
+                exit "$STATE_UNKNOWN"
                 ;;
         -V)
-                print_revision $PROGNAME $REVISION
-                exit $STATE_OK
+                print_revision "$PROGNAME" "$REVISION"
+                exit "$STATE_UNKNOWN"
                 ;;
         *)
-                sensordata=`sensors 2>&1`
+                sensordata=$(sensors 2>&1)
                 status=$?
                 if test ${status} -eq 127; then
                         text="SENSORS UNKNOWN - command not found (did you install lmsensors?)"
                         exit=$STATE_UNKNOWN
-                elif test ${status} -ne 0; then
+                elif test "${status}" -ne 0; then
                         text="WARNING - sensors returned state $status"
                         exit=$STATE_WARNING
-                elif echo ${sensordata} | egrep ALARM > /dev/null; then
+                elif echo "${sensordata}" | grep -E ALARM > /dev/null; then
                         text="SENSOR CRITICAL - Sensor alarm detected!"
                         exit=$STATE_CRITICAL
-                elif echo ${sensordata} | egrep FAULT > /dev/null \
+                elif echo "${sensordata}" | grep -E FAULT > /dev/null \
                     && test "$1" != "-i" -a "$1" != "--ignore-fault"; then
                         text="SENSOR UNKNOWN - Sensor reported fault"
                         exit=$STATE_UNKNOWN
@@ -63,8 +63,8 @@ case "$1" in
 
                 echo "$text"
                 if test "$1" = "-v" -o "$1" = "--verbose"; then
-                        echo ${sensordata}
+                        echo "${sensordata}"
                 fi
-                exit $exit
+                exit "$exit"
                 ;;
 esac
diff --git a/plugins-scripts/check_uptime.pl b/plugins-scripts/check_uptime.pl
index 4c9f22da..d73e40e1 100755
--- a/plugins-scripts/check_uptime.pl
+++ b/plugins-scripts/check_uptime.pl
@@ -25,7 +25,7 @@ use POSIX;
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c
-                                        $opt_f $opt_s
+                                        $opt_f $opt_s $opt_d
                                         $lower_warn_threshold $upper_warn_threshold
                                         $lower_crit_threshold $upper_crit_threshold
                                         $status $state $msg);
@@ -110,7 +110,7 @@ $pretty_uptime .= sprintf( "%d week%s, ",   $weeks, $weeks == 1 ? "" : "s" )  if
 $pretty_uptime .= sprintf( "%d day%s, ",    $days,  $days  == 1 ? "" : "s" )  if  $days;
 $pretty_uptime .= sprintf( "%d hour%s, ",   $hours, $hours == 1 ? "" : "s" )  if  $hours;
 $pretty_uptime .= sprintf( "%d minute%s, ", $mins,  $mins  == 1 ? "" : "s" )  if  $mins;
-# Replace last occurence of comma with "and"
+# Replace last occurrence of comma with "and"
 $pretty_uptime =~ s/, $/ and /;
 # Always print the seconds (though it may be 0 seconds)
 $pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" );
@@ -137,9 +137,20 @@ if ( $uptime_seconds > $upper_crit_threshold ) {
         $state_str = "OK";
 }
 
+# Prepare uptime value (seconds or days)
+my $uptime_text = "";
+my $uptime_unit = "";
+if ( $opt_d ) {
+        $uptime_text = floor($uptime_seconds / 60 / 60 / 24);
+        $uptime_unit = "days";
+} else {
+        $uptime_text = $uptime_seconds;
+        $uptime_unit = "seconds";
+}
+
 $msg = "$state_str: ";
 
-$msg .= "uptime is $uptime_seconds seconds. ";
+$msg .= "Uptime is $uptime_text $uptime_unit. ";
 $msg .= "Exceeds $out_of_bounds_text threshold. "  if  $out_of_bounds_text;
 $msg .= "Running for $pretty_uptime. "  if  $opt_f;
 if ( $opt_s ) {
@@ -167,6 +178,7 @@ sub process_arguments(){
                  "c=s" => \$opt_c, "critical=s" => \$opt_c,       # critical if above this number
                  "f"   => \$opt_f, "for"        => \$opt_f,       # show "running for ..."
                  "s"   => \$opt_s, "since"      => \$opt_s,       # show "running since ..."
+                 "d"   => \$opt_d, "days"       => \$opt_d,       # report uptime in days
                  );
 
         if ($opt_V) {
@@ -262,6 +274,7 @@ sub print_help () {
         print "-c (--critical)  = Min. number of uptime to generate critical alert ( w < c )\n";
         print "-f (--for)       = Show uptime in a pretty format (Running for x weeks, x days, ...)\n";
         print "-s (--since)     = Show last boot in yyyy-mm-dd HH:MM:SS format (output from 'uptime -s')\n";
+        print "-d (--days)      = Show uptime in days\n";
         print "-h (--help)\n";
         print "-V (--version)\n";
         print "-v (--verbose)   = debugging output\n";
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl
index 41e15f50..c24015c0 100755
--- a/plugins-scripts/check_wave.pl
+++ b/plugins-scripts/check_wave.pl
@@ -19,6 +19,7 @@ sub print_usage ();
 $ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
+$ENV{'CDPATH'}='';
 
 Getopt::Long::Configure('bundling');
 GetOptions
@@ -50,34 +51,34 @@ my $critical = $1 if ($opt_c =~ /([0-9]+)/);
 ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
 my $warning = $1 if ($opt_w =~ /([0-9]+)/);
 
-$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low1);
 $low1 = $test[2];
 
-$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med1);
 $med1 = $test[2];
 
-$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high1);
 $high1 = $test[2];
 
 sleep(2);
 
-$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
+$snr = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
 @test = split(/ /,$snr);
 $snr = $test[2];
 $snr = int($snr*25);
 
-$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low2);
 $low2 = $test[2];
 
-$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med2);
 $med2 = $test[2];
 
-$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high2);
 $high2 = $test[2];
 
diff --git a/plugins-scripts/t/check_log.t b/plugins-scripts/t/check_log.t
new file mode 100644
index 00000000..b66e0fd8
--- /dev/null
+++ b/plugins-scripts/t/check_log.t
@@ -0,0 +1,82 @@
+#!/usr/bin/perl -w -I ..
+#
+# check_log tests
+#
+#
+
+use strict;
+use Test::More;
+use NPTest;
+
+my $tests = 18;
+plan tests => $tests;
+
+my $firstTimeOutput ='/^Log check data initialized/';
+my $okOutput = '/^Log check ok - 0 pattern matches found/';
+my $criticalOutput = '/^\(\d+\) < /';
+my $multilineOutput = '/\(3\) <.*\n.*\n.*$/';
+my $unknownOutput = '/^Usage: /';
+my $unknownArgOutput = '/^Unknown argument: /';
+my $bothRegexOutput = '/^Can not use extended and perl regex/';
+
+my $result;
+my $temp_file = "/tmp/check_log.tmp";
+my $oldlog = "/tmp/oldlog.tmp";
+
+open(FH, '>', $temp_file) or die $!;
+close(FH);
+
+$result = NPTest->testCmd("./check_log");
+cmp_ok( $result->return_code, '==', 3, "Missing parameters" );
+like  ( $result->output, $unknownOutput, "Output for unknown correct" );
+
+$result = NPTest->testCmd("./check_log -f");
+cmp_ok( $result->return_code, '==', 3, "Wrong parameters" );
+like  ( $result->output, $unknownArgOutput, "Output for unknown correct" );
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'Simple match' -e -p");
+cmp_ok( $result->return_code, '==', 3, "Both regex parameters" );
+like  ( $result->output, $bothRegexOutput, "Output for unknown correct" );
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'Simple match'");
+cmp_ok( $result->return_code, '==', 0, "First time executing" );
+like  ( $result->output, $firstTimeOutput, "Output for first time executing correct" );
+
+open(FH, '>>', $temp_file) or die $!;
+print FH "This is some text, that should not match\n";
+close(FH);
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'No match'");
+cmp_ok( $result->return_code, '==', 0, "No match" );
+like  ( $result->output, $okOutput, "Output for no match correct" );
+
+open(FH, '>>', $temp_file) or die $!;
+print FH "This text should match\n";
+close(FH);
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'should match'");
+cmp_ok( $result->return_code, '==', 2, "Pattern match" );
+like  ( $result->output, $criticalOutput, "Output for match correct" );
+
+open(FH, '>>', $temp_file) or die $!;
+print FH "This text should not match, because it is excluded\n";
+close(FH);
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'match' --exclude 'because'");
+cmp_ok( $result->return_code, '==', 0, "Exclude a pattern" );
+like  ( $result->output, $okOutput, "Output for no match correct" );
+
+open(FH, '>>', $temp_file) or die $!;
+print FH "Trying\nwith\nmultiline\nignore me\n";
+close(FH);
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'Trying\\|with\\|multiline\\|ignore' --exclude 'me' --all");
+cmp_ok( $result->return_code, '==', 2, "Multiline pattern match with --all" );
+like  ( $result->output, $multilineOutput, "Output for multiline match correct" );
+
+$result = NPTest->testCmd("./check_log -F ".$temp_file." -O ".$oldlog." -q 'match' -a");
+cmp_ok( $result->return_code, '==', 0, "Non matching --all" );
+like  ( $result->output, $okOutput, "Output for no match correct" );
+
+unlink($oldlog);
+unlink($temp_file);
diff --git a/plugins-scripts/t/check_uptime.t b/plugins-scripts/t/check_uptime.t
index c395307c..6e81db3c 100644
--- a/plugins-scripts/t/check_uptime.t
+++ b/plugins-scripts/t/check_uptime.t
@@ -5,7 +5,7 @@
 #
 
 use strict;
-use Test::More tests => 40;
+use Test::More tests => 42;
 use NPTest;
 
 my $result;
@@ -46,29 +46,35 @@ cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" );
 like  ( $result->output, '/Running since \d+/', "Output for the s parameter correct" );
 
 $result = NPTest->testCmd(
+        "./check_uptime -d -w 1 -c 2"
+        );
+cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" );
+like  ( $result->output, '/CRITICAL: Uptime is \d+ days/', "Output for the d parameter correct" );
+
+$result = NPTest->testCmd(
         "./check_uptime -w 1 -c 2"
         );
 cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" );
-like  ( $result->output, '/^CRITICAL: uptime is \d+ seconds/', "Output for uptime higher than 2 seconds correct" );
+like  ( $result->output, '/^CRITICAL: Uptime is \d+ seconds/', "Output for uptime higher than 2 seconds correct" );
 
 $result = NPTest->testCmd(
         "./check_uptime -w 1 -c 9999w"
         );
 cmp_ok( $result->return_code, '==', 1, "Uptime lower than 9999 weeks" );
-like  ( $result->output, '/^WARNING: uptime is \d+ seconds/', "Output for uptime lower than 9999 weeks correct" );
+like  ( $result->output, '/^WARNING: Uptime is \d+ seconds/', "Output for uptime lower than 9999 weeks correct" );
 
 $result = NPTest->testCmd(
         "./check_uptime -w 9998w -c 9999w"
         );
 cmp_ok( $result->return_code, '==', 0, "Uptime lower than 9998 weeks" );
-like  ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 9998 weeks correct" );
+like  ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 9998 weeks correct" );
 like  ( $result->output, '/\|uptime=[0-9]+s;6046790400;6047395200;/', "Checking for performance output" );
 
 $result = NPTest->testCmd(
         "./check_uptime -w 111222d -c 222333d"
         );
 cmp_ok( $result->return_code, '==', 0, "Uptime lower than 111222 days" );
-like  ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 111222 days correct" );
+like  ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 111222 days correct" );
 like  ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" );
 
 # Same as before, hopefully uptime is higher than 2 seconds so no warning
@@ -76,7 +82,7 @@ $result = NPTest->testCmd(
         "./check_uptime -w 2:111222d -c 1:222333d"
         );
 cmp_ok( $result->return_code, '==', 0, "Uptime lower than 111222 days, and higher 2 seconds" );
-like  ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 111222 days, and higher 2 seconds correct" );
+like  ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 111222 days, and higher 2 seconds correct" );
 like  ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" );
 
 # Same as before, now the low warning should trigger
@@ -84,7 +90,7 @@ $result = NPTest->testCmd(
         "./check_uptime -w 111221d:111222d -c 1:222333d"
         );
 cmp_ok( $result->return_code, '==', 1, "Uptime lower than 111221 days raises warning" );
-like  ( $result->output, '/^WARNING: uptime is \d+ seconds/', "Output for uptime lower than 111221 days correct" );
+like  ( $result->output, '/^WARNING: Uptime is \d+ seconds/', "Output for uptime lower than 111221 days correct" );
 like  ( $result->output, '/Exceeds lower warn threshold/', "Exceeds text correct" );
 like  ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" );
 
@@ -93,7 +99,7 @@ $result = NPTest->testCmd(
         "./check_uptime -w 111221d:111222d -c 111220d:222333d"
         );
 cmp_ok( $result->return_code, '==', 2, "Uptime lower than 111220 days raises critical" );
-like  ( $result->output, '/^CRITICAL: uptime is \d+ seconds/', "Output for uptime lower than 111220 days correct" );
+like  ( $result->output, '/^CRITICAL: Uptime is \d+ seconds/', "Output for uptime lower than 111220 days correct" );
 like  ( $result->output, '/Exceeds lower crit threshold/', "Exceeds text correct" );
 like  ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" );
 
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 386831eb..c84769fb 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -23,6 +23,7 @@ $PATH_TO_LMSTAT  = "@PATH_TO_LMSTAT@" ;
 $PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ;
 $PATH_TO_MAILQ   = "@PATH_TO_MAILQ@";
 $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@";
+$PATH_TO_SNMPGET = "@PATH_TO_SNMPGET@";
 
 ## common variables
 $TIMEOUT = 15;