Filippo Giunchedi has submitted this change and it was merged.
Change subject: Don't enable ganglia config on beta
......................................................................
Don't enable ganglia config on beta
Change-Id: I103c9f7e76119bc0f2ec43ee3586d392a4531094
---
M manifests/role/elasticsearch.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 1f245f0..63b2563 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -21,6 +21,7 @@
$filter_cache_size = '10%'
$bulk_thread_pool_capacity = undef
$bulk_thread_pool_executors = undef
+ $use_ganglia = false
if ($::hostname =~ /^deployment-/) {
# Beta
# Has four nodes all of which can be master
@@ -104,6 +105,9 @@
$filter_cache_size = '20%'
$bulk_thread_pool_capacity = 1000
$bulk_thread_pool_executors = 6
+
+ # only in production, no ganglia in beta
+ $use_ganglia = true
}
}
@@ -151,7 +155,9 @@
statsd_host => $statsd_host,
}
- include ::elasticsearch::ganglia
+ if $use_ganglia {
+ include ::elasticsearch::ganglia
+ }
include ::elasticsearch::log::hot_threads
include ::elasticsearch::nagios::check
--
To view, visit https://gerrit.wikimedia.org/r/167744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I103c9f7e76119bc0f2ec43ee3586d392a4531094
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
