Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: re-enable monitoring in codfw
......................................................................
mediawiki: re-enable monitoring in codfw
Change-Id: Ib1dce402e54f1f3e791c9760766048b822c9636a
---
M manifests/role/mediawiki.pp
1 file changed, 14 insertions(+), 14 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 4bd89e2..8267c7e 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -91,24 +91,24 @@
ensure => present,
rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
}
- if $::site == 'eqiad' {
- monitoring::service { 'appserver http':
- description => 'Apache HTTP',
- check_command => 'check_http_wikipedia',
+
+ monitoring::service { 'appserver http':
+ description => 'Apache HTTP',
+ check_command => 'check_http_wikipedia',
+ }
+
+ if os_version('ubuntu >= trusty') {
+ monitoring::service { 'appserver_http_hhvm':
+ description => 'HHVM rendering',
+ check_command => 'check_http_wikipedia_main',
}
- if os_version('ubuntu >= trusty') {
- monitoring::service { 'appserver_http_hhvm':
- description => 'HHVM rendering',
- check_command => 'check_http_wikipedia_main',
- }
-
- nrpe::monitor_service { 'hhvm':
- description => 'HHVM processes',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C
hhvm',
- }
+ nrpe::monitor_service { 'hhvm':
+ description => 'HHVM processes',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C
hhvm',
}
}
+
}
class role::mediawiki::appserver {
--
To view, visit https://gerrit.wikimedia.org/r/199606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1dce402e54f1f3e791c9760766048b822c9636a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
