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 9f5c95bc93fffb1cf4aeec5c9ae44af5ff96959c..d32ce2bfcbcd870519dcac6d964b53c324d0332f 100644 (file)
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -1,4 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 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