From 4f2e61833a68eaf6404c8962d3e5f0c2a68d2d43 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Fri, 29 Dec 2023 11:28:16 -0500 Subject: [PATCH 1/4] Update docker for default admin creds update Signed-off-by: Derek Ho --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e1df34b134..2fbbf9fb8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -627,7 +627,7 @@ services: - SPAN_STORAGE_TYPE=opensearch - ES_TAGS_AS_FIELDS_ALL=true - ES_USERNAME=admin - - ES_PASSWORD=admin + - ES_PASSWORD=myStrongPassword123! - ES_TLS_SKIP_HOST_VERIFY=true logging: *logging depends_on: @@ -732,6 +732,7 @@ services: - cluster.initial_cluster_manager_nodes=opensearch - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!" ulimits: memlock: soft: -1 From 41532a3b0a7315afce8ebc455a6b4260330bb397 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Thu, 18 Jan 2024 11:26:40 -0500 Subject: [PATCH 2/4] Add env variable Signed-off-by: Derek Ho --- .env | 1 + docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 276edcb4fb..52a7b5a744 100644 --- a/.env +++ b/.env @@ -119,6 +119,7 @@ PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT} # OpenSearch versionins OPENSEARCH_VERSION=2.11.0 +OPENSEARCH_ADMIN_PASSWORD=admin # OpenSearch Node1 OPENSEARCH_PORT=9200 diff --git a/docker-compose.yml b/docker-compose.yml index 2fbbf9fb8f..68392b97b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -627,7 +627,7 @@ services: - SPAN_STORAGE_TYPE=opensearch - ES_TAGS_AS_FIELDS_ALL=true - ES_USERNAME=admin - - ES_PASSWORD=myStrongPassword123! + - ES_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD} - ES_TLS_SKIP_HOST_VERIFY=true logging: *logging depends_on: @@ -723,7 +723,7 @@ services: # OpenSearch store - engine opensearch: - image: opensearchstaging/opensearch:${OPENSEARCH_VERSION} + image: opensearchproject/opensearch:${OPENSEARCH_VERSION} container_name: opensearch environment: - cluster.name=opensearch-cluster From 31fe560a8799b8e7a36d07ad6d61984c800cb590 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Thu, 18 Jan 2024 11:27:37 -0500 Subject: [PATCH 3/4] Add helpful comment Signed-off-by: Derek Ho --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 52a7b5a744..fef789db44 100644 --- a/.env +++ b/.env @@ -119,7 +119,7 @@ PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT} # OpenSearch versionins OPENSEARCH_VERSION=2.11.0 -OPENSEARCH_ADMIN_PASSWORD=admin +OPENSEARCH_ADMIN_PASSWORD=admin # After 2.12.0 release, this needs to be changed to the value passed in as OPENSEARCH_INITIAL_ADMIN_PASSWORD # OpenSearch Node1 OPENSEARCH_PORT=9200 From 405586b9e4bdb8f18a97ec8a4265e2857072dcc3 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Thu, 18 Jan 2024 12:50:34 -0500 Subject: [PATCH 4/4] use env variable Signed-off-by: Derek Ho --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 68392b97b0..de762752bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -732,7 +732,7 @@ services: - cluster.initial_cluster_manager_nodes=opensearch - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" - - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!" + - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD}" ulimits: memlock: soft: -1