Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/217900
Change subject: elasticsearch: switch to ganglia_new
......................................................................
elasticsearch: switch to ganglia_new
Change-Id: I2e4a54d9238d67de9f05f3715bf1166d24ca156f
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/217900/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a0c0e7d..7d34473 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -215,10 +215,7 @@
name: "Elasticsearch cluster"
id: 42
sites:
- eqiad:
- - elastic1001.eqiad.wmnet
- - elastic1007.eqiad.wmnet
- - elastic1013.eqiad.wmnet
+ eqiad: []
logstash:
name: "Logstash cluster"
id: 43
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index ba0ea88..5d16a0b 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -18,6 +18,10 @@
elasticsearch::rack: D4
elasticsearch::row: D
+elasticsearch:
+ __regex: !ruby/regexp /^elastic10[0-3][0-9]\.eqiad\.wmnet$/
+ ganglia_class: "new"
+
etcd:
__regex: !ruby/regexp /^etcd100\d\.eqiad\.wmnet$/
ganglia_class: "new"
diff --git a/manifests/site.pp b/manifests/site.pp
index 14c6147..589edcb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -934,9 +934,6 @@
}
node /^elastic10[0-3][0-9]\.eqiad\.wmnet/ {
- if $::hostname =~ /^elastic10(0[17]|13)/ {
- $ganglia_aggregator = true
- }
role elasticsearch::server
}
--
To view, visit https://gerrit.wikimedia.org/r/217900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e4a54d9238d67de9f05f3715bf1166d24ca156f
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
