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.

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

Bump dashboards observability to version 3.0.0.0-alpha1 #2364

Merged
merged 1 commit into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -16,7 +15,7 @@ jobs:

build-linux:
needs: Get-CI-Image-Tag
strategy:
strategy:
fail-fast: false
runs-on: ubuntu-latest
container:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ftr-e2e-dashboards-observability-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/[email protected]
Expand Down Expand Up @@ -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: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/integration-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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: |
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/verify-binary-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

13 changes: 4 additions & 9 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -26,12 +26,7 @@
"dataSource",
"dataSourceManagement"
],
"configPath": [
"observability"
],
"configPath": ["observability"],
"supportedOSDataSourceVersions": ">=2.9.0",
"requiredOSDataSourcePlugins": [
"opensearch-sql",
"opensearch-observability"
]
}
"requiredOSDataSourcePlugins": ["opensearch-sql", "opensearch-observability"]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -82,4 +82,4 @@
"node_modules/*",
"target/*"
]
}
}
Loading