Rush has submitted this change and it was merged.
Change subject: diamond: sge stats run from the services hosts
......................................................................
diamond: sge stats run from the services hosts
Bug: T140999
Change-Id: Ic068c5c60c79a4b187553f65f511a38b39d74bb1
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/services.pp
2 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 046899f..4536691 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -15,14 +15,6 @@
include toollabs::dev_environ
include toollabs::exec_environ
- # 7/22/16 if this proves stable transition
- # to the grid master
- if $::hostname == 'tools-bastion-03' {
- diamond::collector { 'SGE':
- source => 'puppet:///modules/toollabs/monitoring/sge.py',
- }
- }
-
if os_version('ubuntu trusty') {
# lint:ignore:arrow_alignment
diff --git a/modules/toollabs/manifests/services.pp
b/modules/toollabs/manifests/services.pp
index e1b7b42..5b098b3 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -20,6 +20,10 @@
ensure => latest,
}
+ diamond::collector { 'SGE':
+ source => 'puppet:///modules/toollabs/monitoring/sge.py',
+ }
+
service { 'webservicemonitor':
ensure => ensure_service($active),
subscribe => Package['tools-manifest'],
--
To view, visit https://gerrit.wikimedia.org/r/306294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic068c5c60c79a4b187553f65f511a38b39d74bb1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Coren <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
