Update elasticsearch configuration

2019-05-30 08:42:58 +02:00 · 2019-05-30 08:42:58 +02:00 · 6771e2af62
commit 6771e2af62
parent 71c9b169df
7 changed files with 24 additions and 7 deletions
--- 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
--- 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
--- 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
--- 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
--- 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"

--- 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
--- 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