Yuvipanda has submitted this change and it was merged. Change subject: logstash: Convert Elasticsearch on logstash100[1-3] to client ......................................................................
logstash: Convert Elasticsearch on logstash100[1-3] to client Change the configuration of the Elasticsearch instances run on logstash100[1-3] to disallow data storage or master election. These instances are only used as clients to make accessing the backing Elasticsearch cluster easier. The heap size for these Elasticsearch client nodes is also reduced and additional heap is granted to Logstash. Bug: T96814 Change-Id: Ib89ca508876affec01e99c1a103a3014bc50dee4 --- M hieradata/role/common/logstash.yaml M hieradata/role/common/logstash/elasticsearch.yaml 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index f5254a2..99fdab0 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -3,10 +3,16 @@ - logstash-roots # ES-specific +# NOTE: multicast_group and cluster_name must be kept in sync with the backend +# node config in hieradata/role/common/logstash/elasticsearch.yaml elasticsearch::auto_create_index: true elasticsearch::cluster_name: production-logstash-eqiad elasticsearch::expected_nodes: 3 -elasticsearch::heap_memory: '5G' +elasticsearch::heap_memory: '2G' +# The ES nodes that are run on the same box as Logstash+Kibana are only used +# as client nodes to communicate with the backing cluster. +elasticsearch::holds_data: false +elasticsearch::master_eligible: false elasticsearch::minimum_master_nodes: 2 elasticsearch::multicast_group: 224.2.2.6 elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins @@ -22,4 +28,4 @@ # current configuration isn't thread safe and can cause crashes or # garbled output when used with more than one thread worker. logstash::filter_workers: 1 -logstash::heap_memory_mb: 128 +logstash::heap_memory_mb: '1G' diff --git a/hieradata/role/common/logstash/elasticsearch.yaml b/hieradata/role/common/logstash/elasticsearch.yaml index d52376f..72849a7 100644 --- a/hieradata/role/common/logstash/elasticsearch.yaml +++ b/hieradata/role/common/logstash/elasticsearch.yaml @@ -4,6 +4,8 @@ - logstash-roots # ES-specific +# NOTE: multicast_group and cluster_name must be kept in sync with the backend +# node config in hieradata/role/common/logstash.yaml elasticsearch::auto_create_index: true elasticsearch::cluster_name: production-logstash-eqiad elasticsearch::expected_nodes: 3 -- To view, visit https://gerrit.wikimedia.org/r/205971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib89ca508876affec01e99c1a103a3014bc50dee4 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Gage <jger...@wikimedia.org> Gerrit-Reviewer: Manybubbles <never...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
