dsa-check-file_age: support multiple files

diff --git a/dsa-nagios-checks/checks/dsa-check-file_age b/dsa-nagios-checks/checks/dsa-check-file_age
index 6320d6f..ee49e6c 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-file_age
+++ b/dsa-nagios-checks/checks/dsa-check-file_age
@@ -26,6 +26,11 @@
 FILE=''
 INTERVAL=60
 EXIT=0
+ZEROFAIL=''
+FOLLOW=''
+
+set -e
+set -u
 
 usage(){
        ret=$1
@@ -47,9 +52,6 @@ EOF
        exit $ret
 }
 
-ZEROFAIL=""
-FOLLOW=""
-
 while getopts f:i:hzL opt ; do
        case "$opt" in
                f) FILE="$OPTARG" ;;
@@ -59,25 +61,56 @@ while getopts f:i:hzL opt ; do
                h) usage 0
        esac
 done
+shift $(($OPTIND - 1))
 
-if [ -z "$FILE" ]; then
+
+if [ -z "$FILE" ] && [ "$#" = 0 ]; then
        echo "Need file argument!" >&2
        usage 3
 fi
 
-if [ ! -e "$FILE" ]; then
-       printf "state file %s is missing or unreadable\n" $FILE
-       exit 2
+if [ -n "$FILE" ]; then
+       set dummy "$FILE" "$@"
+       shift
 fi
 
-if [ -n "$ZEROFAIL" ] && ! [ -s "$FILE" ]; then
-       printf "state file %s is empty\n" $FILE
-       exit 2
-fi
+msg=""
+ok=""
+failed=""
+total=0
 
-if [ "$(( $( date +%s ) - $(stat $FOLLOW -c %Y $FILE) ))" -gt "$(( $INTERVAL * 60 ))" ]; then
-       printf "state file %s is older than %d minutes\n" $FILE $INTERVAL
-       exit 2
-fi
+while [ "$#" -gt 0 ]; do
+       f="$1"; shift
+       total=$((total + 1))
+
+       if [ ! -e "$f" ]; then
+               msg="${msg}state file $f is missing or unreadable\n"
+               EXIT=2
+               failed="$f $failed"
+       elif [ -n "$ZEROFAIL" ] && ! [ -s "$f" ]; then
+               msg="${msg}state file $f is empty\n"
+               EXIT=2
+               failed="$f $failed"
+       elif [ "$(( $( date +%s ) - $(stat $FOLLOW -c %Y "$f") ))" -gt "$(( $INTERVAL * 60 ))" ]; then
+               msg="${msg}state file $f is older than $INTERVAL minutes (updated on $(stat $FOLLOW -c %y "$f"))\n"
+               EXIT=2
+               failed="$f $failed"
+       else
+               msg="${msg}state file $f OK: updated on $(stat $FOLLOW -c %y "$f")\n"
+               ok="$f $ok"
+       fi
+done
 
-printf "state file %s OK: updated on %s\n" $FILE "$(stat $FOLLOW -c %y $FILE)"
+if [ "$total" = 1 ]; then
+       echo -n $msg
+else
+       if [ "-n $failed" ]; then
+               echo -n "FAIL: $failed "
+       fi
+       if [ -n "$ok" ]; then
+               echo -n "OK: $ok "
+       fi
+       echo
+       echo -n $msg
+fi
+       exit $EXIT

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index c1816cc..40aca93 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -4,6 +4,7 @@ dsa-nagios-checks (110) UNRELEASED; urgency=medium
   * dsa-check-backuppg: warn if backups for a database configured in
     dsa-check-backuppg.conf are missing entirely.
   * dsa-check-file_age: support following symlinks and warning on empty files.
+  * dsa-check-file_age: support multiple files.
 
  -- Peter Palfrader <weasel@debian.org>  Mon, 23 Jan 2017 14:14:06 +0100