Skip to content

Commit 87613ad

Browse files
lgestclgestc
authored
Merge branch 'main' into versioned_router_for_timelines
2 parents 6e54be8 + ba64b7c commit 87613ad

2,820 files changed

Lines changed: 66622 additions & 25253 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: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ enabled:
100100
- test/functional/apps/dashboard_elements/controls/options_list/config.ts
101101
- test/functional/apps/dashboard_elements/image_embeddable/config.ts
102102
- test/functional/apps/dashboard_elements/input_control_vis/config.ts
103+
- test/functional/apps/dashboard_elements/links/config.ts
103104
- test/functional/apps/dashboard_elements/markdown/config.ts
104105
- test/functional/apps/dashboard/group1/config.ts
105106
- test/functional/apps/dashboard/group2/config.ts
@@ -278,7 +279,6 @@ enabled:
278279
- x-pack/test/functional/apps/home/config.ts
279280
- x-pack/test/functional/apps/index_lifecycle_management/config.ts
280281
- x-pack/test/functional/apps/index_management/config.ts
281-
- x-pack/test/functional/apps/index_management/index_details_page/config.ts
282282
- x-pack/test/functional/apps/infra/config.ts
283283
- x-pack/test/functional/apps/ingest_pipelines/config.ts
284284
- x-pack/test/functional/apps/lens/group1/config.ts
@@ -311,6 +311,7 @@ enabled:
311311
- x-pack/test/functional/apps/reporting_management/config.ts
312312
- x-pack/test/functional/apps/rollup_job/config.ts
313313
- x-pack/test/functional/apps/saved_objects_management/config.ts
314+
- x-pack/test/functional/apps/saved_query_management/config.ts
314315
- x-pack/test/functional/apps/security/config.ts
315316
- x-pack/test/functional/apps/snapshot_restore/config.ts
316317
- x-pack/test/functional/apps/spaces/config.ts
@@ -358,6 +359,7 @@ enabled:
358359
- x-pack/test/saved_object_api_integration/spaces_only/config.ts
359360
- x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
360361
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
362+
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
361363
- x-pack/test/saved_object_tagging/functional/config.ts
362364
- x-pack/test/saved_objects_field_count/config.ts
363365
- x-pack/test/search_sessions_integration/config.ts
@@ -401,16 +403,22 @@ enabled:
401403
- x-pack/test/upgrade_assistant_integration/config.js
402404
- x-pack/test/usage_collection/config.ts
403405
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
406+
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
407+
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
404408
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
409+
- x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
405410
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
411+
- x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
406412
- x-pack/test_serverless/functional/test_suites/observability/config.ts
407413
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
408-
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
414+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts
409415
- x-pack/test_serverless/functional/test_suites/search/config.ts
410416
- x-pack/test_serverless/functional/test_suites/search/config.examples.ts
411417
- x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
418+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts
412419
- x-pack/test_serverless/functional/test_suites/security/config.ts
413420
- x-pack/test_serverless/functional/test_suites/security/config.examples.ts
421+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts
414422
- x-pack/performance/journeys/ecommerce_dashboard.ts
415423
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
416424
- x-pack/performance/journeys/flight_dashboard.ts

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,15 @@ steps:
154154
- exit_status: '-1'
155155
limit: 3
156156

157-
# TODO: Enable in #166813 after fixing types
158-
# - command: .buildkite/scripts/steps/check_types.sh
159-
# label: 'Check Types'
160-
# agents:
161-
# queue: n2-16-spot
162-
# timeout_in_minutes: 60
163-
# retry:
164-
# automatic:
165-
# - exit_status: '-1'
166-
# limit: 3
157+
- command: .buildkite/scripts/steps/check_types.sh
158+
label: 'Check Types'
159+
agents:
160+
queue: n2-16-spot
161+
timeout_in_minutes: 60
162+
retry:
163+
automatic:
164+
- exit_status: '-1'
165+
limit: 3
167166

168167
- command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
169168
label: 'Build Storybooks'

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,12 @@ steps:
136136
- exit_status: '-1'
137137
limit: 3
138138

139-
# TODO: Enable in #166813 after fixing types
140-
# - command: .buildkite/scripts/steps/check_types.sh
141-
# label: 'Check Types'
142-
# agents:
143-
# queue: n2-16-spot
144-
# timeout_in_minutes: 60
145-
# retry:
146-
# automatic:
147-
# - exit_status: '-1'
148-
# limit: 3
139+
- command: .buildkite/scripts/steps/check_types.sh
140+
label: 'Check Types'
141+
agents:
142+
queue: n2-16-spot
143+
timeout_in_minutes: 60
144+
retry:
145+
automatic:
146+
- exit_status: '-1'
147+
limit: 3

‎.buildkite/pipelines/pull_request/osquery_cypress.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ steps:
2525
artifact_paths:
2626
- "target/kibana-osquery/**/*"
2727

28-
# Error: self-signed certificate in certificate chain
29-
# - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
30-
# label: 'Serverless Osquery Cypress Tests'
31-
# agents:
32-
# queue: n2-4-spot
33-
# depends_on: build
34-
# timeout_in_minutes: 50
35-
# parallelism: 6
36-
# retry:
37-
# automatic:
38-
# - exit_status: '*'
39-
# limit: 1
40-
# artifact_paths:
41-
# - "target/kibana-osquery/**/*"
28+
- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
29+
label: 'Serverless Osquery Cypress Tests'
30+
agents:
31+
queue: n2-4-spot
32+
depends_on: build
33+
timeout_in_minutes: 50
34+
parallelism: 6
35+
retry:
36+
automatic:
37+
- exit_status: '*'
38+
limit: 1
39+
artifact_paths:
40+
- "target/kibana-osquery/**/*"

‎.buildkite/pipelines/pull_request/type_check_selective.yml‎

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

‎.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ steps:
2121
build:
2222
env:
2323
ENVIRONMENT: ${ENVIRONMENT}
24+
EC_ENV: qa
25+
EC_REGION: aws-eu-west-1
2426
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"
2527

2628
- group: ":female-detective: Security Solution Tests"

‎.buildkite/pipelines/quality-gates/pipeline.tests-staging.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ steps:
2121
NAME_PREFIX: ci_test_kibana-promotion_
2222
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
2323

24+
- label: ":pipeline::kibana::seedling: Trigger Kibana Serverless Tests for ${ENVIRONMENT}"
25+
trigger: appex-qa-serverless-kibana-ftr-tests # https://buildkite.com/elastic/appex-qa-serverless-kibana-ftr-tests
26+
soft_fail: true # Remove this before release or when tests stabilize
27+
build:
28+
env:
29+
ENVIRONMENT: ${ENVIRONMENT}
30+
EC_ENV: staging
31+
EC_REGION: aws-us-east-1
32+
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
33+
2434
- wait: ~
2535

2636
- label: ":judge::seedling: Trigger Manual Tests Phase"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ const uploadPipeline = (pipelineContent: string | object) => {
5959
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/kbn_handlebars.yml'));
6060
}
6161

62-
if (GITHUB_PR_LABELS.includes('ci:hard-typecheck')) {
63-
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/type_check.yml'));
64-
} else {
65-
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/type_check_selective.yml'));
66-
}
67-
6862
if (
6963
(await doAnyChangesMatch([
7064
/^src\/plugins\/controls/,

‎.buildkite/scripts/steps/check_types_commits.sh‎

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

33
set -euo pipefail
44

5+
# This script will collect typescript projects and run typecheck on projects between the given 2 parameters
6+
# Could be used for selective typechecking on projects that might be affected for a given PR.
7+
# (The accuracy for finding related projects is not a 100%)
8+
59
if [[ "${CI-}" == "true" ]]; then
610
.buildkite/scripts/bootstrap.sh
711

‎.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,37 @@ echo "--- Promoting ${SOURCE_IMAGE_OR_TAG} to ':latest-verified'"
2424
echo "Re-tagging $SOURCE_IMAGE -> $TARGET_IMAGE"
2525

2626
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
27-
docker pull "$SOURCE_IMAGE"
28-
docker tag "$SOURCE_IMAGE" "$TARGET_IMAGE"
29-
docker push "$TARGET_IMAGE"
3027

31-
ORIG_IMG_DATA=$(docker inspect "$SOURCE_IMAGE")
28+
docker manifest inspect "$SOURCE_IMAGE" | tee manifests.json
29+
30+
ARM_64_DIGEST=$(jq -r '.manifests[] | select(.platform.architecture == "arm64") | .digest' manifests.json)
31+
AMD_64_DIGEST=$(jq -r '.manifests[] | select(.platform.architecture == "amd64") | .digest' manifests.json)
32+
33+
echo docker pull --platform linux/arm64 "$SOURCE_IMAGE@$ARM_64_DIGEST"
34+
docker pull --platform linux/arm64 "$SOURCE_IMAGE@$ARM_64_DIGEST"
35+
echo linux/arm64 image pulled, with digest: $ARM_64_DIGEST
36+
37+
echo docker pull --platform linux/amd64 "$SOURCE_IMAGE@$AMD_64_DIGEST"
38+
docker pull --platform linux/amd64 "$SOURCE_IMAGE@$AMD_64_DIGEST"
39+
echo linux/amd64 image pulled, with digest: $AMD_64_DIGEST
40+
41+
docker tag "$SOURCE_IMAGE@$ARM_64_DIGEST" "$TARGET_IMAGE-arm64"
42+
docker tag "$SOURCE_IMAGE@$AMD_64_DIGEST" "$TARGET_IMAGE-amd64"
43+
44+
docker push "$TARGET_IMAGE-arm64"
45+
docker push "$TARGET_IMAGE-amd64"
46+
47+
docker manifest rm "$TARGET_IMAGE" || echo "Nothing to delete"
48+
49+
docker manifest create "$TARGET_IMAGE" \
50+
--amend "$TARGET_IMAGE-arm64" \
51+
--amend "$TARGET_IMAGE-amd64"
52+
53+
docker manifest push "$TARGET_IMAGE"
54+
55+
docker manifest inspect "$TARGET_IMAGE"
56+
57+
ORIG_IMG_DATA=$(docker inspect "$SOURCE_IMAGE@$ARM_64_DIGEST")
3258
ELASTIC_COMMIT_HASH=$(echo $ORIG_IMG_DATA | jq -r '.[].Config.Labels["org.opencontainers.image.revision"]')
3359

3460
docker logout docker.elastic.co
@@ -37,7 +63,7 @@ echo "Image push to $TARGET_IMAGE successful."
3763
echo "Promotion successful! Henceforth, thou shall be named Sir $TARGET_IMAGE"
3864

3965
MANIFEST_UPLOAD_PATH="Skipped"
40-
if [[ "$UPLOAD_MANIFEST" =~ ^(1|true)$ && "$SOURCE_IMAGE_OR_TAG" =~ ^git-[0-9a-fA-F]{12}$ ]]; then
66+
if [[ "${UPLOAD_MANIFEST:-}" =~ ^(1|true)$ && "$SOURCE_IMAGE_OR_TAG" =~ ^git-[0-9a-fA-F]{12}$ ]]; then
4167
echo "--- Uploading latest-verified manifest to GCS"
4268
cat << EOT >> $MANIFEST_FILE_NAME
4369
{
@@ -58,10 +84,12 @@ EOT
5884
gsutil acl ch -u AllUsers:R "gs://$ES_SERVERLESS_BUCKET/$MANIFEST_FILE_NAME"
5985
MANIFEST_UPLOAD_PATH="<a href=\"https://storage.googleapis.com/$ES_SERVERLESS_BUCKET/$MANIFEST_FILE_NAME\">$MANIFEST_FILE_NAME</a>"
6086

61-
elif [[ "$UPLOAD_MANIFEST" =~ ^(1|true)$ ]]; then
87+
elif [[ "${UPLOAD_MANIFEST:-}" =~ ^(1|true)$ ]]; then
6288
echo "--- Skipping upload of latest-verified manifest to GCS, ES Serverless build tag is not pointing to a hash"
6389
elif [[ "$SOURCE_IMAGE_OR_TAG" =~ ^git-[0-9a-fA-F]{12}$ ]]; then
6490
echo "--- Skipping upload of latest-verified manifest to GCS, flag was not provided"
91+
else
92+
echo "--- Skipping upload of latest-verified manifest to GCS, no flag and hash provided"
6593
fi
6694

6795
echo "--- Annotating build with info"

0 commit comments

Comments
 (0)