Skip to content

Commit 053573d

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into lens/sampling-text
2 parents 8204f22 + df43ad4 commit 053573d

4,249 files changed

Lines changed: 156988 additions & 33663 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.

‎.bazelrc.common‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ query --incompatible_no_implicit_file_export
4949
# Log configs
5050
## different from default
5151
common --color=yes
52-
common --noshow_progress
52+
common --show_progress
5353
common --show_task_finish
54-
build --noshow_loading_progress
55-
query --noshow_loading_progress
56-
build --show_result=0
54+
common --show_progress_rate_limit=10
55+
build --progress_report_interval=10
56+
build --show_loading_progress
57+
build --show_result=1
5758

5859
# Specifies desired output mode for running tests.
5960
# Valid values are

‎.buildkite/ftr_configs.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ disabled:
3333
- x-pack/test/security_solution_cypress/upgrade_config.ts
3434
- x-pack/test/security_solution_cypress/visual_config.ts
3535
- x-pack/test/threat_intelligence_cypress/visual_config.ts
36+
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
37+
- x-pack/test/threat_intelligence_cypress/config.ts
3638
- x-pack/test/functional_enterprise_search/with_host_configured.config.ts
3739
- x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
3840
- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
@@ -260,6 +262,7 @@ enabled:
260262
- x-pack/test/security_functional/saml.config.ts
261263
- x-pack/test/security_functional/insecure_cluster_warning.config.ts
262264
- x-pack/test/security_functional/user_profiles.config.ts
265+
- x-pack/test/security_functional/expired_session.config.ts
263266
- x-pack/test/security_solution_endpoint_api_int/config.ts
264267
- x-pack/test/security_solution_endpoint/config.ts
265268
- x-pack/test/session_view/basic/config.ts
@@ -279,3 +282,5 @@ enabled:
279282
- x-pack/performance/journeys/promotion_tracking_dashboard.ts
280283
- x-pack/performance/journeys/web_logs_dashboard.ts
281284
- x-pack/performance/journeys/data_stress_test_lens.ts
285+
- x-pack/performance/journeys/ecommerce_dashboard_saved_search_only.ts
286+
- x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts

‎.buildkite/pipelines/es_snapshots/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
steps:
22
- command: .buildkite/scripts/steps/es_snapshots/build.sh
33
label: Build ES Snapshot
4+
timeout_in_minutes: 30
45
agents:
56
queue: c2-8

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ steps:
3939
- exit_status: '*'
4040
limit: 1
4141

42-
- command: .buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
43-
label: Build TS Refs and Check Public API Docs
42+
- command: .buildkite/scripts/steps/on_merge_api_docs.sh
43+
label: Check Public API Docs
4444
key: public-api-docs
4545
agents:
4646
queue: n2-4-spot

‎.buildkite/pipelines/pull_request/threat_intelligence.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/functional/threat_intelligence.sh
3+
label: 'Threat Intelligence Tests'
4+
agents:
5+
queue: ci-group-6
6+
depends_on: build
7+
timeout_in_minutes: 120
8+
parallelism: 4
9+
retry:
10+
automatic:
11+
- exit_status: '*'
12+
limit: 1

‎.buildkite/pull_requests.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
],
3838
"always_require_ci_on_changed": [
3939
"^docs/developer/plugin-list.asciidoc$",
40+
"^\\.github/CODEOWNERS$",
4041
"/plugins/[^/]+/readme\\.(md|asciidoc)$"
4142
],
4243
"kibana_versions_check": true,

‎.buildkite/scripts/common/setup_bazel.sh‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,7 @@ cat <<EOF >> $KIBANA_DIR/.bazelrc
4242
EOF
4343
fi
4444

45-
if [[ "$BAZEL_CACHE_MODE" == "buildbuddy" ]]; then
46-
echo "[bazel] enabling caching with Buildbuddy"
47-
cat <<EOF >> $KIBANA_DIR/.bazelrc
48-
build --bes_results_url=https://app.buildbuddy.io/invocation/
49-
build --bes_backend=grpcs://remote.buildbuddy.io
50-
build --remote_cache=grpcs://remote.buildbuddy.io
51-
build --remote_timeout=3600
52-
build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY
53-
EOF
54-
fi
55-
56-
if [[ "$BAZEL_CACHE_MODE" != @(gcs|populate-local-gcs|buildbuddy|none|) ]]; then
57-
echo "invalid value for BAZEL_CACHE_MODE received ($BAZEL_CACHE_MODE), expected one of [gcs,populate-local-gcs|buildbuddy,none]"
45+
if [[ "$BAZEL_CACHE_MODE" != @(gcs|populate-local-gcs|none|) ]]; then
46+
echo "invalid value for BAZEL_CACHE_MODE received ($BAZEL_CACHE_MODE), expected one of [gcs,populate-local-gcs|none]"
5847
exit 1
5948
fi

‎.buildkite/scripts/lifecycle/pre_command.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ export SYNTHETICS_REMOTE_KIBANA_URL
145145
export TEST_FAILURES_ES_PASSWORD
146146
}
147147

148-
KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
149-
export KIBANA_BUILDBUDDY_CI_API_KEY
150-
151148
BAZEL_LOCAL_DEV_CACHE_CREDENTIALS_FILE="$HOME/.kibana-ci-bazel-remote-cache-local-dev.json"
152149
export BAZEL_LOCAL_DEV_CACHE_CREDENTIALS_FILE
153150
retry 5 5 vault read -field=service_account_json secret/kibana-issues/dev/kibana-ci-bazel-remote-cache-local-dev > "$BAZEL_LOCAL_DEV_CACHE_CREDENTIALS_FILE"

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ const uploadPipeline = (pipelineContent: string | object) => {
6868
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
6969
}
7070

71+
if (
72+
(await doAnyChangesMatch([
73+
/^x-pack\/plugins\/threat_intelligence/,
74+
/^x-pack\/test\/threat_intelligence_cypress/,
75+
/^x-pack\/plugins\/security_solution\/public\/threat_intelligence/,
76+
])) ||
77+
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
78+
) {
79+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/threat_intelligence.yml'));
80+
}
81+
7182
if (
7283
(await doAnyChangesMatch([
7384
/^src\/plugins\/data/,

‎.buildkite/scripts/steps/functional/performance_playwright.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,14 @@ while read -r journey; do
119119
done
120120
done <<< "$journeys"
121121

122+
echo "--- Upload journey step screenshots"
123+
JOURNEY_SCREENSHOTS_DIR="${KIBANA_DIR}/data/journey_screenshots"
124+
if [ -d "$JOURNEY_SCREENSHOTS_DIR" ]; then
125+
cd "$JOURNEY_SCREENSHOTS_DIR"
126+
buildkite-agent artifact upload "**/*fullscreen*.png"
127+
cd "$KIBANA_DIR"
128+
fi
129+
122130
echo "--- report/record failed journeys"
123131
if [ "${failedJourneys[*]}" != "" ]; then
124132
buildkite-agent meta-data set "failed-journeys" "$(printf "%s\n" "${failedJourneys[@]}")"

0 commit comments

Comments
 (0)