Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110915
Change subject: mail: change mailman check to use nrpe::monitor_service
......................................................................
mail: change mailman check to use nrpe::monitor_service
Change-Id: I7da877050f8b8b6f8f3c131d3912b0a63cc1966c
---
M manifests/mail.pp
M modules/nrpe/templates/nrpe_local.cfg.erb
M templates/icinga/checkcommands.cfg.erb
3 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/110915/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index c5c4c25..c6aa539 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -407,7 +407,10 @@
pattern => "mailmanctl"
}
- monitor_service { "procs_mailman": description => "mailman",
check_command => "nrpe_check_mailman" }
+ 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/modules/nrpe/templates/nrpe_local.cfg.erb
b/modules/nrpe/templates/nrpe_local.cfg.erb
index 862a9f2..49da5bc 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -13,7 +13,6 @@
command[check_ram]=/usr/lib/nagios/plugins/check_ram.sh 20 5 b
# process checks, we can't make this generic because we don't pass args via
nrpe (security)
-command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a
mailman
command[check_spamd]=/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:40 -a
spamd
command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:6
-C varnishncsa
command[check_mysqld]=/usr/lib/nagios/plugins/check_procs -c 1:1 -C mysqld
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index cfc3103..e0bc841 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -361,10 +361,6 @@
command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
check_dpkg
}
define command{
- command_name nrpe_check_mailman
- command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
check_mailman
-}
-define command{
command_name nrpe_check_spamd
command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
check_spamd
}
--
To view, visit https://gerrit.wikimedia.org/r/110915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7da877050f8b8b6f8f3c131d3912b0a63cc1966c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
