From a00b47b84172406717e37c3f9a259e4e53d7bdc2 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 25 Feb 2025 12:14:53 -0800 Subject: [PATCH] Bump dashboards observability to version 3.0.0.0-alpha1 Signed-off-by: Shenoy Pratik --- ...-observability-test-and-build-workflow.yml | 31 +++++++++---------- .../ftr-e2e-dashboards-observability-test.yml | 12 +++---- .../workflows/integration-tests-workflow.yml | 12 +++---- .github/workflows/verify-binary-install.yml | 11 +++---- opensearch_dashboards.json | 13 +++----- package.json | 4 +-- 6 files changed, 38 insertions(+), 45 deletions(-) diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml index 610c15b460..466628ae27 100644 --- a/.github/workflows/dashboards-observability-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-observability-test-and-build-workflow.yml @@ -1,12 +1,11 @@ - name: Test and Build Observability Dashboards Plugin on: [pull_request, push] env: PLUGIN_NAME: dashboards-observability - OPENSEARCH_VERSION: 'main' - OPENSEARCH_PLUGIN_VERSION: 3.0.0.0 + OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1' jobs: Get-CI-Image-Tag: @@ -16,7 +15,7 @@ jobs: build-linux: needs: Get-CI-Image-Tag - strategy: + strategy: fail-fast: false runs-on: ubuntu-latest container: @@ -31,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: repository: opensearch-project/OpenSearch-Dashboards - ref: ${{ env.OPENSEARCH_VERSION }} + ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} path: OpenSearch-Dashboards - name: Checkout Dashboards Observability @@ -53,11 +52,11 @@ jobs: - name: Test all dashboards-observability modules run: | - chown -R 1000:1000 `pwd` - cd ./OpenSearch-Dashboards/ - su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && - cd plugins/dashboards-observability && - yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%" + chown -R 1000:1000 `pwd` + cd ./OpenSearch-Dashboards/ + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && + cd plugins/dashboards-observability && + yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%" - name: Upload coverage uses: codecov/codecov-action@v1 @@ -68,11 +67,11 @@ jobs: - name: Build Artifact run: | - chown -R 1000:1000 `pwd` - cd ./OpenSearch-Dashboards/ - su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && - cd plugins/dashboards-observability && - yarn build && mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip" + chown -R 1000:1000 `pwd` + cd ./OpenSearch-Dashboards/ + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && + cd plugins/dashboards-observability && + yarn build && mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip" - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -81,7 +80,7 @@ jobs: path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build build-windows-macos: - strategy: + strategy: matrix: os: [windows-latest, macos-latest] # Since Windows is inconsistent, we want to let other OSes run on a fail diff --git a/.github/workflows/ftr-e2e-dashboards-observability-test.yml b/.github/workflows/ftr-e2e-dashboards-observability-test.yml index 679190ba65..a42bbc08a8 100644 --- a/.github/workflows/ftr-e2e-dashboards-observability-test.yml +++ b/.github/workflows/ftr-e2e-dashboards-observability-test.yml @@ -4,9 +4,9 @@ on: [pull_request, push] env: PLUGIN_NAME: dashboards-observability - OPENSEARCH_DASHBOARDS_VERSION: "main" - OPENSEARCH_VERSION: "3.0.0" - OPENSEARCH_PLUGIN_VERSION: "3.0.0.0" + OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1' jobs: tests: @@ -29,8 +29,8 @@ jobs: - name: Set up Java 21 uses: actions/setup-java@v3 with: - distribution: "corretto" - java-version: "21" + distribution: 'corretto' + java-version: '21' - name: Download Job Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 @@ -106,7 +106,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ steps.versions_step.outputs.node_version }} - registry-url: "https://registry.npmjs.org" + registry-url: 'https://registry.npmjs.org' - name: Configure OpenSearch Dashboards run: | diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml index 4c8516a56e..e7288302ae 100644 --- a/.github/workflows/integration-tests-workflow.yml +++ b/.github/workflows/integration-tests-workflow.yml @@ -4,9 +4,9 @@ on: [pull_request, push] env: PLUGIN_NAME: dashboards-observability - OPENSEARCH_DASHBOARDS_VERSION: "main" - OPENSEARCH_VERSION: "3.0.0" - OPENSEARCH_PLUGIN_VERSION: "3.0.0.0" + OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1' jobs: tests: @@ -42,8 +42,8 @@ jobs: - name: Set up Java 21 uses: actions/setup-java@v3 with: - distribution: "corretto" - java-version: "21" + distribution: 'corretto' + java-version: '21' - name: Download Job Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 @@ -119,7 +119,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ steps.versions_step.outputs.node_version }} - registry-url: "https://registry.npmjs.org" + registry-url: 'https://registry.npmjs.org' - name: Configure OpenSearch Dashboards run: | diff --git a/.github/workflows/verify-binary-install.yml b/.github/workflows/verify-binary-install.yml index c4dfd459d8..9afeaaf0b3 100644 --- a/.github/workflows/verify-binary-install.yml +++ b/.github/workflows/verify-binary-install.yml @@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary' on: [push, pull_request] env: - OPENSEARCH_VERSION: '3.0.0' + OPENSEARCH_VERSION: '3.0.0-alpha1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm @@ -16,7 +16,7 @@ jobs: os: [ubuntu-latest] # TODO: add windows support when OSD core is stable on windows runs-on: ${{ matrix.os }} - steps: + steps: - name: Checkout Branch uses: actions/checkout@v3 @@ -42,15 +42,14 @@ jobs: built_plugin_name: observabilityDashboards built_plugin_suffix: ${{ env.OPENSEARCH_VERSION }} install_zip: true - + - name: Start the binary - run: | + run: | nohup ./bin/opensearch-dashboards & working-directory: ${{ steps.setup-dashboards.outputs.dashboards-binary-directory }} shell: bash - - name: Health check + - name: Health check run: | timeout 300 bash -c 'while [[ "$(curl http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done' shell: bash - diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 3cc91a3804..5113e68a7f 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "observabilityDashboards", - "version": "3.0.0.0", + "version": "3.0.0.0-alpha1", "opensearchDashboardsVersion": "3.0.0", "server": true, "ui": true, @@ -26,12 +26,7 @@ "dataSource", "dataSourceManagement" ], - "configPath": [ - "observability" - ], + "configPath": ["observability"], "supportedOSDataSourceVersions": ">=2.9.0", - "requiredOSDataSourcePlugins": [ - "opensearch-sql", - "opensearch-observability" - ] -} \ No newline at end of file + "requiredOSDataSourcePlugins": ["opensearch-sql", "opensearch-observability"] +} diff --git a/package.json b/package.json index 8f60c1d3fe..f457b78893 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "observability-dashboards", - "version": "3.0.0.0", + "version": "3.0.0.0-alpha1", "main": "index.ts", "license": "Apache-2.0", "scripts": { @@ -82,4 +82,4 @@ "node_modules/*", "target/*" ] -} \ No newline at end of file +}