Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348191 )
Change subject: contint/icinga: skip zmq_publisher monitor if no jenkins
......................................................................
contint/icinga: skip zmq_publisher monitor if no jenkins
as a follow-up to I4dd3b239edcca691,
also skip Icinga monitoring of the jenkins_zmq_publisher
if we are on a host that doesn't have a running jenkins service,
using the same Hiera setting.
Bug: T162822
Bug: T150771
Change-Id: Id1d64b1ca2c769514af0a9d6b88719b414341580
---
M modules/role/manifests/ci/master.pp
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index 0b43cb3..d9cec9e 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -51,12 +51,13 @@
hour => '*',
}
- nrpe::monitor_service { 'jenkins_zmq_publisher':
- description => 'jenkins_zmq_publisher',
- contact_group => 'contint',
- nrpe_command => '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 -p
8888 --timeout=2',
+ if hiera('jenkins::service_monitor', true) {
+ nrpe::monitor_service { 'jenkins_zmq_publisher':
+ description => 'jenkins_zmq_publisher',
+ contact_group => 'contint',
+ nrpe_command => '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1
-p 8888 --timeout=2',
+ }
}
-
# Templates for Jenkins plugin Email-ext. The templates are hosted in
# the repository integration/jenkins.git, so link to there.
--
To view, visit https://gerrit.wikimedia.org/r/348191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1d64b1ca2c769514af0a9d6b88719b414341580
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
