Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395156 )
Change subject: ulsfo: lvs, bastion, remove ganglia and aggregator
......................................................................
ulsfo: lvs, bastion, remove ganglia and aggregator
Bug: T177225
Change-Id: I9c6bdfa1e5729804032646ecfd4c52c4063c74c9
---
A hieradata/hosts/bast4001.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/bast4001.yaml b/hieradata/hosts/bast4001.yaml
new file mode 100644
index 0000000..49549d1
--- /dev/null
+++ b/hieradata/hosts/bast4001.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f4cada6..85f2643 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -181,6 +181,10 @@
__regex: !ruby/regexp /^lvs10(0[7-9]|1[0-2])\.eqiad\.wmnet$/
profile::pybal::bgp: no
+lvs_ulsfo:
+ __regex: !ruby/regexp /^lvs4.*\.ulsfo\.wmnet$/
+ standard::has_ganglia: false
+
maps_test:
__regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
cassandra::target_version: '2.2'
diff --git a/manifests/site.pp b/manifests/site.pp
index f85e1ad..8ede359 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -109,10 +109,6 @@
prometheus::ops)
interface::add_ip6_mapped { 'main': }
-
- class { '::ganglia::monitor::aggregator':
- sites => 'ulsfo',
- }
}
node 'bast4002.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/395156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c6bdfa1e5729804032646ecfd4c52c4063c74c9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[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
