Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/146796

Change subject: enhance mailman monitoring
......................................................................

enhance mailman monitoring

- we already had a mailman check_procs when the new check was
  recently added, causing a duplicate definition

- remove the old check(s), it checked for 'mailman' being in arguments only,
  not the entire commandline, if this is combined with a lower threshold of 1
  the check will see itself (it's also a process with args mailman) and this
  should explain why the existing check never told us when mailman was down

- use --ereg-argument-array= like we do on other checks to avoid this problem,
  check parts of the entire commandline and check for exactly:

  1 mailman ctl
  8 mailman qrunners

no more and no less...

Change-Id: Ib3ef872d4477c768efde58b176fbbdeab910d710
RT: 7878
---
M manifests/mail.pp
M manifests/role/mail.pp
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/146796/1

diff --git a/manifests/mail.pp b/manifests/mail.pp
index c822b33..e5eec54 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -196,10 +196,6 @@
             pattern   => 'mailmanctl',
         }
 
-        nrpe::monitor_service { 'procs_mailman':
-            description  => 'mailman',
-            nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:25 -c 
1:35 -a mailman',
-        }
     }
 
     class web-ui {
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 81e03b0..e154fca 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -139,11 +139,15 @@
         check_command => 'check_smtp',
     }
 
-    nrpe::monitor_service { 'procs_mailman':
-        description  => 'mailman',
-        nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 9:9 -a 
mailman',
+    nrpe::monitor_service { 'procs_mailmanctl':
+        description  => 'mailman_ctl',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 
--ereg-argument-array=\'/mailman/bin/mailmanctl\''
     }
 
+    nrpe::monitor_service { 'procs_mailman_qrunner':
+        description  => 'mailman',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 8:8 
--ereg-argument-array=\'/mailman/bin/qrunner\''
+    }
 }
 
 class role::mail::imap {

-- 
To view, visit https://gerrit.wikimedia.org/r/146796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3ef872d4477c768efde58b176fbbdeab910d710
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to