Rewrite unowned files check into something that writes proper nagios status files...

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 55f7b42..f497319 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -15,7 +15,11 @@ dsa-nagios-checks (9X) Xnstable; urgency=low
   * Make the unowned files check skip /proc.
   * Limit the number of unowned files we register in the state file to 40.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 22 Feb 2012 13:01:59 +0100
+  [ Peter Palfrader ]
+  * Rewrite unowned files check into something that writes proper
+    nagios status files and behaves in a nice and sane way.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 24 Feb 2012 18:07:14 +0100
 
 dsa-nagios-checks (90) unstable; urgency=low
 

diff --git a/dsa-nagios-checks/sbin/dsa-update-unowned-file-status b/dsa-nagios-checks/sbin/dsa-update-unowned-file-status
index 57f47f7..29eb7ef 100755 (executable)
--- a/dsa-nagios-checks/sbin/dsa-update-unowned-file-status
+++ b/dsa-nagios-checks/sbin/dsa-update-unowned-file-status
@@ -1,20 +1,50 @@
-#!/bin/sh
+#!/bin/bash
 
-#  Copyright (C) 2012 Martin Zobel-Helas 
+# Copyright 2012 Peter Palfrader
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-find / -path /proc -prune -o -nouser | head -n 40 > /var/cache/dsa/nagios/nouser
+CUTOFF=40
+STATUS=/var/cache/dsa/nagios/nouser
+
+tmp=`tempfile`
+trap "rm -f '$tmp'" exit
+
+if command -v ionice >/dev/null 2>&1; then
+       prefix="ionice -c 3 -t"  # idle priority, ignore errors
+fi
+
+$prefix find / -path /proc -prune -o -nouser | head -n "$CUTOFF" > "$tmp"
+
+if [ -s "$tmp" ]; then
+       echo "WARN"
+       c="$(wc -l < "$tmp")"
+       if [ "$c" -lt "$CUTOFF" ] ; then
+               echo "Warn: $c unowned files on system."
+               cat "$tmp"
+       else
+               echo "Warn: Lots of unowned files on system:"
+               cat "$tmp"
+               echo "..."
+       fi
+else
+       echo "OK"
+       echo "OK: No unowned files on system."
+fi > "$STATUS"