Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188702
Change subject: WIP: Begin converting Elasticsearch configuration to use hiera
......................................................................
WIP: Begin converting Elasticsearch configuration to use hiera
Change-Id: I3998769c4ac5b135237ee1e15173c4d48b13180b
---
A hieradata/common/elasticsearch/config.yaml
M manifests/role/elasticsearch.pp
2 files changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/188702/1
diff --git a/hieradata/common/elasticsearch/config.yaml
b/hieradata/common/elasticsearch/config.yaml
new file mode 100644
index 0000000..11140fa
--- /dev/null
+++ b/hieradata/common/elasticsearch/config.yaml
@@ -0,0 +1,12 @@
+minimum_master_nodes: 2
+# We should be able to run "OK" with 10 servers.
+recover_after_time: '20m'
+# But it'd save time if we just waited for all of them to come back so
+# lets give them plenty of time to restart.
+recover_after_nodes: 10
+heap_memory: '30G'
+expected_nodes: 31
+# Production can get a lot of use out of the filter cache.
+filter_cache_size: '20%'
+bulk_thread_pool_capacity: 1000
+bulk_thread_pool_executors: 6
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index b1588c6..59a00f8 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -75,15 +75,7 @@
'elastic1013' => true,
default => false,
}
- $minimum_master_nodes = 2
$cluster_name = "production-search-${::site}"
- $heap_memory = '30G'
- $expected_nodes = 16
- # We should be able to run "OK" with 10 servers.
- $recover_after_nodes = 10
- # But it'd save time if we just waited for all of them to come back so
- # lets give them plenty of time to restart.
- $recover_after_time = '20m'
$rack = $::hostname ? {
/^elastic100[0-6]/ => 'A3',
/^elastic10(0[7-9]|1[0-2])/ => 'C5',
@@ -110,11 +102,6 @@
# to work properly. This will keep elasticsearch from starting
# if these plugins are not available.
$plugins_mandatory = ['experimental highlighter', 'analysis-icu']
-
- # Production can get a lot of use out of the filter cache.
- $filter_cache_size = '20%'
- $bulk_thread_pool_capacity = 1000
- $bulk_thread_pool_executors = 6
# only in production, no ganglia in beta
$use_ganglia = true
--
To view, visit https://gerrit.wikimedia.org/r/188702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3998769c4ac5b135237ee1e15173c4d48b13180b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
