From 9254ee83a7f20e7736dc97bcec5d88718d0d56a3 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Mon, 28 Oct 2024 19:34:58 -0700 Subject: [PATCH 1/5] Remove SA dashboards from 3.0 manifest Signed-off-by: Sayali Gaikawad --- jenkins/integ-test-notification.jenkinsfile | 2 -- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/jenkins/integ-test-notification.jenkinsfile b/jenkins/integ-test-notification.jenkinsfile index b2120f3fbc..90375a0ce0 100644 --- a/jenkins/integ-test-notification.jenkinsfile +++ b/jenkins/integ-test-notification.jenkinsfile @@ -30,9 +30,7 @@ pipeline { parameterizedCron(''' H */6 * * * %INPUT_MANIFEST=2.19.0/opensearch-2.19.0.yml H */6 * * * %INPUT_MANIFEST=2.18.0/opensearch-2.18.0.yml - H */6 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml H */6 * * * %INPUT_MANIFEST=2.18.0/opensearch-dashboards-2.18.0.yml - H */6 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml ''') } parameters { 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 9fcf4df6f9..522ce4bd01 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -54,7 +54,4 @@ components: ref: main - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git - ref: main - - name: securityAnalyticsDashboards - repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git - ref: main + ref: main \ No newline at end of file From da3788989ebaa9ae3ec409df389fbdafc501487c Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Mon, 28 Oct 2024 19:47:45 -0700 Subject: [PATCH 2/5] Add new line Signed-off-by: Sayali Gaikawad --- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 522ce4bd01..13f09672f5 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -54,4 +54,4 @@ components: ref: main - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git - ref: main \ No newline at end of file + ref: main From c1c7cece3a925c202c7760bfe5d63de968147b95 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 29 Oct 2024 10:51:54 -0700 Subject: [PATCH 3/5] Comment Signed-off-by: Sayali Gaikawad --- 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 13f09672f5..ca223890a1 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -55,3 +55,6 @@ components: - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git ref: main + # - name: securityAnalyticsDashboards + # repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git + # ref: main From 8fabf389cb5216355d3bb5acd3e5e8a33b387b0a Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 29 Oct 2024 10:52:48 -0700 Subject: [PATCH 4/5] Comment Signed-off-by: Sayali Gaikawad --- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 1 + 1 file changed, 1 insertion(+) 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 ca223890a1..71b0949d43 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,7 @@ components: - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.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 # ref: main From 92c46db2da436a4196060e9138a4842fa21742a4 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Tue, 29 Oct 2024 11:07:54 -0700 Subject: [PATCH 5/5] fix Signed-off-by: Sayali Gaikawad --- manifests/3.0.0/opensearch-dashboards-3.0.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 71b0949d43..582da367e2 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -55,7 +55,7 @@ components: - name: alertingDashboards repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git ref: main - # Commenting SA until https://github.com/opensearch-project/security-analytics-dashboards-plugin/issues/1185 is resolved + # 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 # ref: main