Skip to content

Commit 287403c

Browse files
committed
Merge branch 'main' into 135150/monitor-detail-flyout
2 parents 686e967 + 4695c9a commit 287403c

File tree

2,649 files changed

+73385
-27214
lines changed

Some content is hidden

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

2,649 files changed

+73385
-27214
lines changed

.buildkite/ftr_configs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ enabled:
177177
- x-pack/test/functional/apps/lens/group1/config.ts
178178
- x-pack/test/functional/apps/lens/group2/config.ts
179179
- x-pack/test/functional/apps/lens/group3/config.ts
180-
- x-pack/test/functional/apps/lens/open_in_lens/config.ts
180+
- x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
181+
- x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
181182
- x-pack/test/functional/apps/license_management/config.ts
182183
- x-pack/test/functional/apps/logstash/config.ts
183184
- x-pack/test/functional/apps/management/config.ts
@@ -271,6 +272,7 @@ enabled:
271272
- x-pack/test/upgrade_assistant_integration/config.js
272273
- x-pack/test/usage_collection/config.ts
273274
- x-pack/performance/journeys/ecommerce_dashboard.ts
275+
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
274276
- x-pack/performance/journeys/flight_dashboard.ts
275277
- x-pack/performance/journeys/login.ts
276278
- x-pack/performance/journeys/many_fields_discover.ts

.buildkite/scripts/bootstrap.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,3 @@ if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then
3636
check_for_changed_files 'yarn kbn bootstrap'
3737
fi
3838

39-
###
40-
### upload ts-refs-cache artifacts as quickly as possible so they are available for download
41-
###
42-
if [[ "${BUILD_TS_REFS_CACHE_CAPTURE:-}" == "true" ]]; then
43-
echo "--- Build ts-refs-cache"
44-
node scripts/build_ts_refs.js --ignore-type-failures
45-
echo "--- Upload ts-refs-cache"
46-
cd "$KIBANA_DIR/target/ts_refs_cache"
47-
gsutil cp "*.zip" 'gs://kibana-ci-ts-refs-cache/'
48-
cd "$KIBANA_DIR"
49-
fi

.buildkite/scripts/common/env.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ if is_pr; then
6363
export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=true
6464
fi
6565

66-
if [[ "${GITHUB_STEP_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
67-
export CHECKS_REPORTER_ACTIVE=true
68-
else
69-
export CHECKS_REPORTER_ACTIVE=false
70-
fi
71-
7266
# These can be removed once we're not supporting Jenkins and Buildkite at the same time
7367
# These are primarily used by github checks reporter and can be configured via /github_checks_api.json
7468
export ghprbGhRepository="elastic/kibana"
@@ -83,7 +77,6 @@ if is_pr; then
8377
else
8478
export ELASTIC_APM_ACTIVE=true
8579
export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=false
86-
export CHECKS_REPORTER_ACTIVE=false
8780
fi
8881

8982
# These are for backwards-compatibility
@@ -106,11 +99,6 @@ export GCS_UPLOAD_PREFIX=FAKE_UPLOAD_PREFIX # TODO remove the need for this
10699

107100
export KIBANA_BUILD_LOCATION="$WORKSPACE/kibana-build-xpack"
108101

109-
if [[ "${BUILD_TS_REFS_CACHE_ENABLE:-}" != "true" ]]; then
110-
export BUILD_TS_REFS_CACHE_ENABLE=false
111-
fi
112-
113-
export BUILD_TS_REFS_DISABLE=true
114102
export DISABLE_BOOTSTRAP_VALIDATION=true
115103

116104
# Prevent Browserlist from logging on CI about outdated database versions

.buildkite/scripts/common/util.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
#!/usr/bin/env bash
22

3-
checks-reporter-with-killswitch() {
4-
if [ "$CHECKS_REPORTER_ACTIVE" == "true" ] ; then
5-
yarn run github-checks-reporter "$@"
6-
else
7-
arguments=("$@");
8-
"${arguments[@]:1}";
9-
fi
10-
}
11-
123
is_pr() {
134
[[ "${GITHUB_PR_NUMBER-}" ]] && return
145
false

.buildkite/scripts/saved_object_field_metrics.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo '--- Default Saved Object Field Metrics'
8-
checks-reporter-with-killswitch "Capture Kibana Saved Objects field count metrics" \
9-
node scripts/functional_tests \
10-
--debug --bail \
11-
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
12-
--config x-pack/test/saved_objects_field_count/config.ts
8+
node scripts/functional_tests \
9+
--debug --bail \
10+
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
11+
--config x-pack/test/saved_objects_field_count/config.ts

.buildkite/scripts/steps/build_api_docs.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ set -euo pipefail
44

55
.buildkite/scripts/bootstrap.sh
66

7-
echo "--- Build TS Refs"
8-
node scripts/build_ts_refs \
9-
--clean \
10-
--no-cache \
11-
--force
7+
echo "--- Run scripts/type_check to ensure that all build available"
8+
node scripts/type_check
129

1310
echo "--- Build API Docs"
1411
node --max-old-space-size=12000 scripts/build_api_docs

.buildkite/scripts/steps/check_types.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ source .buildkite/scripts/common/util.sh
77
.buildkite/scripts/bootstrap.sh
88

99
echo --- Check Types
10-
checks-reporter-with-killswitch "Check Types" \
11-
node scripts/type_check --concurrency 8
10+
node scripts/type_check

.buildkite/scripts/steps/checks/bundle_limits.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ source .buildkite/scripts/common/util.sh
66

77
echo --- Check Bundle Limits
88

9-
checks-reporter-with-killswitch "Check Bundle Limits" \
10-
node scripts/build_kibana_platform_plugins --validate-limits
9+
node scripts/build_kibana_platform_plugins --validate-limits

.buildkite/scripts/steps/checks/file_casing.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Check File Casing
8-
checks-reporter-with-killswitch "Check File Casing" \
9-
node scripts/check_file_casing --quiet
8+
node scripts/check_file_casing --quiet

.buildkite/scripts/steps/checks/ftr_configs.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Check FTR Configs
8-
checks-reporter-with-killswitch "Check FTR Configs" \
9-
node scripts/check_ftr_configs
8+
node scripts/check_ftr_configs

0 commit comments

Comments
 (0)