From 509077182c4acc62c4327c87c2df99f47fe00418 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 11:36:30 -0700 Subject: [PATCH 1/6] Bump version to 1.0.0.0 Signed-off-by: Joshua Li --- .github/workflows/release-workflow.yml | 2 +- .github/workflows/test-and-build-workflow.yml | 2 +- opensearch_dashboards.json | 4 ++-- package.json | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index ae4a05f5f..622384075 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -9,7 +9,7 @@ on: env: PLUGIN_NAME: trace-analytics-dashboards OPENSEARCH_VERSION: '1.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 98bf37739..f917d34e4 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -6,7 +6,7 @@ on: [pull_request, push] env: PLUGIN_NAME: trace-analytics-dashboards OPENSEARCH_VERSION: '1.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 6d197823b..712367867 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "traceAnalyticsDashboards", - "version": "1.0.0.0-rc1", - "opensearchDashboardsVersion": "1.0.0-rc1", + "version": "1.0.0.0", + "opensearchDashboardsVersion": "1.0.0", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/package.json b/package.json index 2b276afd0..5cf1a4c83 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "trace-analytics-dashboards", - "version": "1.0.0.0-rc1", + "version": "1.0.0.0", "opensearchDashboards": { - "version": "1.0.0-rc1", - "templateVersion": "1.0.0-rc1" + "version": "1.0.0", + "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { From 73e995fd4c0e715a796a840ee6f48b2bedbf2c8e Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 11:36:39 -0700 Subject: [PATCH 2/6] Add release notes Signed-off-by: Joshua Li --- ...arch-trace-analytics.release-notes-1.0.0.0.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md diff --git a/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md b/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md new file mode 100644 index 000000000..9ac110cf6 --- /dev/null +++ b/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md @@ -0,0 +1,16 @@ +## Version 1.0.0.0 Release Notes + +Compatible with OpenSearch 1.0.0 + +### Bug Fixes +* Bump glob-parent from 5.1.1 to 5.1.2 ([#40](https://github.com/opensearch-project/trace-analytics/pull/40)) + +### Infrastructure +* Add codecov ([#60](https://github.com/opensearch-project/trace-analytics/pull/60)) + +### Documentation +* Level up markdown contents ([#57](https://github.com/opensearch-project/trace-analytics/pull/57)) + +### Maintenance +* Bump version to 1.0.0.0 and add release notes ([#61](https://github.com/opensearch-project/trace-analytics/pull/61)) + From a0c6de117488f9cde34fb59a2b84ff0c507eea23 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 16:13:59 -0700 Subject: [PATCH 3/6] Fix codecov badge link Signed-off-by: Joshua Li --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20f4567dd..6ca939537 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Trace Analytics CI](https://github.com/opensearch-project/trace-analytics/actions/workflows/test-and-build-workflow.yml/badge.svg)](https://github.com/opensearch-project/trace-analytics/actions/workflows/test-and-build-workflow.yml) -[![codecov](https://codecov.io/gh/opensearch-project/trace-analytics/branch/main/graphs/badge.svg)](https://github.com/opensearch-project/trace-analytics) +[![codecov](https://codecov.io/gh/opensearch-project/trace-analytics/branch/main/graphs/badge.svg)](https://codecov.io/gh/opensearch-project/trace-analytics) # OpenSearch Dashboards Trace Analytics From 6e666121fb724e5c7419614302bb4a4b69d6a14d Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 14:45:40 -0700 Subject: [PATCH 4/6] Update node version Signed-off-by: Joshua Li --- .github/workflows/test-and-build-workflow.yml | 7 ++++++- package.json | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index f917d34e4..5d2851672 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -25,10 +25,15 @@ jobs: uses: actions/checkout@v1 with: path: OpenSearch-Dashboards/plugins/trace-analytics + - name: Get node and yarn versions + id: versions_step + run: | + echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '10.23.1' + node-version: ${{ steps.versions_step.outputs.node_version }} - name: Plugin Bootstrap run: | yarn osd bootstrap diff --git a/package.json b/package.json index 5cf1a4c83..ba147ab3b 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,6 @@ "eslint": "^6.8.0", "jest-dom": "^4.0.0" }, - "engines": { - "node": "10.23.1", - "yarn": "^1.21.1" - }, "resolutions": { "lodash": "^4.17.21" } From e99b000e46912389455af870e78b1de45042f4f6 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 14:45:47 -0700 Subject: [PATCH 5/6] Update release notes Signed-off-by: Joshua Li --- .../opensearch-trace-analytics.release-notes-1.0.0.0.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md b/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md index 9ac110cf6..0aebfc56c 100644 --- a/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md +++ b/release-notes/opensearch-trace-analytics.release-notes-1.0.0.0.md @@ -14,3 +14,10 @@ Compatible with OpenSearch 1.0.0 ### Maintenance * Bump version to 1.0.0.0 and add release notes ([#61](https://github.com/opensearch-project/trace-analytics/pull/61)) +## OpenSearch Migration +* Migrate trace analytics to OpenSearch Dashboards ([#1](https://github.com/opensearch-project/trace-analytics/pull/1)) +* Change nav bar to use OpenSearch ([#2](https://github.com/opensearch-project/trace-analytics/pull/2)) +* Add license headers for OpenSearch ([#3](https://github.com/opensearch-project/trace-analytics/pull/3)) +* Change plugin versions to 1.0.0 ([#4](https://github.com/opensearch-project/trace-analytics/pull/4)) +* Rebase commits from opendistro repo ([#5](https://github.com/opensearch-project/trace-analytics/pull/5)) +* Bump Version to Beta1 for OpenSearch Release ([#7](https://github.com/opensearch-project/trace-analytics/pull/7)) From f2d34702c1741aea43edae7b57b9bebf2dd22e38 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 14:48:49 -0700 Subject: [PATCH 6/6] Update CI Signed-off-by: Joshua Li Fix CI Signed-off-by: Joshua Li --- .github/workflows/test-and-build-workflow.yml | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 5d2851672..d37b5145f 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -16,40 +16,60 @@ jobs: steps: - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: - repository: opensearch-project/Opensearch-Dashboards + repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_VERSION }} path: OpenSearch-Dashboards - - name: Checkout Plugin - uses: actions/checkout@v1 - with: - path: OpenSearch-Dashboards/plugins/trace-analytics + - name: Get node and yarn versions id: versions_step run: | echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - - name: Setup Node + + - name: Setup node uses: actions/setup-node@v1 with: node-version: ${{ steps.versions_step.outputs.node_version }} + registry-url: 'https://registry.npmjs.org' + + - name: Install correct yarn version for OpenSearch Dashboards + run: | + npm uninstall -g yarn + echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}" + npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }} + + - name: Checkout Plugin + uses: actions/checkout@v2 + with: + path: OpenSearch-Dashboards/plugins/trace-analytics + - name: Plugin Bootstrap run: | + cd OpenSearch-Dashboards/plugins/trace-analytics yarn osd bootstrap + - name: Test run: | + cd OpenSearch-Dashboards/plugins/trace-analytics yarn test --coverage + - name: Upload coverage uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} + direcotry: ./OpenSearch-Dashboards/plugins/trace-analytics + - name: Build Artifact run: | + cd OpenSearch-Dashboards/plugins/trace-analytics yarn build mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip + - name: Upload Artifact uses: actions/upload-artifact@v1 with: name: trace-analytics - path: ./build + path: ./OpenSearch-Dashboards/plugins/trace-analytics/build +