From b31db1a9fce2c26c0f1a0b3ff7bdd135558d9678 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 15:33:15 -0500 Subject: [PATCH 01/14] Attempt to upgrade to jspdfv4 Signed-off-by: Craig Perkins --- .../dashboards-reports-test-and-build-workflow.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 14 ++++++++++++++ package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 74412cba..25347be6 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -45,7 +45,7 @@ jobs: command: | chown -R 1000:1000 `pwd` cd ./OpenSearch-Dashboards/ - su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && node -v && yarn -v && cd ./plugins/${{ env.PLUGIN_NAME }} && whoami && yarn osd bootstrap --single-version=loose && yarn test --coverage" @@ -60,7 +60,7 @@ jobs: 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 && + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && node -v && yarn -v && cd ./plugins/${{ env.PLUGIN_NAME }} && whoami && yarn build && mv -v ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip" diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 8ea785dc..f09955b4 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -133,6 +133,20 @@ jobs: fi working-directory: OpenSearch-Dashboards + - name: Wait for OpenSearch Dashboards to be ready + run: | + echo "Waiting for OpenSearch Dashboards to respond..." + for i in {1..60}; do + if curl -s -o /dev/null -w "%{http_code}" http://localhost:5601/api/status | grep -q "200"; then + echo "OpenSearch Dashboards is ready!" + exit 0 + fi + echo "Attempt $i: OpenSearch Dashboards not ready yet, waiting..." + sleep 5 + done + echo "OpenSearch Dashboards failed to become ready" + exit 1 + - name: Upload Dashboards logs uses: actions/upload-artifact@v4.4.0 if: failure() diff --git a/package.json b/package.json index 9e6fe7c7..7875737b 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "jquery": "^3.5.0", "jsdom": "^21.1.2", "json-2-csv": "^3.20.0", - "jspdf": "^3.0.4", +"jspdf": "^4.0.0", "react-addons-test-utils": "^15.6.2", "react-id-generator": "^3.0.1", "react-markdown": "^4.3.1", diff --git a/yarn.lock b/yarn.lock index 112ebb63..a75a471a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2514,10 +2514,10 @@ json5@^2.1.2, json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jspdf@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-3.0.4.tgz#f9ad24751eaf3c8a758eccab6f621d723d4b32b6" - integrity sha512-dc6oQ8y37rRcHn316s4ngz/nOjayLF/FFxBF4V9zamQKRqXxyiH1zagkCdktdWhtoQId5K20xt1lB90XzkB+hQ== +jspdf@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-4.0.0.tgz#3731c0a1a7d8afe28c681891236f8ad4a662d893" + integrity sha512-w12U97Z6edKd2tXDn3LzTLg7C7QLJlx0BPfM3ecjK2BckUl9/81vZ+r5gK4/3KQdhAcEZhENUxRhtgYBj75MqQ== dependencies: "@babel/runtime" "^7.28.4" fast-png "^6.2.0" From 447f34778f1c1d4f76f8cb1f411b5a24733a0966 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 15:34:57 -0500 Subject: [PATCH 02/14] Also modify cypress Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index f0f0c0f6..df5441e7 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -133,6 +133,20 @@ jobs: fi working-directory: OpenSearch-Dashboards + - name: Wait for OpenSearch Dashboards to be ready + run: | + echo "Waiting for OpenSearch Dashboards to respond..." + for i in {1..60}; do + if curl -s -o /dev/null -w "%{http_code}" http://localhost:5601/api/status | grep -q "200"; then + echo "OpenSearch Dashboards is ready!" + exit 0 + fi + echo "Attempt $i: OpenSearch Dashboards not ready yet, waiting..." + sleep 5 + done + echo "OpenSearch Dashboards failed to become ready" + exit 1 + - name: Upload Dashboards logs uses: actions/upload-artifact@v4.4.0 if: failure() From 69c129f7253882a01dd717cdebf339cc3ac79a81 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 15:42:46 -0500 Subject: [PATCH 03/14] Use corepack Signed-off-by: Craig Perkins --- .../dashboards-reports-test-and-build-workflow.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 25347be6..e26b5db4 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -45,8 +45,10 @@ jobs: command: | chown -R 1000:1000 `pwd` cd ./OpenSearch-Dashboards/ - su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && node -v && yarn -v && - cd ./plugins/${{ env.PLUGIN_NAME }} && + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && nvm use && \ + npm i -g corepack && corepack install && \ + node -v && yarn -v && \ + cd ./plugins/${{ env.PLUGIN_NAME }} && \ whoami && yarn osd bootstrap --single-version=loose && yarn test --coverage" - name: Upload coverage @@ -60,8 +62,10 @@ jobs: run: | chown -R 1000:1000 `pwd` cd ./OpenSearch-Dashboards/ - su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && node -v && yarn -v && - cd ./plugins/${{ env.PLUGIN_NAME }} && + su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm install && nvm use && \ + npm i -g corepack && corepack install && \ + node -v && yarn -v && \ + cd ./plugins/${{ env.PLUGIN_NAME }} && \ whoami && yarn build && mv -v ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip" - name: Upload Artifact For Linux From 638e8476f3be1c076370142cbe01c6bc5bbeb68a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 16:22:08 -0500 Subject: [PATCH 04/14] Attempt to fix Signed-off-by: Craig Perkins --- .../workflows/cypress-e2e-reporting-test.yml | 55 ++++++++----------- ...boards-reports-test-and-build-workflow.yml | 27 +++++++-- .github/workflows/ftr-e2e-reporting-test.yml | 55 ++++++++----------- .../workflows/verify-binary-installation.yml | 3 +- 4 files changed, 71 insertions(+), 69 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index df5441e7..5383ed63 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -7,8 +7,6 @@ env: # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm OPENSEARCH_DASHBOARDS_VERSION: 'main' - OPENSEARCH_VERSION: '3.0.0-beta1' - OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-beta1' PLUGIN_NAME: dashboards-reporting jobs: @@ -27,17 +25,39 @@ jobs: with: java-version: ${{ matrix.jdk }} + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v4 + with: + path: OpenSearch-Dashboards + repository: opensearch-project/OpenSearch-Dashboards + ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} + fetch-depth: 0 + + - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir + uses: actions/checkout@v4 + with: + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Download Job Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip + url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: job-scheduler.zip - name: Download Reports Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip + url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: reports-scheduler.zip @@ -78,19 +98,6 @@ jobs: run: cat ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/logs/opensearch.log shell: bash - - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 - with: - path: OpenSearch-Dashboards - repository: opensearch-project/OpenSearch-Dashboards - ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} - fetch-depth: 0 - - - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v4 - with: - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - id: tool-versions run: | echo "node_version=$(cat .node-version)" >> $GITHUB_OUTPUT @@ -133,20 +140,6 @@ jobs: fi working-directory: OpenSearch-Dashboards - - name: Wait for OpenSearch Dashboards to be ready - run: | - echo "Waiting for OpenSearch Dashboards to respond..." - for i in {1..60}; do - if curl -s -o /dev/null -w "%{http_code}" http://localhost:5601/api/status | grep -q "200"; then - echo "OpenSearch Dashboards is ready!" - exit 0 - fi - echo "Attempt $i: OpenSearch Dashboards not ready yet, waiting..." - sleep 5 - done - echo "OpenSearch Dashboards failed to become ready" - exit 1 - - name: Upload Dashboards logs uses: actions/upload-artifact@v4.4.0 if: failure() diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index e26b5db4..c2715a5a 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -6,7 +6,6 @@ env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards OPENSEARCH_DASHBOARDS_VERSION: 'main' - OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-beta1' jobs: Get-CI-Image-Tag: @@ -37,6 +36,15 @@ jobs: with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: OpenSearch Dashboards Plugin Bootstrap and test uses: nick-fields/retry@v1 with: @@ -66,13 +74,13 @@ jobs: npm i -g corepack && corepack install && \ node -v && yarn -v && \ cd ./plugins/${{ env.PLUGIN_NAME }} && \ - whoami && yarn build && mv -v ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip" + whoami && yarn build && mv -v ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.PLUGIN_VERSION }}.zip" - name: Upload Artifact For Linux uses: actions/upload-artifact@v4.4.0 with: name: dashboards-reports-linux - path: ./OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip + path: ./OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.PLUGIN_VERSION }}.zip windows-mac-builds: runs-on: ${{ matrix.os }} @@ -113,6 +121,15 @@ jobs: with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-fields/retry@v1 with: @@ -130,10 +147,10 @@ jobs: - name: Build Artifact run: | cd ./OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn build - mv ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-${{ runner.os }}.zip + mv ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.PLUGIN_VERSION }}-${{ runner.os }}.zip - name: Upload Artifact uses: actions/upload-artifact@v4.4.0 with: name: dashboards-reports-${{ runner.os }} - path: ./OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-${{ runner.os }}.zip + path: ./OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.PLUGIN_VERSION }}-${{ runner.os }}.zip diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index f09955b4..22cd7f8f 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -7,8 +7,6 @@ env: # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm OPENSEARCH_DASHBOARDS_VERSION: 'main' - OPENSEARCH_VERSION: '3.0.0-beta1' - OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-beta1' PLUGIN_NAME: dashboards-reporting jobs: @@ -27,17 +25,39 @@ jobs: with: java-version: ${{ matrix.jdk }} + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v4 + with: + path: OpenSearch-Dashboards + repository: opensearch-project/OpenSearch-Dashboards + ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} + fetch-depth: 0 + + - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir + uses: actions/checkout@v4 + with: + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Download Job Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip + url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: job-scheduler.zip - name: Download Reports Scheduler artifact uses: suisei-cn/actions-download-file@v1.4.0 with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip + url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: reports-scheduler.zip @@ -78,19 +98,6 @@ jobs: run: cat ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/logs/opensearch.log shell: bash - - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 - with: - path: OpenSearch-Dashboards - repository: opensearch-project/OpenSearch-Dashboards - ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} - fetch-depth: 0 - - - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v4 - with: - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - id: tool-versions run: | echo "node_version=$(cat .node-version)" >> $GITHUB_OUTPUT @@ -133,20 +140,6 @@ jobs: fi working-directory: OpenSearch-Dashboards - - name: Wait for OpenSearch Dashboards to be ready - run: | - echo "Waiting for OpenSearch Dashboards to respond..." - for i in {1..60}; do - if curl -s -o /dev/null -w "%{http_code}" http://localhost:5601/api/status | grep -q "200"; then - echo "OpenSearch Dashboards is ready!" - exit 0 - fi - echo "Attempt $i: OpenSearch Dashboards not ready yet, waiting..." - sleep 5 - done - echo "OpenSearch Dashboards failed to become ready" - exit 1 - - name: Upload Dashboards logs uses: actions/upload-artifact@v4.4.0 if: failure() diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index c69d398a..cf203a2d 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -2,7 +2,6 @@ name: 'Install Dashboards with Plugin via Binary' on: [push, pull_request] env: - OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm @@ -29,7 +28,7 @@ jobs: shell: bash - name: Run Opensearch - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v9 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} security-enabled: false From 2bb27812e05a3a4106208c72d0cb23634f3960ae Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 16:26:40 -0500 Subject: [PATCH 05/14] Add opensearchDashboards version in package.json Signed-off-by: Craig Perkins --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 7875737b..0c19ee0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,9 @@ { "name": "reports-dashboards", "version": "3.5.0.0", + "opensearchDashboards": { + "version": "3.5.0" + }, "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", From a04e1f15bbce6afffe4ed2d3e4efc90a068ce14c Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 16:55:51 -0500 Subject: [PATCH 06/14] Download from new repo and read maven-metadata.xml Signed-off-by: Craig Perkins --- .../workflows/cypress-e2e-reporting-test.yml | 72 +++++++++++++++---- .github/workflows/ftr-e2e-reporting-test.yml | 72 +++++++++++++++---- 2 files changed, 118 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 5383ed63..df969976 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -47,19 +47,65 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: job-scheduler.zip - - - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: reports-scheduler.zip + - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) + shell: bash + run: | + set -euo pipefail + + BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" + GROUP="org.opensearch.plugin" + ARTIFACT="opensearch-job-scheduler" + VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" + + GROUP_PATH="${GROUP//./\/}" + DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" + + SNAPSHOT_VALUE="$( + curl -fsSL "$DIR_URL/maven-metadata.xml" \ + | awk ' + // {in=1; ext=""; val=""; next} + in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} + in && // {gsub(/.*|<\/value>.*/,""); val=$0} + in && /<\/snapshotVersion>/ { + if (ext=="zip" && val!="") { print val; exit } + in=0 + } + ' + )" + + FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + mkdir -p plugin-artifacts + curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/job-scheduler.zip "$DIR_URL/$FILE" + + - name: Download Reports Scheduler artifact (latest snapshot from ci.opensearch.org) + shell: bash + run: | + set -euo pipefail + + BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" + GROUP="org.opensearch.plugin" + ARTIFACT="opensearch-reports-scheduler" + VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" + + GROUP_PATH="${GROUP//./\/}" + DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" + + SNAPSHOT_VALUE="$( + curl -fsSL "$DIR_URL/maven-metadata.xml" \ + | awk ' + // {in=1; ext=""; val=""; next} + in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} + in && // {gsub(/.*|<\/value>.*/,""); val=$0} + in && /<\/snapshotVersion>/ { + if (ext=="zip" && val!="") { print val; exit } + in=0 + } + ' + )" + + FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + mkdir -p plugin-artifacts + curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/reports-scheduler.zip "$DIR_URL/$FILE" - name: Download OpenSearch uses: peternied/download-file@v2 diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 22cd7f8f..a6b560c5 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -47,19 +47,65 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: job-scheduler.zip - - - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: reports-scheduler.zip + - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) + shell: bash + run: | + set -euo pipefail + + BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" + GROUP="org.opensearch.plugin" + ARTIFACT="opensearch-job-scheduler" + VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" + + GROUP_PATH="${GROUP//./\/}" + DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" + + SNAPSHOT_VALUE="$( + curl -fsSL "$DIR_URL/maven-metadata.xml" \ + | awk ' + // {in=1; ext=""; val=""; next} + in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} + in && // {gsub(/.*|<\/value>.*/,""); val=$0} + in && /<\/snapshotVersion>/ { + if (ext=="zip" && val!="") { print val; exit } + in=0 + } + ' + )" + + FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + mkdir -p plugin-artifacts + curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/job-scheduler.zip "$DIR_URL/$FILE" + + - name: Download Reports Scheduler artifact (latest snapshot from ci.opensearch.org) + shell: bash + run: | + set -euo pipefail + + BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" + GROUP="org.opensearch.plugin" + ARTIFACT="opensearch-reports-scheduler" + VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" + + GROUP_PATH="${GROUP//./\/}" + DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" + + SNAPSHOT_VALUE="$( + curl -fsSL "$DIR_URL/maven-metadata.xml" \ + | awk ' + // {in=1; ext=""; val=""; next} + in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} + in && // {gsub(/.*|<\/value>.*/,""); val=$0} + in && /<\/snapshotVersion>/ { + if (ext=="zip" && val!="") { print val; exit } + in=0 + } + ' + )" + + FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + mkdir -p plugin-artifacts + curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/reports-scheduler.zip "$DIR_URL/$FILE" - name: Download OpenSearch uses: peternied/download-file@v2 From 79912f65a2a8cea5c3488ec16e2041e4df49b76d Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 17:01:07 -0500 Subject: [PATCH 07/14] use gawk Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 9 +++++++-- .github/workflows/ftr-e2e-reporting-test.yml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index df969976..e69bfaa6 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -47,6 +47,11 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Install gawk + run: | + sudo apt-get update + sudo apt-get install -y gawk + - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) shell: bash run: | @@ -62,7 +67,7 @@ jobs: SNAPSHOT_VALUE="$( curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | awk ' + | gawk ' // {in=1; ext=""; val=""; next} in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} in && // {gsub(/.*|<\/value>.*/,""); val=$0} @@ -92,7 +97,7 @@ jobs: SNAPSHOT_VALUE="$( curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | awk ' + | gawk ' // {in=1; ext=""; val=""; next} in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} in && // {gsub(/.*|<\/value>.*/,""); val=$0} diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index a6b560c5..823e7aad 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -47,6 +47,11 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + - name: Install gawk + run: | + sudo apt-get update + sudo apt-get install -y gawk + - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) shell: bash run: | @@ -62,7 +67,7 @@ jobs: SNAPSHOT_VALUE="$( curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | awk ' + | gawk ' // {in=1; ext=""; val=""; next} in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} in && // {gsub(/.*|<\/value>.*/,""); val=$0} @@ -92,7 +97,7 @@ jobs: SNAPSHOT_VALUE="$( curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | awk ' + | gawk ' // {in=1; ext=""; val=""; next} in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} in && // {gsub(/.*|<\/value>.*/,""); val=$0} From f00f4e1b3275f1d12bb58eeb9009a55619162327 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 17:06:33 -0500 Subject: [PATCH 08/14] Use sed Signed-off-by: Craig Perkins --- .../workflows/cypress-e2e-reporting-test.yml | 65 ++++--------------- .github/workflows/ftr-e2e-reporting-test.yml | 65 ++++--------------- 2 files changed, 28 insertions(+), 102 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index e69bfaa6..c1ff5f0e 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -47,70 +47,33 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - name: Install gawk - run: | - sudo apt-get update - sudo apt-get install -y gawk - - - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) + - name: Download Job Scheduler artifact shell: bash run: | - set -euo pipefail - BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" - GROUP="org.opensearch.plugin" + GROUP_PATH="org/opensearch/plugin" ARTIFACT="opensearch-job-scheduler" VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" - - GROUP_PATH="${GROUP//./\/}" - DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" - - SNAPSHOT_VALUE="$( - curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | gawk ' - // {in=1; ext=""; val=""; next} - in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} - in && // {gsub(/.*|<\/value>.*/,""); val=$0} - in && /<\/snapshotVersion>/ { - if (ext=="zip" && val!="") { print val; exit } - in=0 - } - ' - )" - - FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + + METADATA_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/maven-metadata.xml" + SNAPSHOT_VALUE=$(curl -fsSL "$METADATA_URL" | grep -A1 'zip' | grep '' | sed 's/.*\(.*\)<\/value>.*/\1/') + mkdir -p plugin-artifacts - curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/job-scheduler.zip "$DIR_URL/$FILE" + curl -fL --retry 5 -o plugin-artifacts/job-scheduler.zip "$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/$ARTIFACT-$SNAPSHOT_VALUE.zip" - - name: Download Reports Scheduler artifact (latest snapshot from ci.opensearch.org) + - name: Download Reports Scheduler artifact shell: bash run: | - set -euo pipefail - BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" - GROUP="org.opensearch.plugin" + GROUP_PATH="org/opensearch/plugin" ARTIFACT="opensearch-reports-scheduler" VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" - - GROUP_PATH="${GROUP//./\/}" - DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" - - SNAPSHOT_VALUE="$( - curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | gawk ' - // {in=1; ext=""; val=""; next} - in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} - in && // {gsub(/.*|<\/value>.*/,""); val=$0} - in && /<\/snapshotVersion>/ { - if (ext=="zip" && val!="") { print val; exit } - in=0 - } - ' - )" - - FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + + METADATA_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/maven-metadata.xml" + SNAPSHOT_VALUE=$(curl -fsSL "$METADATA_URL" | grep -A1 'zip' | grep '' | sed 's/.*\(.*\)<\/value>.*/\1/') + mkdir -p plugin-artifacts - curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/reports-scheduler.zip "$DIR_URL/$FILE" + curl -fL --retry 5 -o plugin-artifacts/reports-scheduler.zip "$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/$ARTIFACT-$SNAPSHOT_VALUE.zip" - name: Download OpenSearch uses: peternied/download-file@v2 diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 823e7aad..30a3c8c4 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -47,70 +47,33 @@ jobs: shell: bash working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - name: Install gawk - run: | - sudo apt-get update - sudo apt-get install -y gawk - - - name: Download Job Scheduler artifact (latest snapshot from ci.opensearch.org) + - name: Download Job Scheduler artifact shell: bash run: | - set -euo pipefail - BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" - GROUP="org.opensearch.plugin" + GROUP_PATH="org/opensearch/plugin" ARTIFACT="opensearch-job-scheduler" VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" - - GROUP_PATH="${GROUP//./\/}" - DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" - - SNAPSHOT_VALUE="$( - curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | gawk ' - // {in=1; ext=""; val=""; next} - in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} - in && // {gsub(/.*|<\/value>.*/,""); val=$0} - in && /<\/snapshotVersion>/ { - if (ext=="zip" && val!="") { print val; exit } - in=0 - } - ' - )" - - FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + + METADATA_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/maven-metadata.xml" + SNAPSHOT_VALUE=$(curl -fsSL "$METADATA_URL" | grep -A1 'zip' | grep '' | sed 's/.*\(.*\)<\/value>.*/\1/') + mkdir -p plugin-artifacts - curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/job-scheduler.zip "$DIR_URL/$FILE" + curl -fL --retry 5 -o plugin-artifacts/job-scheduler.zip "$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/$ARTIFACT-$SNAPSHOT_VALUE.zip" - - name: Download Reports Scheduler artifact (latest snapshot from ci.opensearch.org) + - name: Download Reports Scheduler artifact shell: bash run: | - set -euo pipefail - BASE="https://ci.opensearch.org/ci/dbc/snapshots/maven" - GROUP="org.opensearch.plugin" + GROUP_PATH="org/opensearch/plugin" ARTIFACT="opensearch-reports-scheduler" VERSION="${{ env.PLUGIN_VERSION }}-SNAPSHOT" - - GROUP_PATH="${GROUP//./\/}" - DIR_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION" - - SNAPSHOT_VALUE="$( - curl -fsSL "$DIR_URL/maven-metadata.xml" \ - | gawk ' - // {in=1; ext=""; val=""; next} - in && // {gsub(/.*|<\/extension>.*/,""); ext=$0} - in && // {gsub(/.*|<\/value>.*/,""); val=$0} - in && /<\/snapshotVersion>/ { - if (ext=="zip" && val!="") { print val; exit } - in=0 - } - ' - )" - - FILE="$ARTIFACT-$SNAPSHOT_VALUE.zip" + + METADATA_URL="$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/maven-metadata.xml" + SNAPSHOT_VALUE=$(curl -fsSL "$METADATA_URL" | grep -A1 'zip' | grep '' | sed 's/.*\(.*\)<\/value>.*/\1/') + mkdir -p plugin-artifacts - curl -fL --retry 5 --retry-delay 2 -o plugin-artifacts/reports-scheduler.zip "$DIR_URL/$FILE" + curl -fL --retry 5 -o plugin-artifacts/reports-scheduler.zip "$BASE/$GROUP_PATH/$ARTIFACT/$VERSION/$ARTIFACT-$SNAPSHOT_VALUE.zip" - name: Download OpenSearch uses: peternied/download-file@v2 From 3a66751309f255007e93ae566be08deb84c1a3dd Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 17:10:20 -0500 Subject: [PATCH 09/14] small change Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index c1ff5f0e..da23cdd1 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -40,8 +40,8 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") - plugin_version=$(node -p "require('./package.json').version") + opensearch_version=$(jq -r '.opensearchDashboards.version' package.json) + plugin_version=$(jq -r '.version' package.json) echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 30a3c8c4..4ae15667 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -40,8 +40,8 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") - plugin_version=$(node -p "require('./package.json').version") + opensearch_version=$(jq -r '.opensearchDashboards.version' package.json) + plugin_version=$(jq -r '.version' package.json) echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash From c153684f51fca57b0b60b40074557068ca9ed31b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 19:46:16 -0500 Subject: [PATCH 10/14] disable welcome screen Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 1 + .github/workflows/ftr-e2e-reporting-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index da23cdd1..8ca508de 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -140,6 +140,7 @@ jobs: - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed run: | + echo "home.disableWelcomeScreen: true" >> config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch | tee dashboard.log & working-directory: OpenSearch-Dashboards diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 4ae15667..e642cd7e 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -140,6 +140,7 @@ jobs: - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed run: | + echo "home.disableWelcomeScreen: true" >> config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch | tee dashboard.log & working-directory: OpenSearch-Dashboards From 50c615bfc050ea2ff4a65a4d80c23d1b2fd096d1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 21:29:52 -0500 Subject: [PATCH 11/14] disableExperienceModal Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 1 + .github/workflows/ftr-e2e-reporting-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 8ca508de..c4df4bdb 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -141,6 +141,7 @@ jobs: - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed run: | echo "home.disableWelcomeScreen: true" >> config/opensearch_dashboards.yml + echo "home.disableExperienceModal: true" >> config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch | tee dashboard.log & working-directory: OpenSearch-Dashboards diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index e642cd7e..c91d5b87 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -141,6 +141,7 @@ jobs: - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed run: | echo "home.disableWelcomeScreen: true" >> config/opensearch_dashboards.yml + echo "home.disableExperienceModal: true" >> config/opensearch_dashboards.yml nohup yarn start --no-base-path --no-watch | tee dashboard.log & working-directory: OpenSearch-Dashboards From e3c1d8f37cdb1cadfd1e5c99c2bb23ab17987d26 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 21:46:06 -0500 Subject: [PATCH 12/14] Revert changes from package.json Signed-off-by: Craig Perkins --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 4 ++-- package.json | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index aa8729fb..fce900cd 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -40,8 +40,8 @@ jobs: - name: Set env run: | - opensearch_version=$(jq -r '.opensearchDashboards.version' package.json) - plugin_version=$(jq -r '.version' package.json) + opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion") + plugin_version=$(node -p "require('./opensearch_dashboards.json').version") echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 0b7d5ea1..6580d7a0 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -40,8 +40,8 @@ jobs: - name: Set env run: | - opensearch_version=$(jq -r '.opensearchDashboards.version' package.json) - plugin_version=$(jq -r '.version' package.json) + opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion") + plugin_version=$(node -p "require('./opensearch_dashboards.json').version") echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/package.json b/package.json index 43a51636..999f5895 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,6 @@ { "name": "reports-dashboards", "version": "3.5.0.0", - "opensearchDashboards": { - "version": "3.5.0" - }, "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", From 8c43b9286adbb6b48d722cbbe411564742dfe2a1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 21:58:00 -0500 Subject: [PATCH 13/14] Revert changes from package.json Signed-off-by: Craig Perkins --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index c2715a5a..0389b8d7 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -38,8 +38,8 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") - plugin_version=$(node -p "require('./package.json').version") + opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion") + plugin_version=$(node -p "require('./opensearch_dashboards.json').version") echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash From 1ff405976227b1478c25809f31bb239ca0bd9f09 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 23 Jan 2026 22:17:45 -0500 Subject: [PATCH 14/14] Revert changes from package.json Signed-off-by: Craig Perkins --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 0389b8d7..c8e51543 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -123,8 +123,8 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") - plugin_version=$(node -p "require('./package.json').version") + opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion") + plugin_version=$(node -p "require('./opensearch_dashboards.json').version") echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash