From 15639458644993a98702f398045ac8005e3ff023 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Oct 2018 19:02:55 +0100
Subject: [PATCH] Update elasticsearch configuraiton for 6.x

---
 cookbooks/elasticsearch/attributes/default.rb                | 2 +-
 .../elasticsearch/templates/default/elasticsearch.yml.erb    | 5 ++---
 roles/foundation.rb                                          | 3 ---
 roles/ironbelly.rb                                           | 3 ++-
 roles/wiki.rb                                                | 3 ---
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index 45d59a2b5..a2a643412 100644
--- a/cookbooks/elasticsearch/attributes/default.rb
+++ b/cookbooks/elasticsearch/attributes/default.rb
@@ -1,7 +1,7 @@
 default[:elasticsearch][:version] = "1.7"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] = "85%"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] = "90%"
-default[:elasticsearch][:script][:disable_dynamic] = true
+default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:flood_stage] = "95%"
 default[:elasticsearch][:path][:data] = "/var/lib/elasticsearch"
 
 default[:apt][:sources] |= ["elasticsearch#{node[:elasticsearch][:version]}"]
diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
index ea04ea99a..fa459e7ef 100644
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -3,8 +3,7 @@
 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] %>
+cluster.routing.allocation.disk.watermark.flood_stage: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:flood_stage] %>
 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
diff --git a/roles/foundation.rb b/roles/foundation.rb
index 02bc8afa4..ddc26d928 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -14,9 +14,6 @@ default_attributes(
     :version => "5.x",
     :cluster => {
       :name => "foundation"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :memcached => {
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 046262d43..8032eee20 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -16,7 +16,8 @@ default_attributes(
           :disk => {
             :watermark => {
               :low => "95%",
-              :high => "98%"
+              :high => "98%",
+              :flood_stage => "99%"
             }
           }
         }
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 94f6ae3f8..845f99fe2 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -21,9 +21,6 @@ default_attributes(
     :version => "5.x",
     :cluster => {
       :name => "wiki"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :exim => {
-- 
2.43.2