Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/106256
Change subject: zuul: monitor gearman service ...................................................................... zuul: monitor gearman service Zuul has a build in Gearman server listening on 127.0.0.1:4730. Additionally the port is firewalled so we have to use NRPE. Made the TCP check to timeout after two seconds. Change-Id: I662abc44a7f2fe3209f7f8bd3dace8344a5d05b1 --- M manifests/zuul.pp M modules/nrpe/templates/nrpe_local.cfg.erb M templates/icinga/checkcommands.cfg.erb 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/106256/1 diff --git a/manifests/zuul.pp b/manifests/zuul.pp index 659f75f..b27d6a9 100644 --- a/manifests/zuul.pp +++ b/manifests/zuul.pp @@ -46,6 +46,7 @@ # nagios/icinga monitoring monitor_service { 'zuul': description => 'zuul_service_running', check_command => 'nrpe_check_zuul' } + monitor_service { 'zuul_gearman': description => 'zuul_gearman_service', check_command => 'nrpe_check_gearman' } # Deploy Wikimedia Zuul configuration files. diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb b/modules/nrpe/templates/nrpe_local.cfg.erb index 2070766..7c3f38d 100644 --- a/modules/nrpe/templates/nrpe_local.cfg.erb +++ b/modules/nrpe/templates/nrpe_local.cfg.erb @@ -17,6 +17,7 @@ # Zuul has a main process and a fork which is the gearman server. Thus we need # two process running. command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:2 --ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-server' +command[check_gearman]=/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 -p 4730 --timeout=2 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_poolcounterd]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:3 -C poolcounterd diff --git a/templates/icinga/checkcommands.cfg.erb b/templates/icinga/checkcommands.cfg.erb index 00a2d57..20b172d 100644 --- a/templates/icinga/checkcommands.cfg.erb +++ b/templates/icinga/checkcommands.cfg.erb @@ -369,6 +369,10 @@ command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c check_zuul } define command{ + command_name nrpe_check_gearman + command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c check_gearman +} +define command{ command_name nrpe_check_mailman command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c check_mailman } -- To view, visit https://gerrit.wikimedia.org/r/106256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I662abc44a7f2fe3209f7f8bd3dace8344a5d05b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits