Skip to content

Commit 38d1f65

Browse files
szwarckonradszwarckonrad
authored
Merge branch '9.2' into backport/9.2/pr-246019
2 parents a84513a + ee0a4fd commit 38d1f65

276 files changed

Lines changed: 6024 additions & 1964 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/scout_ci_config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ plugins:
1010
- observability_onboarding
1111
- painless_lab
1212
- security_solution
13-
- streams_app
1413
- slo
14+
- spaces
15+
- streams_app
1516
disabled:
1617

1718
packages:

‎.buildkite/scripts/steps/test/scout_test_run_builder.sh‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,23 @@ buildkite-agent artifact upload "scout_playwright_configs.json"
1717

1818
echo '--- Running Scout API Integration Tests'
1919
node scripts/scout.js run-tests \
20-
--serverless=security \
20+
--stateful \
2121
--config src/platform/packages/shared/kbn-scout/test/scout/api/playwright.config.ts \
2222
--kibana-install-dir "$KIBANA_BUILD_LOCATION"
2323

24-
echo '--- Running Scout EUI Helpers Tests'
25-
SCOUT_TARGET_TYPE='local' SCOUT_TARGET_MODE='serverless=security' \
26-
"${KIBANA_DIR:-$(pwd)}/node_modules/.bin/playwright" test \
27-
--project local \
28-
--grep @svlSecurity \
29-
--config src/platform/packages/shared/kbn-scout/test/scout/ui/playwright.config.ts
24+
echo '--- Checking EUI Website Availability'
25+
eui_check_exit=0
26+
ts-node src/platform/packages/shared/kbn-scout/test/scout/scripts/check_eui_availability.ts || eui_check_exit=$?
27+
if [ "$eui_check_exit" -eq 0 ]; then
28+
echo '--- Running Scout EUI Helpers Tests'
29+
SCOUT_TARGET_TYPE='local' SCOUT_TARGET_MODE='serverless=security' \
30+
"${KIBANA_DIR:-$(pwd)}/node_modules/.bin/playwright" test \
31+
--project local \
32+
--grep @svlSecurity \
33+
--config src/platform/packages/shared/kbn-scout/test/scout/ui/playwright.config.ts
34+
else
35+
echo 'EUI website is not available - skipping EUI Helpers Tests'
36+
fi
3037

3138
source .buildkite/scripts/steps/test/scout_upload_report_events.sh
3239

‎.eslintrc.js‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,8 +1588,7 @@ module.exports = {
15881588
{
15891589
files: [
15901590
'src/platform/packages/shared/kbn-scout/src/playwright/**/*.ts',
1591-
'x-pack/solutions/observability/packages/kbn-scout-oblt/src/playwright/**/*.ts',
1592-
'x-pack/solutions/security/packages/kbn-scout-security/src/playwright/**/*.ts',
1591+
'x-pack/solutions/**/packages/kbn-scout-*/src/playwright/**/*.ts',
15931592
'src/platform/{packages,plugins}/**/test/{scout,scout_*}/**/*.ts',
15941593
'x-pack/platform/{packages,plugins}/**/test/{scout,scout_*}/**/*.ts',
15951594
'x-pack/solutions/**/{packages,plugins}/**/test/{scout,scout_*}/**/*.ts',
@@ -2388,6 +2387,12 @@ module.exports = {
23882387
message: "Platform tests should import only from '@kbn/scout'.",
23892388
},
23902389
],
2390+
patterns: [
2391+
{
2392+
group: ['@kbn/scout-*', '@playwright/test/**', 'playwright/**'],
2393+
message: "Platform tests should import only from '@kbn/scout'.",
2394+
},
2395+
],
23912396
},
23922397
],
23932398
},
@@ -2426,6 +2431,36 @@ module.exports = {
24262431
],
24272432
},
24282433
},
2434+
{
2435+
files: ['x-pack/solutions/search/plugins/**/test/{scout,scout_*}/**/*.ts'],
2436+
rules: {
2437+
'no-restricted-imports': [
2438+
'error',
2439+
{
2440+
paths: [
2441+
{
2442+
name: '@kbn/scout',
2443+
message: "Search solution tests should import from '@kbn/scout-search' instead.",
2444+
},
2445+
{
2446+
name: '@playwright/test',
2447+
message: "Search solution tests should import from '@kbn/scout-search' instead.",
2448+
},
2449+
{
2450+
name: 'playwright',
2451+
message: "Search solution tests should import from '@kbn/scout-search' instead.",
2452+
},
2453+
],
2454+
patterns: [
2455+
{
2456+
group: ['@kbn/scout/**', '@playwright/test/**', 'playwright/**'],
2457+
message: "Search solution tests should import from '@kbn/scout-search' instead.",
2458+
},
2459+
],
2460+
},
2461+
],
2462+
},
2463+
},
24292464
{
24302465
files: ['x-pack/solutions/security/plugins/**/test/{scout,scout_*}/**/*.ts'],
24312466
rules: {
@@ -2469,6 +2504,7 @@ module.exports = {
24692504
],
24702505
rules: {
24712506
'@kbn/eslint/scout_no_describe_configure': 'error',
2507+
'@kbn/eslint/scout_test_file_naming': 'error',
24722508
'@kbn/eslint/scout_require_api_client_in_api_test': 'error',
24732509
'@kbn/eslint/require_include_in_check_a11y': 'warn',
24742510
},

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ src/core/packages/elasticsearch/client-server-mocks @elastic/kibana-core
169169
src/core/packages/elasticsearch/server @elastic/kibana-core
170170
src/core/packages/elasticsearch/server-internal @elastic/kibana-core
171171
src/core/packages/elasticsearch/server-mocks @elastic/kibana-core
172+
src/core/packages/elasticsearch/server-utils @elastic/kibana-core
172173
src/core/packages/environment/server-internal @elastic/kibana-core
173174
src/core/packages/environment/server-mocks @elastic/kibana-core
174175
src/core/packages/execution-context/browser @elastic/kibana-core
@@ -1139,6 +1140,7 @@ x-pack/solutions/observability/plugins/uptime @elastic/obs-ux-management-team
11391140
x-pack/solutions/observability/plugins/ux @elastic/obs-ux-management-team
11401141
x-pack/solutions/observability/test
11411142
x-pack/solutions/search/packages/kbn-ipynb @elastic/search-kibana
1143+
x-pack/solutions/search/packages/kbn-scout-search @elastic/appex-qa @elastic/search-kibana
11421144
x-pack/solutions/search/packages/kbn-search-api-keys-components @elastic/search-kibana
11431145
x-pack/solutions/search/packages/kbn-search-api-keys-server @elastic/search-kibana
11441146
x-pack/solutions/search/packages/kbn-search-code-examples @elastic/search-kibana

‎.github/workflows/add-fleet-issues-to-ingest-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
add_to_ingest_project:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
18+
- uses: octokit/graphql-action@ddde8ebb2493e79f390e6449c725c21663a67505 # v3.0.2
1919
id: add_to_project
2020
if: ${{ github.event.label.name == env.FLEET_LABEL }}
2121
with:
@@ -32,7 +32,7 @@ jobs:
3232
content_id: ${{ github.event.issue.node_id }}
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.FLEET_PROJECT_TOKEN }}
35-
- uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
35+
- uses: octokit/graphql-action@ddde8ebb2493e79f390e6449c725c21663a67505 # v3.0.2
3636
id: set_fleet_ui_area
3737
if: github.event.label.name == env.FLEET_LABEL
3838
with:

‎.github/workflows/add-to-apm-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: |
1010
github.event.label.name == 'Team:apm'
1111
steps:
12-
- uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
12+
- uses: octokit/graphql-action@ddde8ebb2493e79f390e6449c725c21663a67505 # v3.0.2
1313
id: add_to_project
1414
with:
1515
query: |
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
PROJECT_ID: "PVT_kwDOAGc3Zs0VSg"
2929
GITHUB_TOKEN: ${{ secrets.APM_TECH_KIBANA_USER_TOKEN }}
30-
- uses: octokit/graphql-action@abaeca7ba4f0325d63b8de7ef943c2418d161b93 # v3.0.0
30+
- uses: octokit/graphql-action@ddde8ebb2493e79f390e6449c725c21663a67505 # v3.0.2
3131
id: label_team
3232
with:
3333
query: |

‎.github/workflows/alert-failed-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout kibana-operations
14-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1515
with:
1616
repository: 'elastic/kibana-operations'
1717
ref: main

‎.github/workflows/codeql-stats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: github.repository == 'elastic/kibana' # Hack: Do not run on forks
1212
steps:
1313
- name: Checkout kibana-operations
14-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1515
with:
1616
repository: 'elastic/kibana-operations'
1717
ref: main

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
with:
2727
ref: ${{ matrix.branch }}
2828
persist-credentials: false
@@ -71,7 +71,7 @@ jobs:
7171
if: ${{ github.repository == 'elastic/kibana' && success() }} # Hack: Do not run on forks
7272
steps:
7373
- name: Checkout kibana-operations
74-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
74+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7575
with:
7676
repository: 'elastic/kibana-operations'
7777
ref: main

‎.github/workflows/evaluate-dependency-health.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
github.event.pull_request.draft == false
2222
steps:
2323
- name: Checkout kibana-operations
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2525
with:
2626
repository: 'elastic/kibana-operations'
2727
ref: main

0 commit comments

Comments
 (0)