Hashar has uploaded a new change for review.

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

Change subject: zuul: update monitoring regex check
......................................................................

zuul: update monitoring regex check

0889192 switched Zuul install to be provided by a Debian package. The
merger and server process are now in /usr/bin and are invoked using
python from the zuul venv /usr/share/python/zuul/bin/python.

Change-Id: Ia4d5667df870b7b60ef48c5dba412bd196ada5e5
---
M modules/zuul/manifests/monitoring/merger.pp
M modules/zuul/manifests/monitoring/server.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/204753/1

diff --git a/modules/zuul/manifests/monitoring/merger.pp 
b/modules/zuul/manifests/monitoring/merger.pp
index 89088b1..2180d18 100644
--- a/modules/zuul/manifests/monitoring/merger.pp
+++ b/modules/zuul/manifests/monitoring/merger.pp
@@ -7,7 +7,7 @@
     nrpe::monitor_service { 'zuul_merger':
         description   => 'zuul_merger_service_running',
         contact_group => 'contint',
-        nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-merger'"
+        nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/share/python/zuul/bin/python /usr/bin/zuul-merger'"
     }
 
 }
diff --git a/modules/zuul/manifests/monitoring/server.pp 
b/modules/zuul/manifests/monitoring/server.pp
index 170eff0..8eccc2d 100644
--- a/modules/zuul/manifests/monitoring/server.pp
+++ b/modules/zuul/manifests/monitoring/server.pp
@@ -9,7 +9,7 @@
         contact_group => 'contint',
         # Zuul has a main process and a fork which is the gearman
         # server. Thus we need two process running.
-        nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:2 
--ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-server'",
+        nrpe_command  => "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:2 
--ereg-argument-array '^/usr/share/python/zuul/bin/python 
/usr/bin/zuul-server'",
     }
 
     nrpe::monitor_service { 'zuul_gearman':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4d5667df870b7b60ef48c5dba412bd196ada5e5
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

Reply via email to