From 46d3622ee44c3f229d3738b6f41af56bc65cdf3e Mon Sep 17 00:00:00 2001 From: Joshua Date: Tue, 4 May 2021 10:43:07 -0700 Subject: [PATCH 1/3] Change opendistro to opensearch in email template (#31) Signed-off-by: Joshua Li --- .../notification_content_template/email_content_template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/utils/notification/notification_content_template/email_content_template.html b/server/routes/utils/notification/notification_content_template/email_content_template.html index 58fd532c..37624fcd 100644 --- a/server/routes/utils/notification/notification_content_template/email_content_template.html +++ b/server/routes/utils/notification/notification_content_template/email_content_template.html @@ -460,8 +460,8 @@
-

© 2019–2020 Amazon Web Services, Inc. or its affiliates. All rights reserved.

-

Powered by Open Distro for Elasticsearch.

+

© 2019–2021 Amazon Web Services, Inc. or its affiliates. All rights reserved.

+

Powered by OpenSearch.
From e1d0ba74bb446c9bb689e8e9378053f8c12f71df Mon Sep 17 00:00:00 2001 From: David Cui Date: Wed, 5 May 2021 15:46:18 -0700 Subject: [PATCH 2/3] Fix case-sensitivity for chromium in workflow and osd version header in context menu (#35) Signed-off-by: David Cui --- .../dashboards-reports-test-and-build-workflow.yml | 14 +++++++------- public/components/context_menu/context_menu.js | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index bbbb24cd..ec13dc13 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -57,29 +57,29 @@ jobs: yarn build cd build - mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + mkdir -p ./{linux-x64,linux-arm64,windows-x64}/opensearch-dashboards/${{ env.PLUGIN_NAME }} cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd linux-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip - unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-linux-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. cd linux-arm64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip - unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-linux-arm64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. cd windows-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-windows-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. diff --git a/public/components/context_menu/context_menu.js b/public/components/context_menu/context_menu.js index 32c7d37f..9465a6b2 100644 --- a/public/components/context_menu/context_menu.js +++ b/public/components/context_menu/context_menu.js @@ -126,7 +126,7 @@ const generateInContextReport = async ( { headers: { 'Content-Type': 'application/json', - 'osd-version': '1.0.0', + 'osd-version': '1.0.0-beta1', accept: '*/*', 'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6', pragma: 'no-cache', @@ -340,7 +340,7 @@ async function getTenantInfoIfExists() { const res = await fetch(`../api/v1/multitenancy/tenant`, { headers: { 'Content-Type': 'application/json', - 'osd-version': '1.0.0', + 'osd-version': '1.0.0-beta1', accept: '*/*', 'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6', pragma: 'no-cache', From a8c8b4b3556c8d5b3eaa5974f831cf0454201b77 Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Fri, 7 May 2021 12:00:45 -0700 Subject: [PATCH 3/3] Update issue template with multiple labels Signed-off-by: Vacha Shah --- .github/ISSUE_TEMPLATE/bug_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md index 8fae24db..8af6ebb5 100644 --- a/.github/ISSUE_TEMPLATE/bug_template.md +++ b/.github/ISSUE_TEMPLATE/bug_template.md @@ -2,7 +2,7 @@ name: 🐛 Bug report about: Create a report to help us improve title: "[BUG]" -labels: bug +labels: 'bug, untriaged, Beta' assignees: '' ---