Asher has submitted this change and it was merged.

Change subject: twemproxy proc monitor, don't run in labs
......................................................................


twemproxy proc monitor, don't run in labs

Change-Id: I576c672b00cfaa33e357ca7d2e92b2dbb81e9dfa
---
M manifests/role/applicationserver.pp
1 file changed, 9 insertions(+), 4 deletions(-)

Approvals:
  Asher: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 9135ca1..1fc7af1 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -35,18 +35,23 @@
                $nagios_group = "${group}_${::site}"
                $cluster = "${group}"
 
-               include standard,
-                       mediawiki
+               include standard
 
                if $::realm == 'production' {
                        include admins::roots,
                                admins::mortals,
-                               geoip
+                               geoip,
+                               mediawiki
+
+                       nrpe::monitor_service { "twemproxy":
+                               description => "twemproxy process",
+                               nrpe_command => 
"/usr/lib/nagios/plugins/check_procs -c 1:1 -u nobody -C nutcracker"
+                       }
                }
 
                if $::realm == 'labs' {
                        # MediaWiki configuration specific to labs instances 
('beta' project)
-
+                       class { "mediawiki": twemproxy => false }
                        # Umount /dev/vdb from /mnt ...
                        mount { '/mnt':
                                name => '/mnt',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I576c672b00cfaa33e357ca7d2e92b2dbb81e9dfa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <[email protected]>
Gerrit-Reviewer: Asher <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to