From bbf18ff0c57fcd5b29c2a2a756c36cf69bcebd34 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 13 Jan 2025 14:49:44 -0500 Subject: [PATCH 1/6] Add query insights to 2.19 release manifest Signed-off-by: Derek Ho --- manifests/2.19.0/opensearch-dashboards-2.19.0.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml index fc04d280f7..3cbf7f57ce 100644 --- a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml +++ b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml @@ -58,3 +58,6 @@ components: - name: flowFrameworkDashboards repository: https://github.com/opensearch-project/dashboards-flow-framework.git ref: 2.x + - name: queryInsightsDashboards + repository: https://github.com/opensearch-project/query-insights.git + ref: main # TODO: change this to 2.x when cut From f5f6a3a8033f2d011064733e4357f75242ec72cf Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 13 Jan 2025 14:51:09 -0500 Subject: [PATCH 2/6] Add to 3.0.0 manifest Signed-off-by: Derek Ho --- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml index 582da367e2..f01d8533a1 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -55,6 +55,9 @@ components: - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git ref: main + - name: queryInsightsDashboards + repository: https://github.com/opensearch-project/query-insights.git + ref: main # Commenting SA until https://github.com/opensearch-project/security-analytics-dashboards-plugin/issues/1185 is resolved # - name: securityAnalyticsDashboards # repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git From 05a5c371b69bf250ea11efd376cc9a56afb6f67b Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 13 Jan 2025 14:54:00 -0500 Subject: [PATCH 3/6] Add backend plugin to 3.0.0 release Signed-off-by: Derek Ho --- manifests/3.0.0/opensearch-3.0.0.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 534a1ac565..3d3b4a86c8 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -244,3 +244,10 @@ components: platforms: - linux - windows + - name: query-insights + repository: https://github.com/opensearch-project/query-insights.git + ref: main + platforms: + - linux + - windows + From 90136c76db7869a0d5c8aaa52e34da9dfc987d02 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 13 Jan 2025 14:54:46 -0500 Subject: [PATCH 4/6] Remove line Signed-off-by: Derek Ho --- manifests/3.0.0/opensearch-3.0.0.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 3d3b4a86c8..676998b407 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -250,4 +250,3 @@ components: platforms: - linux - windows - From a449443ec8085bf78d061bc3b4c6710f6c38469b Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 13 Jan 2025 15:01:18 -0500 Subject: [PATCH 5/6] Fixup Signed-off-by: Derek Ho --- manifests/2.19.0/opensearch-dashboards-2.19.0.yml | 2 +- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 2 +- tools/vulnerability-scan/wss-scan.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml index 3cbf7f57ce..3adfce494d 100644 --- a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml +++ b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml @@ -59,5 +59,5 @@ components: repository: https://github.com/opensearch-project/dashboards-flow-framework.git ref: 2.x - name: queryInsightsDashboards - repository: https://github.com/opensearch-project/query-insights.git + repository: https://github.com/opensearch-project/query-insights-dashboards.git ref: main # TODO: change this to 2.x when cut diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml index f01d8533a1..1e7391b6ea 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -56,7 +56,7 @@ components: repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git ref: main - name: queryInsightsDashboards - repository: https://github.com/opensearch-project/query-insights.git + repository: https://github.com/opensearch-project/query-insights-dashboards.git ref: main # Commenting SA until https://github.com/opensearch-project/security-analytics-dashboards-plugin/issues/1185 is resolved # - name: securityAnalyticsDashboards diff --git a/tools/vulnerability-scan/wss-scan.config b/tools/vulnerability-scan/wss-scan.config index 02cc817242..6ce7b795e5 100644 --- a/tools/vulnerability-scan/wss-scan.config +++ b/tools/vulnerability-scan/wss-scan.config @@ -1,3 +1,3 @@ baseDirPath=$(pwd) gitBasePath=https://github.com/opensearch-project/ -gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app,user-behavior-insights,technical-steering,opensearch-remote-metadata-sdk +gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,query-insights-dashboards,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app,user-behavior-insights,technical-steering,opensearch-remote-metadata-sdk From a81acc5e9cc59b41026ac2a5bebe8c9db0adbef0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Fri, 17 Jan 2025 10:36:17 -0500 Subject: [PATCH 6/6] remove todo Signed-off-by: Derek Ho --- manifests/2.19.0/opensearch-dashboards-2.19.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml index 3adfce494d..08de379621 100644 --- a/manifests/2.19.0/opensearch-dashboards-2.19.0.yml +++ b/manifests/2.19.0/opensearch-dashboards-2.19.0.yml @@ -60,4 +60,4 @@ components: ref: 2.x - name: queryInsightsDashboards repository: https://github.com/opensearch-project/query-insights-dashboards.git - ref: main # TODO: change this to 2.x when cut + ref: 2.x