Skip to content

Commit

Permalink
Merge branch 'main' into ea-check-for-cleaned-resources-for-cleanup-api
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishekbhatia1710 authored Oct 17, 2024
2 parents 171a6b8 + aff7ab3 commit 0837b57
Show file tree
Hide file tree
Showing 8,373 changed files with 504,155 additions and 184,227 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"targetBranchChoices": [
"main",
"8.x",
"8.16",
"8.15",
"8.14",
"8.13",
Expand Down Expand Up @@ -54,7 +55,7 @@
],
"branchLabelMapping": {
"^v9.0.0$": "main",
"^v8.16.0$": "8.x",
"^v8.17.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
1 change: 1 addition & 0 deletions .buildkite/ftr_oblt_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enabled:
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
- x-pack/test_serverless/api_integration/test_suites/observability/fleet/config.ts
- x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
- x-pack/test_serverless/functional/test_suites/observability/config.ts
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
- x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts
Expand Down
4 changes: 4 additions & 0 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ disabled:

# Cypress configs, for now these are still run manually
- x-pack/test/fleet_cypress/cli_config.ts
- x-pack/test/fleet_cypress/cli_config.space_awareness.ts
- x-pack/test/fleet_cypress/config.ts
- x-pack/test/fleet_cypress/config.space_awareness.ts
- x-pack/test/fleet_cypress/visual_config.ts

defaultQueue: 'n2-4-spot'
Expand Down Expand Up @@ -272,6 +274,7 @@ enabled:
- x-pack/test/functional/config.upgrade_assistant.ts
- x-pack/test/functional_cloud/config.ts
- x-pack/test/functional_solution_sidenav/config.ts
- x-pack/test/functional_search/config.ts
- x-pack/test/kubernetes_security/basic/config.ts
- x-pack/test/licensing_plugin/config.public.ts
- x-pack/test/licensing_plugin/config.ts
Expand Down Expand Up @@ -314,6 +317,7 @@ enabled:
- x-pack/test/security_api_integration/saml.http2.config.ts
- x-pack/test/security_api_integration/saml_cloud.config.ts
- x-pack/test/security_api_integration/chips.config.ts
- x-pack/test/security_api_integration/features.config.ts
- x-pack/test/security_api_integration/session_idle.config.ts
- x-pack/test/security_api_integration/session_invalidate.config.ts
- x-pack/test/security_api_integration/session_lifespan.config.ts
Expand Down
8 changes: 6 additions & 2 deletions .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,14 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/security_and_spaces/configs/ess.basic.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/security_and_spaces/configs/ess.trial.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ spec:
# Optionally, set schedule-specific env-vars here
env:
SCHEDULED: 'true'
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ spec:
cronline: 0 0 * * * America/New_York
message: Daily build
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 1/3 * * * Europe/Berlin
message: Capacity every 3h testing
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
- kibana-serverless-release
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: bk-kibana-chrome-forward-testing
description: 'Chrome Forward Testing for Kibana'
links:
- url: 'https://buildkite.com/elastic/kibana-chrome-forward-testing'
title: Pipeline link
spec:
type: buildkite-pipeline
system: buildkite
owner: 'group:kibana-operations'
implementation:
apiVersion: buildkite.elastic.dev/v1
kind: Pipeline
metadata:
name: kibana / chrome forward testing
description: 'Testing Kibana against upcoming versions of Chrome'
spec:
env:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'

allow_rebuilds: true
branch_configuration: main
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/chrome_forward_testing.yml
skip_intermediate_builds: true
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
trigger_mode: none
teams:
kibana-operations:
access_level: MANAGE_BUILD_AND_READ
appex-qa:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
# Scheduled runs for the pipeline
schedules:
Daily 12 pm UTC:
cronline: 0 12 * * *
message: Daily Chrome Forward Testing
branch: main
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ spec:
cronline: 0 5 * * *
message: Daily 6 am UTC
branch: main
tags:
- kibana
44 changes: 44 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: bk-kibana-deploy-project-from-pr
description: 'Builds and deploys a Kibana serverless project from a PR'
links:
- url: 'https://buildkite.com/elastic/kibana-deploy-project-from-pr'
title: Pipeline link
spec:
type: buildkite-pipeline
system: buildkite
owner: 'group:kibana-operations'
implementation:
apiVersion: buildkite.elastic.dev/v1
kind: Pipeline
metadata:
name: kibana / deploy project from PR
description: 'Builds and deploys a Kibana serverless project from a PR'
spec:
env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'

allow_rebuilds: false
branch_configuration: main
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
skip_intermediate_builds: true
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
trigger_mode: none
teams:
kibana-operations:
access_level: MANAGE_BUILD_AND_READ
appex-qa:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
env:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
allow_rebuilds: false
branch_configuration: main
default_branch: main
Expand All @@ -39,3 +40,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ spec:
env:
PUBLISH_DOCKER_TAG: 'true'
branch: main
tags:
- kibana
- kibana-serverless-release
14 changes: 10 additions & 4 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,23 @@ spec:
access_level: MANAGE_BUILD_AND_READ
schedules:
Daily build (main):
cronline: 0 9 * * * America/New_York
cronline: 0 22 * * * America/New_York
message: Daily build
branch: main
Daily build (8.x):
cronline: 0 9 * * * America/New_York
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.x'
Daily build (8.15):
cronline: 0 9 * * * America/New_York
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.15'
Daily build (7.17):
cronline: 0 9 * * * America/New_York
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '7.17'
tags:
- kibana
---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
Expand Down Expand Up @@ -108,6 +110,8 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
Expand Down Expand Up @@ -156,3 +160,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ spec:
cronline: 0 0 * * 1 America/New_York
message: Weekly build
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-flaky.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
message: Single user daily test
env: {}
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
description: Kibana / Pipeline migration staging
spec:
env:
SLACK_NOTIFICATIONS_ENABLED: 'false'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/upload_pipeline.yml
provider_settings:
Expand All @@ -30,3 +30,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
5 changes: 4 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
env:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_COMMIT_STATUS_CONTEXT: buildkite/on-merge
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
Expand All @@ -47,3 +47,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
- kibana-serverless-release
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ spec:
cronline: 0 */3 * * * Europe/Berlin
message: Single user daily test
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 3/8 * * * Europe/Berlin
message: Extract APM traces
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
6 changes: 4 additions & 2 deletions .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ spec:
description: Runs manually for pull requests
spec:
env:
PR_COMMENTS_ENABLED: 'true'
ELASTIC_PR_COMMENTS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
allow_rebuilds: true
branch_configuration: ''
cancel_intermediate_builds: true
Expand All @@ -47,3 +47,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ spec:
access_level: BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
- kibana-serverless-release
Loading

0 comments on commit 0837b57

Please sign in to comment.