Skip to content

Commit d35a515

Browse files
authored
Merge branch 'main' into tracesCustomDataGrid
2 parents 1e55ae1 + ea6e420 commit d35a515

8 files changed

+26
-24
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727

2828
steps:
2929
- name: Checkout OpenSearch Dashboards
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131
with:
3232
repository: opensearch-project/OpenSearch-Dashboards
3333
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
3434
path: OpenSearch-Dashboards
3535

3636
- name: Checkout Dashboards Observability
37-
uses: actions/checkout@v2
37+
uses: actions/checkout@v4
3838
with:
3939
path: OpenSearch-Dashboards/plugins/dashboards-observability
4040

@@ -94,7 +94,7 @@ jobs:
9494
run: git config --system core.longpaths true
9595

9696
- name: Checkout OpenSearch Dashboards
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v4
9898
with:
9999
repository: opensearch-project/OpenSearch-Dashboards
100100
ref: ${{ env.OPENSEARCH_VERSION }}
@@ -118,7 +118,7 @@ jobs:
118118
- run: yarn -v
119119

120120
- name: Checkout Dashboards Observability
121-
uses: actions/checkout@v2
121+
uses: actions/checkout@v4
122122
with:
123123
path: OpenSearch-Dashboards/plugins/dashboards-observability
124124

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
shell: bash
8585

8686
- name: Checkout OpenSearch Dashboards
87-
uses: actions/checkout@v2
87+
uses: actions/checkout@v4
8888
with:
8989
repository: opensearch-project/Opensearch-Dashboards
9090
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
9191
path: OpenSearch-Dashboards
9292

9393
- name: Checkout dashboards observability
94-
uses: actions/checkout@v2
94+
uses: actions/checkout@v4
9595
with:
9696
path: OpenSearch-Dashboards/plugins/dashboards-observability
9797

@@ -166,7 +166,7 @@ jobs:
166166
path: OpenSearch-Dashboards/dashboard.log
167167

168168
- name: Checkout Dashboards Functioanl Test Repo
169-
uses: actions/checkout@v2
169+
uses: actions/checkout@v4
170170
with:
171171
path: opensearch-dashboards-functional-test
172172
repository: opensearch-project/opensearch-dashboards-functional-test

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ jobs:
9797
shell: bash
9898

9999
- name: Checkout OpenSearch Dashboards
100-
uses: actions/checkout@v2
100+
uses: actions/checkout@v4
101101
with:
102102
repository: opensearch-project/Opensearch-Dashboards
103103
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
104104
path: OpenSearch-Dashboards
105105

106106
- name: Checkout dashboards observability
107-
uses: actions/checkout@v2
107+
uses: actions/checkout@v4
108108
with:
109109
path: OpenSearch-Dashboards/plugins/dashboards-observability
110110

.github/workflows/link-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: lychee Link Checker
1515
id: lychee
1616
uses: lycheeverse/lychee-action@master

.github/workflows/lint.yml

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

55
env:
66
PLUGIN_NAME: dashboards-observability
7-
OPENSEARCH_DASHBOARDS_VERSION: "main"
7+
OPENSEARCH_DASHBOARDS_VERSION: 'main'
88

99
jobs:
1010
build:
@@ -13,14 +13,14 @@ jobs:
1313

1414
steps:
1515
- name: Checkout OpenSearch Dashboards
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
with:
1818
repository: opensearch-project/Opensearch-Dashboards
1919
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
2020
path: OpenSearch-Dashboards
2121

2222
- name: Checkout dashboards observability
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424
with:
2525
path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
2626
fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/setup-node@v1
3737
with:
3838
node-version: ${{ steps.versions_step.outputs.node_version }}
39-
registry-url: "https://registry.npmjs.org"
39+
registry-url: 'https://registry.npmjs.org'
4040

4141
- name: Install correct yarn version for OpenSearch Dashboards
4242
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: Checkout Branch
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Set env
2424
run: |

package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@
7575
"braces": "^3.0.3",
7676
"ws": "^8.18.0",
7777
"**/eslint/cross-spawn": "^7.0.5",
78-
"nanoid": "3.3.8"
78+
"nanoid": "3.3.8",
79+
"serialize-javascript": "^6.0.2",
80+
"@babel/runtime": "^7.26.10"
7981
},
8082
"eslintIgnore": [
8183
"common/query_manager/antlr/output/*",

yarn.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
chalk "^2.4.2"
5050
js-tokens "^4.0.0"
5151

52-
"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2":
53-
version "7.22.15"
54-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8"
55-
integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==
52+
"@babel/runtime@^7.1.2", "@babel/runtime@^7.26.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2":
53+
version "7.26.10"
54+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2"
55+
integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==
5656
dependencies:
5757
regenerator-runtime "^0.14.0"
5858

@@ -2908,10 +2908,10 @@ semver@^6.1.2, semver@^7.5.2, semver@^7.5.3:
29082908
dependencies:
29092909
lru-cache "^6.0.0"
29102910

2911-
2912-
version "6.0.0"
2913-
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
2914-
integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
2911+
[email protected], serialize-javascript@^6.0.2:
2912+
version "6.0.2"
2913+
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
2914+
integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
29152915
dependencies:
29162916
randombytes "^2.1.0"
29172917

0 commit comments

Comments
 (0)