From 183589eb1e1b8d7cfb4116e35ad19dfd4c8f867c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 20 Feb 2024 17:59:32 -0500 Subject: [PATCH 1/4] Update dockercomposefiles with additional release notes changes in 2.12.0 release Signed-off-by: Peter Zhu --- .../dockercomposefiles/docker-compose-1.x.yml | 14 ++++++------- .../dockercomposefiles/docker-compose-2.x.yml | 20 +++++++++---------- .../opensearch-release-notes-2.12.0.md | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) mode change 100755 => 100644 docker/release/dockercomposefiles/docker-compose-1.x.yml diff --git a/docker/release/dockercomposefiles/docker-compose-1.x.yml b/docker/release/dockercomposefiles/docker-compose-1.x.yml old mode 100755 new mode 100644 index 0190af85fe..e4c7719ebc --- a/docker/release/dockercomposefiles/docker-compose-1.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-1.x.yml @@ -9,20 +9,20 @@ services: - node.name=opensearch-node1 - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_master_nodes=opensearch-node1,opensearch-node2 - - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM ulimits: memlock: soft: -1 hard: -1 nofile: - soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems hard: 65536 volumes: - opensearch-data1:/usr/share/opensearch/data ports: - 9200:9200 - - 9600:9600 # required for Performance Analyzer + - 9600:9600 # required for Performance Analyzer networks: - opensearch-net opensearch-node2: @@ -34,7 +34,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_master_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" ulimits: memlock: soft: -1 @@ -52,9 +52,9 @@ services: ports: - 5601:5601 expose: - - '5601' + - "5601" environment: - OPENSEARCH_HOSTS: https://opensearch-node1:9200 + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: - opensearch-net diff --git a/docker/release/dockercomposefiles/docker-compose-2.x.yml b/docker/release/dockercomposefiles/docker-compose-2.x.yml index da8b7e9575..6de48c82d4 100644 --- a/docker/release/dockercomposefiles/docker-compose-2.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-2.x.yml @@ -2,32 +2,32 @@ version: '3' services: opensearch-node1: - image: opensearchproject/opensearch:2 + image: opensearchproject/opensearch:latest container_name: opensearch-node1 environment: - cluster.name=opensearch-cluster - node.name=opensearch-node1 - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher ulimits: memlock: soft: -1 hard: -1 nofile: - soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems hard: 65536 volumes: - opensearch-data1:/usr/share/opensearch/data ports: - 9200:9200 - - 9600:9600 # required for Performance Analyzer + - 9600:9600 # required for Performance Analyzer networks: - opensearch-net opensearch-node2: - image: opensearchproject/opensearch:2 + image: opensearchproject/opensearch:latest container_name: opensearch-node2 environment: - cluster.name=opensearch-cluster @@ -35,7 +35,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} ulimits: memlock: @@ -49,14 +49,14 @@ services: networks: - opensearch-net opensearch-dashboards: - image: opensearchproject/opensearch-dashboards:2 + image: opensearchproject/opensearch-dashboards:latest container_name: opensearch-dashboards ports: - 5601:5601 expose: - - '5601' + - "5601" environment: - OPENSEARCH_HOSTS: https://opensearch-node1:9200 + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: - opensearch-net diff --git a/release-notes/opensearch-release-notes-2.12.0.md b/release-notes/opensearch-release-notes-2.12.0.md index e1544c0ead..f7db8ccc87 100644 --- a/release-notes/opensearch-release-notes-2.12.0.md +++ b/release-notes/opensearch-release-notes-2.12.0.md @@ -8,7 +8,6 @@ OpenSearch 2.12.0 includes a number of features designed to increase performance

DEPRECATION NOTICE

From 3df1ede871558224e8f9710be39d4a75c595ba2c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 20 Feb 2024 18:02:41 -0500 Subject: [PATCH 2/4] Tweak version Signed-off-by: Peter Zhu --- docker/release/dockercomposefiles/docker-compose-2.x.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/release/dockercomposefiles/docker-compose-2.x.yml b/docker/release/dockercomposefiles/docker-compose-2.x.yml index 6de48c82d4..24ef086723 100644 --- a/docker/release/dockercomposefiles/docker-compose-2.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-2.x.yml @@ -2,7 +2,7 @@ version: '3' services: opensearch-node1: - image: opensearchproject/opensearch:latest + image: opensearchproject/opensearch:2 container_name: opensearch-node1 environment: - cluster.name=opensearch-cluster @@ -27,7 +27,7 @@ services: networks: - opensearch-net opensearch-node2: - image: opensearchproject/opensearch:latest + image: opensearchproject/opensearch:2 container_name: opensearch-node2 environment: - cluster.name=opensearch-cluster @@ -49,7 +49,7 @@ services: networks: - opensearch-net opensearch-dashboards: - image: opensearchproject/opensearch-dashboards:latest + image: opensearchproject/opensearch-dashboards:2 container_name: opensearch-dashboards ports: - 5601:5601 From 46df79ccbc443ac341636abf34f1cb282320138f Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 20 Feb 2024 18:05:00 -0500 Subject: [PATCH 3/4] Adding default dockercomposefile Signed-off-by: Peter Zhu --- .../docker-compose-default.x.yml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 docker/release/dockercomposefiles/docker-compose-default.x.yml diff --git a/docker/release/dockercomposefiles/docker-compose-default.x.yml b/docker/release/dockercomposefiles/docker-compose-default.x.yml new file mode 100644 index 0000000000..6de48c82d4 --- /dev/null +++ b/docker/release/dockercomposefiles/docker-compose-default.x.yml @@ -0,0 +1,68 @@ +--- +version: '3' +services: + opensearch-node1: + image: opensearchproject/opensearch:latest + container_name: opensearch-node1 + environment: + - cluster.name=opensearch-cluster + - node.name=opensearch-node1 + - discovery.seed_hosts=opensearch-node1,opensearch-node2 + - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + hard: 65536 + volumes: + - opensearch-data1:/usr/share/opensearch/data + ports: + - 9200:9200 + - 9600:9600 # required for Performance Analyzer + networks: + - opensearch-net + opensearch-node2: + image: opensearchproject/opensearch:latest + container_name: opensearch-node2 + environment: + - cluster.name=opensearch-cluster + - node.name=opensearch-node2 + - discovery.seed_hosts=opensearch-node1,opensearch-node2 + - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 + - bootstrap.memory_lock=true + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + volumes: + - opensearch-data2:/usr/share/opensearch/data + networks: + - opensearch-net + opensearch-dashboards: + image: opensearchproject/opensearch-dashboards:latest + container_name: opensearch-dashboards + ports: + - 5601:5601 + expose: + - "5601" + environment: + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' + networks: + - opensearch-net + +volumes: + opensearch-data1: + opensearch-data2: + +networks: + opensearch-net: From 3a2c3d060d9979a4ca5ac4f4a21e7a3a4c6eb1b5 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 20 Feb 2024 18:10:44 -0500 Subject: [PATCH 4/4] Correct yaml linting Signed-off-by: Peter Zhu --- .../dockercomposefiles/docker-compose-1.x.yml | 12 ++++++------ .../dockercomposefiles/docker-compose-2.x.yml | 12 ++++++------ .../dockercomposefiles/docker-compose-default.x.yml | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/release/dockercomposefiles/docker-compose-1.x.yml b/docker/release/dockercomposefiles/docker-compose-1.x.yml index e4c7719ebc..a64c5ba5a8 100644 --- a/docker/release/dockercomposefiles/docker-compose-1.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-1.x.yml @@ -9,20 +9,20 @@ services: - node.name=opensearch-node1 - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_master_nodes=opensearch-node1,opensearch-node2 - - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM ulimits: memlock: soft: -1 hard: -1 nofile: - soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems hard: 65536 volumes: - opensearch-data1:/usr/share/opensearch/data ports: - 9200:9200 - - 9600:9600 # required for Performance Analyzer + - 9600:9600 # required for Performance Analyzer networks: - opensearch-net opensearch-node2: @@ -34,7 +34,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_master_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m ulimits: memlock: soft: -1 @@ -52,7 +52,7 @@ services: ports: - 5601:5601 expose: - - "5601" + - '5601' environment: OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: diff --git a/docker/release/dockercomposefiles/docker-compose-2.x.yml b/docker/release/dockercomposefiles/docker-compose-2.x.yml index 24ef086723..fa5aae33c5 100644 --- a/docker/release/dockercomposefiles/docker-compose-2.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-2.x.yml @@ -9,21 +9,21 @@ services: - node.name=opensearch-node1 - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher ulimits: memlock: soft: -1 hard: -1 nofile: - soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems hard: 65536 volumes: - opensearch-data1:/usr/share/opensearch/data ports: - 9200:9200 - - 9600:9600 # required for Performance Analyzer + - 9600:9600 # required for Performance Analyzer networks: - opensearch-net opensearch-node2: @@ -35,7 +35,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} ulimits: memlock: @@ -54,7 +54,7 @@ services: ports: - 5601:5601 expose: - - "5601" + - '5601' environment: OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: diff --git a/docker/release/dockercomposefiles/docker-compose-default.x.yml b/docker/release/dockercomposefiles/docker-compose-default.x.yml index 6de48c82d4..9a2f35006f 100644 --- a/docker/release/dockercomposefiles/docker-compose-default.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-default.x.yml @@ -9,21 +9,21 @@ services: - node.name=opensearch-node1 - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher ulimits: memlock: soft: -1 hard: -1 nofile: - soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems hard: 65536 volumes: - opensearch-data1:/usr/share/opensearch/data ports: - 9200:9200 - - 9600:9600 # required for Performance Analyzer + - 9600:9600 # required for Performance Analyzer networks: - opensearch-net opensearch-node2: @@ -35,7 +35,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true - - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} ulimits: memlock: @@ -54,7 +54,7 @@ services: ports: - 5601:5601 expose: - - "5601" + - '5601' environment: OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: