Merge remote-tracking branch 'github/pull/699'

[chef.git] / cookbooks / elasticsearch / templates / default / elasticsearch.yml.erb

diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
index ea04ea99ace24a3ea8de811afd6954314256a83d..d32ce2bfcbcd870519dcac6d964b53c324d0332f 100644 (file)
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -3,8 +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] %>
-<% if node[:elasticsearch][:script][:disable_dynamic] -%>
-script.disable_dynamic: <%= node[:elasticsearch][:script][:disable_dynamic] -%>
-<% end -%>
+path.logs: /var/log/elasticsearch