Merge pull request #8 from esidate/main

Migrate to Opensearch 2.2.0
flavienbwk · Aug 26, 2022 · 32ed750 · 32ed750
2 parents a4938a4 + 0001044
commit 32ed750
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 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-1.2.4-blue)
+![OpenSearch version](https://img.shields.io/badge/OpenSearch%20version-2.2.0-blue)
 
 Dockerized cluster architecture for OpenSearch with compose.
 
@@ -35,10 +35,10 @@ docker-compose up -d
 Wait about 30 seconds and run `securityadmin` to initialize the security plugin :
 
 ```bash
-docker-compose exec os01 bash -c "chmod +x plugins/opensearch-security/tools/securityadmin.sh && bash plugins/opensearch-security/tools/securityadmin.sh -cd plugins/opensearch-security/securityconfig -icl -nhnv -cacert config/certificates/ca/ca.pem -cert config/certificates/ca/admin.pem -key config/certificates/ca/admin.key -h localhost"
+docker-compose exec os01 bash -c "chmod +x plugins/opensearch-security/tools/securityadmin.sh && bash plugins/opensearch-security/tools/securityadmin.sh -cd config/opensearch-security -icl -nhnv -cacert config/certificates/ca/ca.pem -cert config/certificates/ca/admin.pem -key config/certificates/ca/admin.key -h localhost"
 ```
 
-> Find all the configuration files in the container's `/usr/share/opensearch/plugins/opensearch-security/securityconfig` directory. You might want to [mount them as volumes](https://opendistro.github.io/for-elasticsearch-docs/docs/install/docker-security/).
+> Find all the configuration files in the container's `/usr/share/opensearch/config/opensearch-security` directory. You might want to [mount them as volumes](https://opendistro.github.io/for-elasticsearch-docs/docs/install/docker-security/).
 
 Access OpenSearch Dashboards through [https://localhost:5601](https://localhost:5601)
 
@@ -81,10 +81,10 @@ docker-compose -f docker-compose.hot-warm.yml up -d
 Wait about 60 seconds and run `securityadmin` to initialize the security plugin :
 
 ```bash
-docker-compose exec os01 bash -c "chmod +x plugins/opensearch-security/tools/securityadmin.sh && bash plugins/opensearch-security/tools/securityadmin.sh -cd plugins/opensearch-security/securityconfig -icl -nhnv -cacert config/certificates/ca/ca.pem -cert config/certificates/ca/admin.pem -key config/certificates/ca/admin.key -h localhost"
+docker-compose exec os01 bash -c "chmod +x plugins/opensearch-security/tools/securityadmin.sh && bash plugins/opensearch-security/tools/securityadmin.sh -cd config/opensearch-security -icl -nhnv -cacert config/certificates/ca/ca.pem -cert config/certificates/ca/admin.pem -key config/certificates/ca/admin.key -h localhost"
 ```
 
-> Find all the configuration files in the container's `/usr/share/opensearch/plugins/opensearch-security/securityconfig` directory. You might want to [mount them as volumes](https://opendistro.github.io/for-elasticsearch-docs/docs/install/docker-security/).
+> Find all the configuration files in the container's `/usr/share/opensearch/config/opensearch-security` directory. You might want to [mount them as volumes](https://opendistro.github.io/for-elasticsearch-docs/docs/install/docker-security/).
 
 Access OpenSearch Dashboards through [https://localhost:5601](https://localhost:5601)
 

diff --git a/docker-compose.hot-warm.yml b/docker-compose.hot-warm.yml
@@ -10,7 +10,7 @@ services:
   # Needs : heavy CPU, medium memory
   os00:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os00
@@ -48,7 +48,7 @@ services:
   # Needs : low CPU, low memory
   os01:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os01
@@ -82,7 +82,7 @@ services:
   # Needs : medium CPU, heavy memory, high-speed storage
   os02:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os02
@@ -116,7 +116,7 @@ services:
   # Needs : medium CPU, heavy memory, high-speed storage
   os03:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os03
@@ -150,7 +150,7 @@ services:
   # Needs : medium CPU, heavy memory, high-speed storage
   os04:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os04
@@ -182,7 +182,7 @@ services:
   # Needs : lower-speed CPU, heavy memory, lower-speed storage
   os05:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os05
@@ -214,7 +214,7 @@ services:
   # Needs : lower-speed CPU, heavy memory, lower-speed storage
   os06:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os06
@@ -246,7 +246,7 @@ services:
   # Needs : lower-speed CPU, heavy memory, lower-speed storage
   os07:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os07
@@ -273,7 +273,7 @@ services:
 
   kibana:
     restart: always
-    image: opensearchproject/opensearch-dashboards:1.2.0
+    image: opensearchproject/opensearch-dashboards:2.2.0
     ports:
       - 5601:5601
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   os01:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os01
@@ -32,7 +32,7 @@ services:
 
   os02:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os02
@@ -57,7 +57,7 @@ services:
 
   os03:
     restart: always
-    image: opensearchproject/opensearch:1.2.4
+    image: opensearchproject/opensearch:2.2.0
     environment:
       OPENSEARCH_JAVA_OPTS: "-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
       node.name: os03
@@ -82,7 +82,7 @@ services:
 
   kibana:
     restart: always
-    image: opensearchproject/opensearch-dashboards:1.2.0
+    image: opensearchproject/opensearch-dashboards:2.2.0
     ports:
       - 5601:5601
     volumes: