Skip to content

Commit a00b47b

Browse files
committed
Bump dashboards observability to version 3.0.0.0-alpha1
Signed-off-by: Shenoy Pratik <[email protected]>
1 parent 535fa86 commit a00b47b

6 files changed

+38
-45
lines changed

.github/workflows/dashboards-observability-test-and-build-workflow.yml

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
21
name: Test and Build Observability Dashboards Plugin
32

43
on: [pull_request, push]
54

65
env:
76
PLUGIN_NAME: dashboards-observability
8-
OPENSEARCH_VERSION: 'main'
9-
OPENSEARCH_PLUGIN_VERSION: 3.0.0.0
7+
OPENSEARCH_DASHBOARDS_VERSION: 'main'
8+
OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1'
109

1110
jobs:
1211
Get-CI-Image-Tag:
@@ -16,7 +15,7 @@ jobs:
1615

1716
build-linux:
1817
needs: Get-CI-Image-Tag
19-
strategy:
18+
strategy:
2019
fail-fast: false
2120
runs-on: ubuntu-latest
2221
container:
@@ -31,7 +30,7 @@ jobs:
3130
uses: actions/checkout@v2
3231
with:
3332
repository: opensearch-project/OpenSearch-Dashboards
34-
ref: ${{ env.OPENSEARCH_VERSION }}
33+
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
3534
path: OpenSearch-Dashboards
3635

3736
- name: Checkout Dashboards Observability
@@ -53,11 +52,11 @@ jobs:
5352
5453
- name: Test all dashboards-observability modules
5554
run: |
56-
chown -R 1000:1000 `pwd`
57-
cd ./OpenSearch-Dashboards/
58-
su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
59-
cd plugins/dashboards-observability &&
60-
yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%"
55+
chown -R 1000:1000 `pwd`
56+
cd ./OpenSearch-Dashboards/
57+
su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
58+
cd plugins/dashboards-observability &&
59+
yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%"
6160
6261
- name: Upload coverage
6362
uses: codecov/codecov-action@v1
@@ -68,11 +67,11 @@ jobs:
6867

6968
- name: Build Artifact
7069
run: |
71-
chown -R 1000:1000 `pwd`
72-
cd ./OpenSearch-Dashboards/
73-
su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
74-
cd plugins/dashboards-observability &&
75-
yarn build && mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip"
70+
chown -R 1000:1000 `pwd`
71+
cd ./OpenSearch-Dashboards/
72+
su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
73+
cd plugins/dashboards-observability &&
74+
yarn build && mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip"
7675
7776
- name: Upload Artifact
7877
uses: actions/upload-artifact@v4
@@ -81,7 +80,7 @@ jobs:
8180
path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build
8281

8382
build-windows-macos:
84-
strategy:
83+
strategy:
8584
matrix:
8685
os: [windows-latest, macos-latest]
8786
# Since Windows is inconsistent, we want to let other OSes run on a fail

.github/workflows/ftr-e2e-dashboards-observability-test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on: [pull_request, push]
44

55
env:
66
PLUGIN_NAME: dashboards-observability
7-
OPENSEARCH_DASHBOARDS_VERSION: "main"
8-
OPENSEARCH_VERSION: "3.0.0"
9-
OPENSEARCH_PLUGIN_VERSION: "3.0.0.0"
7+
OPENSEARCH_DASHBOARDS_VERSION: 'main'
8+
OPENSEARCH_VERSION: '3.0.0-alpha1'
9+
OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1'
1010

1111
jobs:
1212
tests:
@@ -29,8 +29,8 @@ jobs:
2929
- name: Set up Java 21
3030
uses: actions/setup-java@v3
3131
with:
32-
distribution: "corretto"
33-
java-version: "21"
32+
distribution: 'corretto'
33+
java-version: '21'
3434

3535
- name: Download Job Scheduler artifact
3636
uses: suisei-cn/[email protected]
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/setup-node@v1
107107
with:
108108
node-version: ${{ steps.versions_step.outputs.node_version }}
109-
registry-url: "https://registry.npmjs.org"
109+
registry-url: 'https://registry.npmjs.org'
110110

111111
- name: Configure OpenSearch Dashboards
112112
run: |

.github/workflows/integration-tests-workflow.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on: [pull_request, push]
44

55
env:
66
PLUGIN_NAME: dashboards-observability
7-
OPENSEARCH_DASHBOARDS_VERSION: "main"
8-
OPENSEARCH_VERSION: "3.0.0"
9-
OPENSEARCH_PLUGIN_VERSION: "3.0.0.0"
7+
OPENSEARCH_DASHBOARDS_VERSION: 'main'
8+
OPENSEARCH_VERSION: '3.0.0-alpha1'
9+
OPENSEARCH_PLUGIN_VERSION: '3.0.0.0-alpha1'
1010

1111
jobs:
1212
tests:
@@ -42,8 +42,8 @@ jobs:
4242
- name: Set up Java 21
4343
uses: actions/setup-java@v3
4444
with:
45-
distribution: "corretto"
46-
java-version: "21"
45+
distribution: 'corretto'
46+
java-version: '21'
4747

4848
- name: Download Job Scheduler artifact
4949
uses: suisei-cn/[email protected]
@@ -119,7 +119,7 @@ jobs:
119119
uses: actions/setup-node@v1
120120
with:
121121
node-version: ${{ steps.versions_step.outputs.node_version }}
122-
registry-url: "https://registry.npmjs.org"
122+
registry-url: 'https://registry.npmjs.org'
123123

124124
- name: Configure OpenSearch Dashboards
125125
run: |

.github/workflows/verify-binary-install.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
22

33
on: [push, pull_request]
44
env:
5-
OPENSEARCH_VERSION: '3.0.0'
5+
OPENSEARCH_VERSION: '3.0.0-alpha1'
66
CI: 1
77
# avoid warnings like "tput: No value for $TERM and no -T specified"
88
TERM: xterm
@@ -16,7 +16,7 @@ jobs:
1616
os: [ubuntu-latest]
1717
# TODO: add windows support when OSD core is stable on windows
1818
runs-on: ${{ matrix.os }}
19-
steps:
19+
steps:
2020
- name: Checkout Branch
2121
uses: actions/checkout@v3
2222

@@ -42,15 +42,14 @@ jobs:
4242
built_plugin_name: observabilityDashboards
4343
built_plugin_suffix: ${{ env.OPENSEARCH_VERSION }}
4444
install_zip: true
45-
45+
4646
- name: Start the binary
47-
run: |
47+
run: |
4848
nohup ./bin/opensearch-dashboards &
4949
working-directory: ${{ steps.setup-dashboards.outputs.dashboards-binary-directory }}
5050
shell: bash
5151

52-
- name: Health check
52+
- name: Health check
5353
run: |
5454
timeout 300 bash -c 'while [[ "$(curl http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
5555
shell: bash
56-

opensearch_dashboards.json

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "observabilityDashboards",
3-
"version": "3.0.0.0",
3+
"version": "3.0.0.0-alpha1",
44
"opensearchDashboardsVersion": "3.0.0",
55
"server": true,
66
"ui": true,
@@ -26,12 +26,7 @@
2626
"dataSource",
2727
"dataSourceManagement"
2828
],
29-
"configPath": [
30-
"observability"
31-
],
29+
"configPath": ["observability"],
3230
"supportedOSDataSourceVersions": ">=2.9.0",
33-
"requiredOSDataSourcePlugins": [
34-
"opensearch-sql",
35-
"opensearch-observability"
36-
]
37-
}
31+
"requiredOSDataSourcePlugins": ["opensearch-sql", "opensearch-observability"]
32+
}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "observability-dashboards",
3-
"version": "3.0.0.0",
3+
"version": "3.0.0.0-alpha1",
44
"main": "index.ts",
55
"license": "Apache-2.0",
66
"scripts": {
@@ -82,4 +82,4 @@
8282
"node_modules/*",
8383
"target/*"
8484
]
85-
}
85+
}

0 commit comments

Comments
 (0)