Skip to content

Commit a9137b6

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into fix/new-category
2 parents 6dd147e + 000f39b commit a9137b6

3,927 files changed

Lines changed: 28734 additions & 19064 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/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ disabled:
5555
- x-pack/test/load/config.ts
5656
- x-pack/test/plugin_api_perf/config.js
5757
- x-pack/test/screenshot_creation/config.ts
58+
- x-pack/test/fleet_packages/config.ts
5859

5960
defaultQueue: 'n2-4-spot'
6061
enabled:

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -332,34 +332,36 @@ export async function pickTestGroupRunOrder() {
332332
{ title: string; expectedDurationMin: number; names: string[] }
333333
> = {};
334334

335-
for (const { groups, queue } of getRunGroups(bk, types, FUNCTIONAL_TYPE)) {
336-
for (const group of groups) {
337-
if (!group.names.length) {
338-
continue;
335+
if (ftrConfigsByQueue.size) {
336+
for (const { groups, queue } of getRunGroups(bk, types, FUNCTIONAL_TYPE)) {
337+
for (const group of groups) {
338+
if (!group.names.length) {
339+
continue;
340+
}
341+
342+
const key = `ftr_configs_${configCounter++}`;
343+
let sortBy;
344+
let title;
345+
if (group.names.length === 1) {
346+
title = group.names[0];
347+
sortBy = title;
348+
} else {
349+
sortBy = ++groupCounter;
350+
title = `FTR Configs #${sortBy}`;
351+
}
352+
353+
functionalGroups.push({
354+
title,
355+
key,
356+
sortBy,
357+
queue: queue ?? defaultQueue,
358+
});
359+
ftrRunOrder[key] = {
360+
title,
361+
expectedDurationMin: group.durationMin,
362+
names: group.names,
363+
};
339364
}
340-
341-
const key = `ftr_configs_${configCounter++}`;
342-
let sortBy;
343-
let title;
344-
if (group.names.length === 1) {
345-
title = group.names[0];
346-
sortBy = title;
347-
} else {
348-
sortBy = ++groupCounter;
349-
title = `FTR Configs #${sortBy}`;
350-
}
351-
352-
functionalGroups.push({
353-
title,
354-
key,
355-
sortBy,
356-
queue: queue ?? defaultQueue,
357-
});
358-
ftrRunOrder[key] = {
359-
title,
360-
expectedDurationMin: group.durationMin,
361-
names: group.names,
362-
};
363365
}
364366
}
365367

‎.buildkite/pipelines/artifacts.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,17 @@ steps:
5151
- exit_status: '*'
5252
limit: 1
5353

54-
- command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
54+
- command: KIBANA_DOCKER_CONTEXT=ubi8 .buildkite/scripts/steps/artifacts/docker_context.sh
55+
label: 'Docker Context Verification'
56+
agents:
57+
queue: n2-2
58+
timeout_in_minutes: 30
59+
retry:
60+
automatic:
61+
- exit_status: '*'
62+
limit: 1
63+
64+
- command: KIBANA_DOCKER_CONTEXT=ubi9 .buildkite/scripts/steps/artifacts/docker_context.sh
5565
label: 'Docker Context Verification'
5666
agents:
5767
queue: n2-2

‎.buildkite/pipelines/docker_context.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ steps:
7979
- command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
8080
label: 'Build Webpack Bundle Analyzer reports'
8181
agents:
82-
queue: c2-4
82+
queue: c2-16
8383
key: webpack_bundle_analyzer
8484
timeout_in_minutes: 60

‎.buildkite/scripts/steps/artifacts/docker_context.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ if [[ "$KIBANA_DOCKER_CONTEXT" == "default" ]]; then
1919
DOCKER_CONTEXT_FILE="kibana-$FULL_VERSION-docker-build-context.tar.gz"
2020
elif [[ "$KIBANA_DOCKER_CONTEXT" == "cloud" ]]; then
2121
DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
22-
elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi" ]]; then
22+
elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi8" ]]; then
2323
DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
24+
elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi9" ]]; then
25+
DOCKER_CONTEXT_FILE="kibana-ubi9-$FULL_VERSION-docker-build-context.tar.gz"
2426
fi
2527

2628
tar -xf "target/$DOCKER_CONTEXT_FILE" -C "$DOCKER_BUILD_FOLDER"

‎.buildkite/scripts/steps/fleet/install_all_packages.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
set -euo pipefail
44

5-
source .buildkite/scripts/common/util.sh
6-
7-
.buildkite/scripts/bootstrap.sh
5+
source .buildkite/scripts/steps/functional/common.sh
86

97
echo '--- Installing all packages'
10-
cd x-pack/plugins/fleet
11-
node scripts/install_all_packages
8+
9+
checks-reporter-with-killswitch "Fleet packages Tests" \
10+
node scripts/functional_tests \
11+
--debug --bail \
12+
--config x-pack/test/fleet_packages/config.ts

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=16.14.2
4+
ARG NODE_VERSION=16.16.0
55

66
FROM node:${NODE_VERSION} AS base
77

‎.eslintrc.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,14 @@ module.exports = {
12111211
'vars-on-top': 'error',
12121212
'@typescript-eslint/no-duplicate-imports': ['error'],
12131213
},
1214+
overrides: [
1215+
{
1216+
files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
1217+
rules: {
1218+
'@typescript-eslint/consistent-type-imports': 'error',
1219+
},
1220+
},
1221+
],
12141222
},
12151223
{
12161224
files: ['x-pack/plugins/cases/public/**/*.{js,mjs,ts,tsx}'],
@@ -1632,6 +1640,7 @@ module.exports = {
16321640
'prefer-arrow-callback': 'error',
16331641
'no-unused-vars': 'off',
16341642
'react/prop-types': 'off',
1643+
'@typescript-eslint/consistent-type-imports': 'error',
16351644
'@typescript-eslint/explicit-module-boundary-types': 'off',
16361645
},
16371646
},

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
/examples/search_examples/ @elastic/kibana-app-services
5858
/packages/kbn-datemath/ @elastic/kibana-app-services
5959
/packages/kbn-interpreter/ @elastic/kibana-app-services
60+
/packages/kbn-monaco/ @elastic/kibana-app-services
6061
/packages/kbn-react-field/ @elastic/kibana-app-services
6162
/packages/kbn-es-query/ @elastic/kibana-app-services
6263
/packages/kbn-field-types/ @elastic/kibana-app-services
@@ -348,7 +349,6 @@
348349
/x-pack/test/security_functional/ @elastic/kibana-security
349350
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
350351
/x-pack/test/saved_object_api_integration/ @elastic/kibana-security
351-
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
352352
/examples/preboot_example/ @elastic/kibana-security @elastic/kibana-core
353353
#CC# /x-pack/plugins/security/ @elastic/kibana-security
354354

@@ -394,7 +394,6 @@
394394
/x-pack/plugins/watcher/ @elastic/platform-deployment-management
395395
/x-pack/plugins/ingest_pipelines/ @elastic/platform-deployment-management
396396
/packages/kbn-ace/ @elastic/platform-deployment-management
397-
/packages/kbn-monaco/ @elastic/platform-deployment-management
398397
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/platform-deployment-management
399398

400399
# Security Solution

0 commit comments

Comments
 (0)