From: Tom Hughes Date: Mon, 1 Oct 2018 21:43:34 +0000 (+0100) Subject: Don't configure a flood_stage watermark for elasticsearch 5.x X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b9c59de0157901ad4572bf312b7c2f57fbadd10a Don't configure a flood_stage watermark for elasticsearch 5.x --- diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb index fa459e7ef..d32ce2bfc 100644 --- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb +++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb @@ -3,7 +3,9 @@ cluster.name: <%= node[:elasticsearch][:cluster][:name] %> cluster.routing.allocation.disk.watermark.low: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] %> cluster.routing.allocation.disk.watermark.high: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] %> +<% if node[:elasticsearch][:version] >= "6" -%> cluster.routing.allocation.disk.watermark.flood_stage: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:flood_stage] %> +<% end -%> network.host: 127.0.0.1 path.data: <%= node[:elasticsearch][:path][:data] %> path.logs: /var/log/elasticsearch