packages: nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl, nagio...

[glen]

Author: glen                         Date: Wed Aug 25 14:39:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pff, the script was in pld cvs

---- Files affected:
packages/nagios-plugin-check_mailman_qfiles:
   check_mailman_qfiles.pl (1.4 -> 1.5) , nagios-plugin-check_mailman_qfiles.spec (1.6 -> 1.7) , check-modqueue.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl
diff -u packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl:1.4 packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl:1.5
--- packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl:1.4	Tue Aug  4 07:35:19 2009
+++ packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl	Wed Aug 25 16:39:37 2010
@@ -13,6 +13,7 @@
 use Getopt::Long;
 
 my $qfiles_base = '/var/spool/mailman';
+my $qfiles_data = '/var/lib/mailman/data';
 my %opts = (
 	warning => 5,   # 5 minutes
 	critical => 20, # 20 minutes
@@ -53,6 +54,29 @@
 		$problems{$qdir}[1] = sprintf "%d tasks, oldest %s", int(@files), describe_diff($diff);
 	}
 }
+
+# check moderation queue
+my %modqueue;
+foreach (File::Find::Rule->file->name('heldmsg-*.pck')->in($qfiles_data)) {
+	if (my($list, $id) = /heldmsg-(.+)-(\d+)\.pck/) {
+		$modqueue{$list}++;
+	}
+}
+while (my($list, $count) = each %modqueue) {
+	if ($count > $opts{critical}) {
+		$problems{$list} = [ 'CRITICAL' ];
+		$problem_status = 'CRITICAL';
+	}
+	elsif ($count > $opts{warning}) {
+		$problems{$list} = [ 'WARNING' ];
+		$problem_status = 'WARNING' if ! $problem_status;;
+	}
+
+	if ($problems{$list}) {
+		$problems{$list}[1] = sprintf("%d moderation tasks", $count);
+	}
+}
+
 
 if (! $problem_status) {
 	print "OK: all normal\n";

================================================================
Index: packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec
diff -u packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec:1.6 packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec:1.7
--- packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec:1.6	Wed Aug 25 16:36:30 2010
+++ packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec	Wed Aug 25 16:39:37 2010
@@ -9,7 +9,6 @@
 Group:		Networking
 # Source0Download: http://exchange.nagios.org/components/com_mtree/attachment.php?link_id=1347&cf_id=24
 Source0:	%{plugin}.pl
-Patch0:	check-modqueue.patch
 URL:		http://exchange.nagios.org/directory/Plugins/Email-and-Groupware/Mailman/check_mailman_qfiles/details
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	nagios-common
@@ -29,9 +28,6 @@
 
 %prep
 %setup -qcT
-install -p %{SOURCE0} .
-%patch0 -p0
-
 cat > nagios.cfg <<'EOF'
 define command {
 	command_name    %{plugin}
@@ -42,7 +38,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
-install -p %{plugin}.pl $RPM_BUILD_ROOT%{plugindir}/%{plugin}
+install -p %{SOURCE0} $RPM_BUILD_ROOT%{plugindir}/%{plugin}
 cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 %clean
@@ -59,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/08/25 14:39:37  glen
+- pff, the script was in pld cvs
+
 Revision 1.6  2010/08/25 14:36:30  glen
 - check also moderation queue in data dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mailman_qfiles/check_mailman_qfiles.pl?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mailman_qfiles/nagios-plugin-check_mailman_qfiles.spec?r1=1.6&r2=1.7&f=u