From bdc86e09c74319dca00e418a7a6569aed9179583 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Thu, 20 Oct 2022 08:50:41 -0700 Subject: [PATCH 1/4] add workbench 2.4 and add sql 3.0 Signed-off-by: Peng Huo --- manifests/2.4.0/opensearch-dashboards-2.4.0.yml | 4 ++++ manifests/3.0.0/opensearch-3.0.0.yml | 8 ++++++++ manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/manifests/2.4.0/opensearch-dashboards-2.4.0.yml b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml index 414fdde2d4..466c04600f 100644 --- a/manifests/2.4.0/opensearch-dashboards-2.4.0.yml +++ b/manifests/2.4.0/opensearch-dashboards-2.4.0.yml @@ -31,3 +31,7 @@ components: - name: anomalyDetectionDashboards repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin ref: '2.x' + - name: queryWorkbenchDashboards + repository: https://github.com/opensearch-project/sql.git + working_directory: workbench + ref: '2.x' diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 19763e835e..4b7f42ff48 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -72,3 +72,11 @@ components: checks: - gradle:properties:version - gradle:dependencies:opensearch.version + - name: sql + repository: https://github.com/opensearch-project/sql.git + ref: main + platforms: + - linux + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: opensearch-sql-plugin 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 cdd98ca524..fb92741ef3 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -16,3 +16,7 @@ components: - name: securityDashboards repository: https://github.com/opensearch-project/security-dashboards-plugin.git ref: main + - name: queryWorkbenchDashboards + repository: https://github.com/opensearch-project/sql.git + working_directory: workbench + ref: main From bf39fb3eef4dace10956b8e9d131c66cef1a5d16 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Thu, 20 Oct 2022 10:14:13 -0700 Subject: [PATCH 2/4] add sql and queryworkbench to 2.3.1 Signed-off-by: Peng Huo --- manifests/2.3.1/opensearch-2.3.1.yml | 9 +++++++++ manifests/2.3.1/opensearch-dashboards-2.3.1.yml | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/manifests/2.3.1/opensearch-2.3.1.yml b/manifests/2.3.1/opensearch-2.3.1.yml index a74d8c242d..81a221e4cf 100644 --- a/manifests/2.3.1/opensearch-2.3.1.yml +++ b/manifests/2.3.1/opensearch-2.3.1.yml @@ -64,3 +64,12 @@ components: checks: - gradle:properties:version - gradle:dependencies:opensearch.version + - name: sql + repository: https://github.com/opensearch-project/sql.git + ref: '2.3' + platforms: + - linux + - windows + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version: opensearch-sql-plugin diff --git a/manifests/2.3.1/opensearch-dashboards-2.3.1.yml b/manifests/2.3.1/opensearch-dashboards-2.3.1.yml index ff4fb685af..c4d38b75d6 100644 --- a/manifests/2.3.1/opensearch-dashboards-2.3.1.yml +++ b/manifests/2.3.1/opensearch-dashboards-2.3.1.yml @@ -10,3 +10,7 @@ components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git ref: '2.3' + - name: queryWorkbenchDashboards + repository: https://github.com/opensearch-project/sql.git + working_directory: workbench + ref: '2.3' From b187974a5c9c3adf9cf9f5155a80145f2c48ac41 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Thu, 20 Oct 2022 11:57:33 -0700 Subject: [PATCH 3/4] add windows for 3.0 Signed-off-by: Peng Huo --- manifests/3.0.0/opensearch-3.0.0.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 4b7f42ff48..fda55fa435 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -77,6 +77,7 @@ components: ref: main platforms: - linux + - windows checks: - gradle:properties:version - gradle:dependencies:opensearch.version: opensearch-sql-plugin From 1e605b971f072f8d231b8e652e2521b37ddf0f75 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Tue, 25 Oct 2022 13:18:36 -0700 Subject: [PATCH 4/4] update Signed-off-by: Peng Huo --- manifests/2.3.1/opensearch-2.3.1.yml | 2 +- manifests/3.0.0/opensearch-3.0.0.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/2.3.1/opensearch-2.3.1.yml b/manifests/2.3.1/opensearch-2.3.1.yml index 43bd15fddf..e63c047eab 100644 --- a/manifests/2.3.1/opensearch-2.3.1.yml +++ b/manifests/2.3.1/opensearch-2.3.1.yml @@ -98,7 +98,7 @@ components: ref: '2.3' platforms: - linux - - windows + - windows checks: - gradle:properties:version - gradle:dependencies:opensearch.version: opensearch-sql-plugin diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 993a23ac14..49fddc16d0 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -106,7 +106,7 @@ components: ref: main platforms: - linux - - windows + - windows checks: - gradle:properties:version - gradle:dependencies:opensearch.version: opensearch-sql-plugin