Skip to content

Commit 2dc5efa

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into eui-v74.1.x
2 parents 58c9a1d + 59468bc commit 2dc5efa

2,606 files changed

Lines changed: 41673 additions & 103035 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.

‎.backportrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"8.7",
67
"8.6",
78
"8.5",
89
"8.4",
@@ -43,7 +44,7 @@
4344
"backport"
4445
],
4546
"branchLabelMapping": {
46-
"^v8.7.0$": "main",
47+
"^v8.8.0$": "main",
4748
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
4849
},
4950
"autoMerge": true,

‎.buildkite/ftr_configs.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ disabled:
99
- x-pack/test/functional_enterprise_search/base_config.ts
1010
- x-pack/test/localization/config.base.ts
1111
- test/server_integration/config.base.js
12+
- x-pack/test/functional_with_es_ssl/config.base.ts
1213

1314
# QA suites that are run out-of-band
1415
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -180,7 +181,10 @@ enabled:
180181
- x-pack/test/functional_embedded/config.ts
181182
- x-pack/test/functional_enterprise_search/without_host_configured.config.ts
182183
- x-pack/test/functional_execution_context/config.ts
183-
- x-pack/test/functional_with_es_ssl/config.ts
184+
- x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts
185+
- x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
186+
- x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
187+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
184188
- x-pack/test/functional/apps/advanced_settings/config.ts
185189
- x-pack/test/functional/apps/aiops/config.ts
186190
- x-pack/test/functional/apps/api_keys/config.ts

‎.buildkite/scripts/build_kibana.sh‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ export KBN_NP_PLUGINS_BUILT=true
88

99
echo "--- Build Kibana Distribution"
1010

11-
BUILD_ARGS=""
12-
is_pr_with_label "ci:build-all-platforms" && BUILD_ARGS="--all-platforms"
13-
is_pr_with_label "ci:build-example-plugins" && BUILD_ARGS="$BUILD_ARGS --example-plugins"
14-
is_pr_with_label "ci:build-docker-cross-compile" && BUILD_ARG="$BUILD_ARGS --docker-cross-compile"
15-
is_pr_with_label "ci:build-os-packages" || BUILD_ARGS="$BUILD_ARGS --skip-os-packages"
16-
is_pr_with_label "ci:build-canvas-shareable-runtime" || BUILD_ARGS="$BUILD_ARGS --skip-canvas-shareable-runtime"
17-
is_pr_with_label "ci:build-docker-contexts" || BUILD_ARGS="$BUILD_ARGS --skip-docker-contexts"
18-
node scripts/build $BUILD_ARGS
11+
BUILD_ARGS=("--with-test-plugins" "--with-example-plugins")
12+
is_pr_with_label "ci:build-all-platforms" && BUILD_ARGS+=("--all-platforms")
13+
is_pr_with_label "ci:build-docker-cross-compile" && BUILD_ARGS+=("--docker-cross-compile")
14+
is_pr_with_label "ci:build-os-packages" || BUILD_ARGS+=("--skip-os-packages")
15+
is_pr_with_label "ci:build-canvas-shareable-runtime" || BUILD_ARGS+=("--skip-canvas-shareable-runtime")
16+
is_pr_with_label "ci:build-docker-contexts" || BUILD_ARGS+=("--skip-docker-contexts")
17+
18+
echo "> node scripts/build" "${BUILD_ARGS[@]}"
19+
node scripts/build "${BUILD_ARGS[@]}"
1920

2021
if is_pr_with_label "ci:build-cloud-image"; then
2122
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euo pipefail
77
source .buildkite/scripts/steps/artifacts/env.sh
88

99
echo "--- Build Kibana artifacts"
10-
node scripts/build --all-platforms --debug --docker-cross-compile $(echo "$BUILD_ARGS")
10+
node scripts/build --all-platforms --debug --docker-cross-compile "${BUILD_ARGS[@]}"
1111

1212
echo "--- Extract default i18n messages"
1313
mkdir -p target/i18n

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ KIBANA_DOCKER_CONTEXT="${KIBANA_DOCKER_CONTEXT:="default"}"
1111

1212
echo "--- Create contexts"
1313
mkdir -p target
14-
node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact $(echo "$BUILD_ARGS")
14+
node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact "${BUILD_ARGS[@]}"
1515

1616
echo "--- Setup context"
1717
DOCKER_BUILD_FOLDER=$(mktemp -d)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ fi
1515

1616
if [[ "$RELEASE_BUILD" == "true" ]]; then
1717
FULL_VERSION="$QUALIFIER_VERSION"
18-
BUILD_ARGS="--release --version-qualifier=$VERSION_QUALIFIER"
18+
BUILD_ARGS=("--release" "--version-qualifier=$VERSION_QUALIFIER")
1919
WORKFLOW="staging"
2020
else
2121
FULL_VERSION="$QUALIFIER_VERSION-SNAPSHOT"
22-
BUILD_ARGS="--version-qualifier=$VERSION_QUALIFIER"
22+
BUILD_ARGS=("--version-qualifier=$VERSION_QUALIFIER")
2323
WORKFLOW="snapshot"
2424
fi
2525

‎.buildkite/scripts/steps/checks.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
66
.buildkite/scripts/bootstrap.sh
77

88
.buildkite/scripts/steps/checks/precommit_hook.sh
9+
.buildkite/scripts/steps/checks/packages.sh
910
.buildkite/scripts/steps/checks/ts_projects.sh
1011
.buildkite/scripts/steps/checks/packages.sh
1112
.buildkite/scripts/steps/checks/bazel_packages.sh
@@ -18,7 +19,6 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
1819
.buildkite/scripts/steps/checks/i18n.sh
1920
.buildkite/scripts/steps/checks/file_casing.sh
2021
.buildkite/scripts/steps/checks/licenses.sh
21-
.buildkite/scripts/steps/checks/plugins_with_circular_deps.sh
2222
.buildkite/scripts/steps/checks/test_projects.sh
2323
.buildkite/scripts/steps/checks/test_hardening.sh
2424
.buildkite/scripts/steps/checks/ftr_configs.sh

‎.buildkite/scripts/steps/checks/packages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
source .buildkite/scripts/common/util.sh
66

7-
echo --- Lint packages
7+
echo --- Lint Packages
88
cmd="node scripts/lint_packages"
99
if is_pr && ! is_auto_commit_disabled; then
1010
cmd="$cmd --fix"

‎.buildkite/scripts/steps/checks/plugins_with_circular_deps.sh‎

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

‎.buildkite/scripts/steps/checks/ts_projects.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
source .buildkite/scripts/common/util.sh
66

7-
echo --- Lint TS projects
7+
echo --- Lint TS Projects
88
cmd="node scripts/lint_ts_projects"
99
if is_pr && ! is_auto_commit_disabled; then
1010
cmd="$cmd --fix"

0 commit comments

Comments
 (0)