[MediaWiki-commits] [Gerrit] switch analytics and analytics_kafka to ganglia_new - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: switch analytics and analytics_kafka to ganglia_new
..
switch analytics and analytics_kafka to ganglia_new
Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 3 insertions(+), 25 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 18b0310..c0087df 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -127,10 +127,7 @@
name: "Analytics cluster"
id: 32
sites:
- eqiad:
-- analytics1013.eqiad.wmnet
-- analytics1014.eqiad.wmnet
-- analytics1019.eqiad.wmnet
+ eqiad: []
memcached:
name: "Memcached"
id: 33
@@ -203,10 +200,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 8f13104..b3b6686 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -1,7 +1,3 @@
-analytics:
- __regex: !ruby/regexp /^analytics10[0-9][0-9]\.eqiad\.wmnet$/
- ganglia_class: "old"
-
logstash:
__regex: !ruby/regexp /^logstash100[0-9]\.eqiad\.wmnet$/
ganglia_class: "old"
diff --git a/manifests/site.pp b/manifests/site.pp
index 2bb1788..aca1003 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -119,12 +119,7 @@
# hostname -> /datacenter/rack/row id is correct. This is
# used for Hadoop network topology awareness.
node /analytics10(11|1[3-7]|19|2[089]|3[0-9]|4[01]).eqiad.wmnet/ {
-# analytics1013 is a Ganglia aggregator for Row A
-# analytics1014 is a Ganglia aggregator for Row C
-# analytics1019 is a Ganglia aggregator for Row D
-if $::hostname =~ /^analytics101[349]$/ {
-$ganglia_aggregator = true
-}
+
role analytics::hadoop::worker, analytics::impala::worker
include standard
@@ -132,13 +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
--
To view, visit https://gerrit.wikimedia.org/r/222153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] switch analytics and analytics_kafka to ganglia_new - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222153
Change subject: switch analytics and analytics_kafka to ganglia_new
..
switch analytics and analytics_kafka to ganglia_new
Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 3 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/222153/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 18b0310..c0087df 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -127,10 +127,7 @@
name: "Analytics cluster"
id: 32
sites:
- eqiad:
-- analytics1013.eqiad.wmnet
-- analytics1014.eqiad.wmnet
-- analytics1019.eqiad.wmnet
+ eqiad: []
memcached:
name: "Memcached"
id: 33
@@ -203,10 +200,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 8f13104..b3b6686 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -1,7 +1,3 @@
-analytics:
- __regex: !ruby/regexp /^analytics10[0-9][0-9]\.eqiad\.wmnet$/
- ganglia_class: "old"
-
logstash:
__regex: !ruby/regexp /^logstash100[0-9]\.eqiad\.wmnet$/
ganglia_class: "old"
diff --git a/manifests/site.pp b/manifests/site.pp
index df7e197..19eb446 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -120,12 +120,7 @@
# hostname -> /datacenter/rack/row id is correct. This is
# used for Hadoop network topology awareness.
node /analytics10(11|1[3-7]|19|2[089]|3[0-9]|4[01]).eqiad.wmnet/ {
-# analytics1013 is a Ganglia aggregator for Row A
-# analytics1014 is a Ganglia aggregator for Row C
-# analytics1019 is a Ganglia aggregator for Row D
-if $::hostname =~ /^analytics101[349]$/ {
-$ganglia_aggregator = true
-}
+
role analytics::hadoop::worker, analytics::impala::worker
include standard
@@ -133,13 +128,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
--
To view, visit https://gerrit.wikimedia.org/r/222153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
