Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96550
Change subject: Adding ganglia aggregators for elasticsearch cluster
......................................................................
Adding ganglia aggregators for elasticsearch cluster
Change-Id: Ie967b3b97a35d5b9486cd89863894bda06466601
---
M manifests/ganglia.pp
M manifests/role/elasticsearch.pp
M manifests/site.pp
3 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/96550/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 7444e49..01f5384 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -162,6 +162,9 @@
'cache_misc' => {
'name' => 'Misc Web caching cluster',
'ip_oct' => '41' },
+ 'elasticsearch' => {
+ 'name' => 'Elasticsearch cluster',
+ 'ip_oct' => '42' },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
@@ -344,6 +347,7 @@
"Upload caches ulsfo" =>
'cp4005.ulsfo.wmnet cp4013.ulsfo.wmnet',
"Mobile caches ulsfo" =>
'cp4011.ulsfo.wmnet cp4019.ulsfo.wmnet',
"Text caches ulsfo" =>
'cp4008.ulsfo.wmnet cp4016.ulsfo.wmnet',
+ "Elasticsearch eqiad" =>
'elastic1001.eqiad.wmnet elastic1007.eqiad.wmnet',
}
$rra_sizes = '"RRA:AVERAGE:0.5:1:360"
"RRA:AVERAGE:0.5:24:245" "RRA:AVERAGE:0.5:168:241" "RRA:AVERAGE:0.5:672:241"
"RRA:AVERAGE:0.5:5760:371"'
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index f4e1693..0618dbd 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -52,7 +52,6 @@
# This class sets up Elasticsearch in a WMF-specific way.
#
class role::elasticsearch inherits role::elasticsearch::config {
-
# Install
class { '::elasticsearch':
multicast_group => $multicast_group,
diff --git a/manifests/site.pp b/manifests/site.pp
index 05ecc38..ee0ffd6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2716,6 +2716,9 @@
}
node /^testsearch100[1-3]\.eqiad\.wmnet/ {
+ # ganglia cluster name.
+ $cluster = 'elasticsearch'
+
include accounts::manybubbles,
accounts::demon,
groups::wikidev
@@ -2728,6 +2731,9 @@
}
node /^elastic10(0[1-9]|1[0-2])\.eqiad\.wmnet/ {
+ # ganglia cluster name.
+ $cluster = 'elasticsearch'
+
include accounts::manybubbles,
accounts::demon,
groups::wikidev
--
To view, visit https://gerrit.wikimedia.org/r/96550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie967b3b97a35d5b9486cd89863894bda06466601
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
