Skip to content

Commit

Permalink
Merge branch 'main' into renovate/main-@testing-library
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ikuni17
Ikuni17 authored Nov 15, 2024
2 parents 6b54400 + 2296a79 commit fe399c2
Show file tree
Hide file tree
Showing 2,873 changed files with 76,937 additions and 45,443 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_platform_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ enabled:
- x-pack/test/fleet_api_integration/config.agent.ts
- x-pack/test/fleet_api_integration/config.agent_policy.ts
- x-pack/test/fleet_api_integration/config.epm.ts
- x-pack/test/fleet_api_integration/config.event_ingested.ts
- x-pack/test/fleet_api_integration/config.fleet.ts
- x-pack/test/fleet_api_integration/config.package_policy.ts
- x-pack/test/fleet_api_integration/config.space_awareness.ts
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/_templates/_new_pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ spec:
repository: elastic/kibana
# Point to a pipeline implementation, detailing the pipeline steps to run
pipeline_file: .buildkite/pipelines/your-pipeline-name.yml
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-api-docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/build_api_docs.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-apis-capacity-testing-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/scalability/api_capacity_testing_daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ spec:
allow_rebuilds: true
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts_trigger.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
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
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/code_coverage/daily.yml
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
skip_intermediate_builds: true
provider_settings:
build_pull_requests: true
prefix_pull_request_fork_branch_names: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_forward.yml # Note: this file exists in 7.17 only
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
trigger_mode: none
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down Expand Up @@ -96,7 +95,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down Expand Up @@ -146,7 +144,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-esql-grammar-sync.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/esql_grammar_sync.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-flaky.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ spec:
default_branch: refs/pull/INSERT_PR_NUMBER/head
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/flaky_tests/pipeline.sh
skip_intermediate_builds: false
provider_settings:
build_branches: true
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-fleet-packages-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/fleet/packages_daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
publish_commit_status: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-performance-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/performance/daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/purge_cloud_deployments.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-serverless-release-testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_serverless/emergency_release_branch_testing.yml
skip_intermediate_builds: false
provider_settings:
build_branches: true
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-serverless-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
default_branch: main
allow_rebuilds: false
skip_intermediate_builds: false
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/serverless_deployment/run_serverless_release_assistant.yml
provider_settings:
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-vm-images.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ spec:
default_branch: main
repository: elastic/ci-agent-images
pipeline_file: vm-images/.buildkite/pipeline.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
schedules:
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/scalability_testing-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/scalability/daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
1 change: 0 additions & 1 deletion ...lution-quality-gate/kibana-serverless-security-solution-quality-gate-defend-workflows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_defend_workflows.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...lution-quality-gate/kibana-serverless-security-solution-quality-gate-detection-engine.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_detection_engine.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...lution-quality-gate/kibana-serverless-security-solution-quality-gate-entity-analytics.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_entity_analytics.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...curity-solution-quality-gate/kibana-serverless-security-solution-quality-gate-explore.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_explore.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...ecurity-solution-quality-gate/kibana-serverless-security-solution-quality-gate-gen-ai.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_gen_ai.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...solution-quality-gate/kibana-serverless-security-solution-quality-gate-investigations.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_investigations.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion ...olution-quality-gate/kibana-serverless-security-solution-quality-gate-rule-management.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_rule_management.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
15 changes: 15 additions & 0 deletions .buildkite/pipelines/on_merge.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,21 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/openapi_publishing/publish_oas_docs.sh
label: 'Publish OAS docs to bump.sh'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-2
preemptible: true
timeout_in_minutes: 60
soft_fail: true
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/bazel_cache/bootstrap_linux.sh
label: 'Populate local dev bazel cache (Linux)'
agents:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ steps:
async: true
build:
env:
IMAGES_CONFIG="kibana/images.yml"
RETRY="1"
IMAGES_CONFIG: "kibana/images.yml"
RETRY: "1"
EOF
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/es_snapshots/promote.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
async: true
build:
env:
IMAGES_CONFIG="kibana/images.yml"
RETRY="1"
IMAGES_CONFIG: "kibana/images.yml"
RETRY: "1"
EOF
fi
10 changes: 9 additions & 1 deletion .buildkite/scripts/steps/openapi_bundling/final_merge.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

cur_dir=$(pwd)
cd oas_docs

echo --- Installing NPM modules
npm install

echo --- Merge Kibana OpenAPI specs
make api-docs
# make api-docs-lint <-- Relies on JSONPath version with RCE vulnerabilities based on `npm audit`, https://github.com/advisories/GHSA-pppg-cpfq-h7wr

(cd oas_docs && make api-docs && make api-docs-lint)
cd "$cur_dir"

check_for_changed_files "make api-docs" true
Loading

0 comments on commit fe399c2

Please sign in to comment.