Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix case sensitive directory name for chromium zip #35

Merged
merged 22 commits into from
May 5, 2021
Merged

Fix case sensitive directory name for chromium zip #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
585239c
Update README.md
CarlMeadows Jun 16, 2020
787599e
Update README.md
CarlMeadows Jun 16, 2020
85cbd6f
Update README.md
CarlMeadows Jun 16, 2020
73ff78f
Update README.md
CarlMeadows Jun 16, 2020
04d7fd4
Update README.md
CarlMeadows Jun 16, 2020
e689377
Update README.md
CarlMeadows Jun 16, 2020
a259fe5
Update README.md
CarlMeadows Jun 16, 2020
4e42223
Update README.md
CarlMeadows Jun 16, 2020
76a8c94
Update README.md
CarlMeadows Jun 16, 2020
b5fb8cc
Update README.md
CarlMeadows Jun 16, 2020
ef25666
adding updates to design proposal for merge into master
davidcui1225 Jun 22, 2020
45ba6a0
Merge pull request #18 from davidcui-amzn/master-update-design-proposal
davidcui1225 Jun 22, 2020
c1ea86d
Update design doc and add docs/ux/ folder
zhongnansu Jul 30, 2020
7a9d931
Merge branch 'dev'
joshuali925 Nov 30, 2020
b0b335b
Merge branch 'dev' into merge-dev-to-master
joshuali925 Dec 1, 2020
852e568
Merge dev to master for ODFE 1.12.0 release (#227)
joshuali925 Dec 2, 2020
4534be9
Merge develop branch to main for OpenSearch Migration (#9)
joshuali925 Apr 19, 2021
b25955f
Merge pull request #27 from opensearch-project/dev
zhongnansu Apr 27, 2021
21c3043
Fix release notes version (#28) (#29)
zhongnansu Apr 27, 2021
9ef3b93
Change opendistro to opensearch in email template (#31)
joshuali925 May 4, 2021
21944ce
fix case sensitive directory name for chromium zip
davidcui1225 May 5, 2021
a0a282a
change osd-version in request header to 1.0.0-beta1
davidcui1225 May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/dashboards-reports-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..

Expand Down
4 changes: 2 additions & 2 deletions dashboards-reports/public/components/context_menu/context_menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions ...erver/routes/utils/notification/notification_content_template/email_content_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
<p class="apple-link">&copy; 2019–2020 Amazon Web Services, Inc. or its affiliates. All rights reserved.</p>
<p class="apple-link">Powered by <a href="https://opendistro.github.io/for-elasticsearch/">Open Distro for Elasticsearch</a>.</p>
<p class="apple-link">&copy; 2019–2021 Amazon Web Services, Inc. or its affiliates. All rights reserved.</p>
<p class="apple-link">Powered by <a href="https://opensearch.org/">OpenSearch</a>.</p>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion ...shboards-reports.release-notes-1.0.0.0.md → ...ds-reports.release-notes-1.0.0.0-beta1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## 2021-04-26 Version 1.0.0.0-beta1
Compatible with OpenSearch 1.0.0-alpha1
Compatible with OpenSearch 1.0.0-beta1

### OpenSearch Migration
* Migrate reporting frontend plugin to OpenSearch Dashboards ([#4](https://github.com/opensearch-project/dashboards-reports/pull/4))
Expand Down