Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219075
Change subject: analytics_kafka: switch to ganglia_new
......................................................................
analytics_kafka: switch to ganglia_new
Change-Id: I6a24d2dc014ae3a8f12dc50b696c1982e83adb43
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/219075/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 59fd8bb..55f6b5b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -204,10 +204,7 @@
name: "Analytics Kafka cluster"
id: 45
sites:
- eqiad:
- - analytics1012.eqiad.wmnet
- - analytics1018.eqiad.wmnet
- - analytics1022.eqiad.wmnet
+ eqiad: []
sca:
name: "Service Cluster A"
id: 46
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index e1d3528..b395bae 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -1,3 +1,7 @@
+analytics_kafka:
+ __regex: !ruby/regexp /^analytics10(12|18|21|22)\.eqiad\.wmnet$/
+ ganglia_class: "new"
+
api_appserver:
__regex: !ruby/regexp
/^mw(111[4-9]|11[2-3][0-9]|114[0-8]|1189|119[0-9]|120[0-8]|122[1-9]|123[0-5])\.eqiad\.wmnet$/
ganglia_class: "new"
diff --git a/manifests/site.pp b/manifests/site.pp
index 224d5ed..5c9349d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -127,14 +127,6 @@
# analytics1012, analytics1018, analytics1021 and analytics1022 are Kafka
Brokers.
node /analytics10(12|18|21|22)\.eqiad\.wmnet/ {
- # one ganglia aggregator per ganglia 'cluster' per row.
- if ($::hostname == 'analytics1012' or # Row A
- $::hostname == 'analytics1018' or # Row D
- $::hostname == 'analytics1022') # Row C
- {
- $ganglia_aggregator = true
- }
-
# Kafka brokers are routed via IPv6 so that
# other DCs can address without public IPv4
# addresses.
--
To view, visit https://gerrit.wikimedia.org/r/219075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a24d2dc014ae3a8f12dc50b696c1982e83adb43
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
