From f7c33072f27b1d842a40ad8dbb609d6756ba1bb1 Mon Sep 17 00:00:00 2001 From: Chenyang Ji Date: Tue, 16 Jul 2024 16:35:19 -0700 Subject: [PATCH 1/2] Onboard query-insights in 2.16 Signed-off-by: Chenyang Ji --- .github/workflows/os-increment-plugin-versions.yml | 1 + .github/workflows/os-release-issues.yml | 1 + manifests/2.16.0/opensearch-2.16.0.yml | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml index f96111322e..befd95f637 100644 --- a/.github/workflows/os-increment-plugin-versions.yml +++ b/.github/workflows/os-increment-plugin-versions.yml @@ -48,6 +48,7 @@ jobs: - {repo: custom-codecs} - {repo: flow-framework} - {repo: skills} + - {repo: query-insights} branch: - 1.x - '1.3' diff --git a/.github/workflows/os-release-issues.yml b/.github/workflows/os-release-issues.yml index c2e4f27bd2..47f5dd403f 100644 --- a/.github/workflows/os-release-issues.yml +++ b/.github/workflows/os-release-issues.yml @@ -60,6 +60,7 @@ jobs: - {repo: custom-codecs} - {repo: flow-framework} - {repo: skills} + - {repo: query-insights} release_version: ${{ fromJson(needs.list-manifest-versions.outputs.matrix) }} steps: - name: GitHub App token diff --git a/manifests/2.16.0/opensearch-2.16.0.yml b/manifests/2.16.0/opensearch-2.16.0.yml index 82c623b96c..f090a2f357 100644 --- a/manifests/2.16.0/opensearch-2.16.0.yml +++ b/manifests/2.16.0/opensearch-2.16.0.yml @@ -183,3 +183,9 @@ components: - anomaly-detection - sql - ml-commons + - name: query-insights + repository: https://github.com/opensearch-project/query-insights.git + ref: 2.x + platforms: + - linux + - windows From 210fced5e1410f0f0cbf8b4dc8cf8c0ea7a3d175 Mon Sep 17 00:00:00 2001 From: Siddhant Deshmukh Date: Wed, 17 Jul 2024 16:34:05 -0700 Subject: [PATCH 2/2] Add query-insights to whitesource file Signed-off-by: Siddhant Deshmukh --- tools/vulnerability-scan/wss-scan.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vulnerability-scan/wss-scan.config b/tools/vulnerability-scan/wss-scan.config index d0addc17b3..846b780c9e 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 +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