Skip to content

Commit

Permalink
Merge branch 'main' into streams-validate-strict-types
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Feb 3, 2025
2 parents 6ee639c + 1d1599e commit b56564b
Show file tree
Hide file tree
Showing 4,694 changed files with 107,596 additions and 62,296 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 4 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"repoName": "kibana",
"targetBranchChoices": [
"main",
"9.0",
"8.x",
"8.18",
"8.17",
"8.16",
"8.15",
Expand Down Expand Up @@ -55,8 +57,8 @@
"backport"
],
"branchLabelMapping": {
"^v9.0.0$": "main",
"^v8.18.0$": "8.x",
"^v9.1.0$": "main",
"^v8.19.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/update_prebuilt_rules_package/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/serverless_complete_tier.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/serverless_essentials_tier.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/serverless.config.ts
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/update_prebuilt_rules_package/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/ess_basic_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/ess_trial_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/ess.config.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: false
branch_configuration: main
branch_configuration: main 8.x
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/console_definitions_sync.yml
Expand Down
14 changes: 11 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
Expand All @@ -48,10 +48,18 @@ spec:
cronline: 0 22 * * * America/New_York
message: Daily build
branch: main
Daily build (9.0):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '9.0'
Daily build (8.x):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.x'
Daily build (8.18):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.18'
Daily build (8.17):
cronline: 0 22 * * * America/New_York
message: Daily build
Expand Down Expand Up @@ -95,7 +103,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
Expand Down Expand Up @@ -144,7 +152,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ spec:
GITHUB_COMMIT_STATUS_CONTEXT: buildkite/on-merge
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SCOUT_REPORTER_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge.yml
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
ELASTIC_PR_COMMENTS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
SCOUT_REPORTER_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: ''
cancel_intermediate_builds: true
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipeline-resource-definitions/locations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spec:
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-deploy-cloud.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing-9-dot-0.yml
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ABSOLUTE_PATH=$(realpath "$TARGET_FILE")
FILE_NAME=$(basename "$ABSOLUTE_PATH")
FOLDER_NAME=$(dirname "$ABSOLUTE_PATH")

docker run -it \
docker run \
--mount type=bind,source="$FOLDER_NAME",target=/home/app/ \
docker.elastic.co/ci-agent-images/pipelib:0.8.0@sha256:641d7fc6cfe473900a1fbe49876762916d804b09fdf2945f74e9f803f3073779 \
rre validate --backstage-entity-aware "/home/app/$FILE_NAME"
Expand Down
6 changes: 2 additions & 4 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ steps:
provider: gcp
machineType: n2-standard-2
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
Expand Down Expand Up @@ -117,7 +117,7 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
Expand Down Expand Up @@ -487,7 +487,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 120
parallelism: 3
retry:
Expand All @@ -503,7 +502,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 120
parallelism: 3
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ steps:
agents:
machineType: n2-standard-2
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
Expand Down Expand Up @@ -79,7 +79,7 @@ steps:
agents:
machineType: n2-standard-4
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
key: check_oas_snapshot
timeout_in_minutes: 60
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 5
retry:
Expand Down Expand Up @@ -91,7 +90,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -107,7 +105,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -123,7 +120,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -142,7 +138,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 3
retry:
Expand Down
Loading

0 comments on commit b56564b

Please sign in to comment.