From 6771e2af622ba6a70f2468f250cae0c62a2d42cb Mon Sep 17 00:00:00 2001
From: Arnie <i@cechis.cz>
Date: Thu, 30 May 2019 08:42:58 +0200
Subject: [PATCH] Update elasticsearch configuration

---
 elastic-search-5/elasticsearch.yml | 7 +++++++
 elastic-search-5/run.sh            | 2 +-
 elastic-search-6/Dockerfile        | 2 --
 elastic-search-6/elasticsearch.yml | 7 +++++++
 elastic-search-6/run.sh            | 4 ++--
 elastic-search/Dockerfile          | 2 --
 elastic-search/elasticsearch.yml   | 7 +++++++
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/elastic-search-5/elasticsearch.yml b/elastic-search-5/elasticsearch.yml
index 59d01ae..cdc8e6c 100644
--- a/elastic-search-5/elasticsearch.yml
+++ b/elastic-search-5/elasticsearch.yml
@@ -10,3 +10,10 @@ xpack:
                 roles:
                   - role1
                   - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95
diff --git a/elastic-search-5/run.sh b/elastic-search-5/run.sh
index 9e6f469..c852bf9 100755
--- a/elastic-search-5/run.sh
+++ b/elastic-search-5/run.sh
@@ -5,7 +5,7 @@ SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 IMAGE_NAME="elasticsearch"
 IMAGE_VERSION="5.6.16"
 
-SERVICE_NAME=ys-elastic-search
+SERVICE_NAME=ys-elastic-search-5
 
 
 source ${SCRIPT_PATH}/../common.shinc
diff --git a/elastic-search-6/Dockerfile b/elastic-search-6/Dockerfile
index 55351a4..a876a13 100644
--- a/elastic-search-6/Dockerfile
+++ b/elastic-search-6/Dockerfile
@@ -2,8 +2,6 @@ ARG IMAGE_NAME
 ARG IMAGE_VERSION
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN bin/elasticsearch-plugin install x-pack
-
 ADD elasticsearch.yml /usr/share/elasticsearch/config/
 
 USER root
diff --git a/elastic-search-6/elasticsearch.yml b/elastic-search-6/elasticsearch.yml
index 59d01ae..cdc8e6c 100644
--- a/elastic-search-6/elasticsearch.yml
+++ b/elastic-search-6/elasticsearch.yml
@@ -10,3 +10,10 @@ xpack:
                 roles:
                   - role1
                   - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95
diff --git a/elastic-search-6/run.sh b/elastic-search-6/run.sh
index 1a19068..df4629a 100755
--- a/elastic-search-6/run.sh
+++ b/elastic-search-6/run.sh
@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="elasticsearch"
-IMAGE_VERSION="6.4.3"
+IMAGE_VERSION="6.5.4"
 
 SERVICE_NAME=ys-elastic-search-6
 
@@ -17,7 +17,7 @@ source ${SCRIPT_PATH}/../common.shinc
 DOMAIN_NAME="elastic6.loc"
 
 RELEASE_NAME="yoursystemcz/elasticsearch"
-RELEASE_VERSION="6.4.3"
+RELEASE_VERSION="6.5.4"
 
 PERSISTENT_VOLUME="ys-elastic-6"
 
diff --git a/elastic-search/Dockerfile b/elastic-search/Dockerfile
index 55351a4..a876a13 100644
--- a/elastic-search/Dockerfile
+++ b/elastic-search/Dockerfile
@@ -2,8 +2,6 @@ ARG IMAGE_NAME
 ARG IMAGE_VERSION
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN bin/elasticsearch-plugin install x-pack
-
 ADD elasticsearch.yml /usr/share/elasticsearch/config/
 
 USER root
diff --git a/elastic-search/elasticsearch.yml b/elastic-search/elasticsearch.yml
index 59d01ae..cdc8e6c 100644
--- a/elastic-search/elasticsearch.yml
+++ b/elastic-search/elasticsearch.yml
@@ -10,3 +10,10 @@ xpack:
                 roles:
                   - role1
                   - role2
+cluster:
+    routing:
+        allocation:
+            disk:
+                watermark:
+                    low: 0.90
+                    high: 0.95