Muehlenhoff has submitted this change and it was merged.
Change subject: Re-enable HHVM Icinga checks for jessie
......................................................................
Re-enable HHVM Icinga checks for jessie
Drop the entire conditional, precise is no longer supported for the mediawiki
classes for quite a while now.
Change-Id: I2b4b5a33fb48173c5001b93732440ae1cb28691a
---
M modules/role/manifests/mediawiki/webserver.pp
1 file changed, 8 insertions(+), 11 deletions(-)
Approvals:
Elukey: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/mediawiki/webserver.pp
b/modules/role/manifests/mediawiki/webserver.pp
index cdf72df..732446d 100644
--- a/modules/role/manifests/mediawiki/webserver.pp
+++ b/modules/role/manifests/mediawiki/webserver.pp
@@ -37,17 +37,14 @@
retries => 2,
}
- if os_version('ubuntu >= trusty') {
- monitoring::service { 'appserver_http_hhvm':
- description => 'HHVM rendering',
- check_command => 'check_http_wikipedia_main',
- retries => 2,
- }
-
- nrpe::monitor_service { 'hhvm':
- description => 'HHVM processes',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C
hhvm',
- }
+ monitoring::service { 'appserver_http_hhvm':
+ description => 'HHVM rendering',
+ check_command => 'check_http_wikipedia_main',
+ retries => 2,
}
+ nrpe::monitor_service { 'hhvm':
+ description => 'HHVM processes',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C hhvm',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/314507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b4b5a33fb48173c5001b93732440ae1cb28691a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
