From 1e14e9f4a50c2176cdc7b556c911a194f2d02d1a Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Mon, 5 Feb 2024 11:15:14 +0800 Subject: [PATCH 1/3] feat: remove useless config Signed-off-by: SuZhou-Joe --- config/opensearch_dashboards-2.x.yml | 2 -- config/opensearch_dashboards-default.x.yml | 2 -- .../opensearch-dashboards-docker-entrypoint-2.x.sh | 1 - .../opensearch-dashboards-docker-entrypoint-default.x.sh | 1 - manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml | 1 - manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml | 1 - 6 files changed, 8 deletions(-) diff --git a/config/opensearch_dashboards-2.x.yml b/config/opensearch_dashboards-2.x.yml index 8018ae34fb..dc9aab2a5d 100644 --- a/config/opensearch_dashboards-2.x.yml +++ b/config/opensearch_dashboards-2.x.yml @@ -199,8 +199,6 @@ # 2.12 New experimental Assistant Dashboards Feature # Set the value of this setting to true to enable the assistant dashboards # assistant.chat.enabled: false -# Set the value to the root agent name you setup up manually or through flow framework -# assistant.chat.rootAgentName: "Root agent" opensearch.hosts: [https://localhost:9200] opensearch.ssl.verificationMode: none diff --git a/config/opensearch_dashboards-default.x.yml b/config/opensearch_dashboards-default.x.yml index 8018ae34fb..dc9aab2a5d 100644 --- a/config/opensearch_dashboards-default.x.yml +++ b/config/opensearch_dashboards-default.x.yml @@ -199,8 +199,6 @@ # 2.12 New experimental Assistant Dashboards Feature # Set the value of this setting to true to enable the assistant dashboards # assistant.chat.enabled: false -# Set the value to the root agent name you setup up manually or through flow framework -# assistant.chat.rootAgentName: "Root agent" opensearch.hosts: [https://localhost:9200] opensearch.ssl.verificationMode: none diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh index ab64e7e3ea..1673f42b63 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh @@ -167,7 +167,6 @@ opensearch_dashboards_vars=( data_source.audit.appender.layout.pattern ml_commons_dashboards.enabled assistant.chat.enabled - assistant.chat.rootAgentName ) function setupSecurityDashboardsPlugin { diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh index ab64e7e3ea..1673f42b63 100755 --- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh +++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh @@ -167,7 +167,6 @@ opensearch_dashboards_vars=( data_source.audit.appender.layout.pattern ml_commons_dashboards.enabled assistant.chat.enabled - assistant.chat.rootAgentName ) function setupSecurityDashboardsPlugin { diff --git a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml index 5173ffafa6..bd779fb6d2 100644 --- a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml +++ b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml @@ -87,4 +87,3 @@ components: - without-security additional-cluster-configs: assistant.chat.enabled: true - assistant.chat.rootAgentName: 'Cypress test agent' diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml index 5173ffafa6..bd779fb6d2 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml @@ -87,4 +87,3 @@ components: - without-security additional-cluster-configs: assistant.chat.enabled: true - assistant.chat.rootAgentName: 'Cypress test agent' From a2179c410951708f6b653854414cb9074f004ca3 Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Mon, 5 Feb 2024 12:10:47 +0800 Subject: [PATCH 2/3] feat: Chatbot now can only be test without-security Signed-off-by: SuZhou-Joe --- manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml | 1 - manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml index bd779fb6d2..fb50504ab2 100644 --- a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml +++ b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml @@ -83,7 +83,6 @@ components: - name: assistantDashboards integ-test: test-configs: - - with-security - without-security additional-cluster-configs: assistant.chat.enabled: true diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml index bd779fb6d2..fb50504ab2 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml @@ -83,7 +83,6 @@ components: - name: assistantDashboards integ-test: test-configs: - - with-security - without-security additional-cluster-configs: assistant.chat.enabled: true From 13f7b79fcf2b648e2983837e0c89e81b1d198832 Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Tue, 6 Feb 2024 11:42:18 +0800 Subject: [PATCH 3/3] feat: enable security Signed-off-by: SuZhou-Joe --- manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml | 1 + manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml index fb50504ab2..bd779fb6d2 100644 --- a/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml +++ b/manifests/2.12.0/opensearch-dashboards-2.12.0-test.yml @@ -83,6 +83,7 @@ components: - name: assistantDashboards integ-test: test-configs: + - with-security - without-security additional-cluster-configs: assistant.chat.enabled: true diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml index fb50504ab2..bd779fb6d2 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml @@ -83,6 +83,7 @@ components: - name: assistantDashboards integ-test: test-configs: + - with-security - without-security additional-cluster-configs: assistant.chat.enabled: true