Update elasticsearch configuraiton for 6.x

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index 45d59a2b58ac16f8fb4a169f7f33120b7379bdc7..a2a643412d568305b6c98022938f9e93653e6c7d 100644 (file)
--- 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 ea04ea99ace24a3ea8de811afd6954314256a83d..fa459e7efbb116db97788635c608546c81a07c62 100644 (file)
--- 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 02bc8afa440cbae4511c5b3fb871fc030fa271af..ddc26d928e02dbdbea34c0d8d09c3d8f1e1cf6e3 100644 (file)
--- 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 046262d4345f15839fc92ee79261582793e03f0b..8032eee20875adc8386c309fef302871379c732c 100644 (file)
--- 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 94f6ae3f8edecd13790ca2b90a2769324ce34f96..845f99fe269b6d13cdf0cfc9567486725ac40557 100644 (file)
--- 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 => {