Merge pull request #13 from flavienbwk/r/2.9.0

Upgraded to 2.9.0 and limited logs size
flavienbwk · Sep 18, 2023 · 4e87fa5 · 4e87fa5
2 parents b4f35e1 + 9999f69
commit 4e87fa5
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # OpenSearch - Docker - Compose
 
-![OpenSearch version](https://img.shields.io/badge/OpenSearch%20version-2.6.0-blue)
+![OpenSearch version](https://img.shields.io/badge/OpenSearch%20version-2.9.0-blue)
 
 Dockerized cluster architecture for OpenSearch with compose.
 

diff --git a/docker-compose.hot-warm.yml b/docker-compose.hot-warm.yml
@@ -29,6 +29,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data0:/usr/share/opensearch/data"
@@ -67,6 +72,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data1:/usr/share/opensearch/data"
@@ -102,6 +112,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data2:/usr/share/opensearch/data"
@@ -136,6 +151,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data3:/usr/share/opensearch/data"
@@ -170,6 +190,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data4:/usr/share/opensearch/data"
@@ -202,6 +227,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data5:/usr/share/opensearch/data"
@@ -234,6 +264,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data6:/usr/share/opensearch/data"
@@ -266,6 +301,11 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data7:/usr/share/opensearch/data"
@@ -274,14 +314,19 @@ services:
   kibana:
     restart: always
     image: opensearchproject/opensearch-dashboards:2.2.0
-    ports:
-      - 5601:5601
-    volumes:
-      - "./certs:/usr/share/opensearch-dashboards/config/certificates:ro"
-      - "./opensearch-dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     environment:
       OPENSEARCH_HOSTS: '["https://os00:9200","https://os01:9200","https://os02:9200","https://os03:9200","https://os04:9200","https://os05:9200","https://os06:9200","https://os07:9200"]' # must be a string with no spaces when specified as an environment variable
       DISABLE_INSTALL_DEMO_CONFIG: "true"
+    volumes:
+      - "./certs:/usr/share/opensearch-dashboards/config/certificates:ro"
+      - "./opensearch-dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml"
+    ports:
+      - 5601:5601
 
 volumes:
   os-data0:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   os01:
     restart: always
-    image: opensearchproject/opensearch:2.6.0
+    image: opensearchproject/opensearch:2.9.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os01
@@ -26,13 +26,18 @@ services:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data1:/usr/share/opensearch/data"
       - "./certs:/usr/share/opensearch/config/certificates:ro"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     ports:
       - 9200:9200
       - 9600:9600 # required for Performance Analyzer
 
   os02:
     restart: always
-    image: opensearchproject/opensearch:2.6.0
+    image: opensearchproject/opensearch:2.9.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os02
@@ -50,14 +55,19 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data2:/usr/share/opensearch/data"
       - "./certs:/usr/share/opensearch/config/certificates:ro"
 
   os03:
     restart: always
-    image: opensearchproject/opensearch:2.6.0
+    image: opensearchproject/opensearch:2.9.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os03
@@ -75,22 +85,32 @@ services:
       memlock:
         soft: -1
         hard: -1
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
     volumes:
       - "./opensearch.yml:/usr/share/opensearch/config/opensearch.yml"
       - "os-data3:/usr/share/opensearch/data"
       - "./certs:/usr/share/opensearch/config/certificates:ro"
-  
+
   kibana:
     restart: always
-    image: opensearchproject/opensearch-dashboards:2.6.0
-    ports:
-      - 5601:5601
-    volumes:
-      - "./certs:/usr/share/opensearch-dashboards/config/certificates:ro"
-      - "./opensearch-dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml"
+    image: opensearchproject/opensearch-dashboards:2.9.0
     environment:
       OPENSEARCH_HOSTS: '["https://os01:9200","https://os02:9200","https://os03:9200"]' # must be a string with no spaces when specified as an environment variable
       DISABLE_INSTALL_DEMO_CONFIG: "true"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
+    volumes:
+      - "./certs:/usr/share/opensearch-dashboards/config/certificates:ro"
+      - "./opensearch-dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml"
+    ports:
+      - 5601:5601
 
 volumes:
   os-data1: