Skip to content

Commit 6c738d9

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into react18/bump-styled-components
2 parents 776cbc1 + 7e52c4e commit 6c738d9

1,453 files changed

Lines changed: 22711 additions & 15974 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_security_serverless_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ enabled:
7777
- x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/serverless.config.ts
7878
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
7979
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts
80+
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
81+
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
8082
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
8183
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
8284
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 8.14 7.17
25+
branch_configuration: main 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -53,10 +53,6 @@ spec:
5353
cronline: 0 9 * * * America/New_York
5454
message: Daily build
5555
branch: '8.15'
56-
Daily build (8.14):
57-
cronline: 0 9 * * * America/New_York
58-
message: Daily build
59-
branch: '8.14'
6056
Daily build (7.17):
6157
cronline: 0 9 * * * America/New_York
6258
message: Daily build
@@ -86,7 +82,7 @@ spec:
8682
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
8783
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
8884
allow_rebuilds: true
89-
branch_configuration: main 8.15 8.14 7.17
85+
branch_configuration: main 8.15 7.17
9086
default_branch: main
9187
repository: elastic/kibana
9288
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -134,7 +130,7 @@ spec:
134130
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
135131
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
136132
allow_rebuilds: true
137-
branch_configuration: main 8.15 8.14 7.17
133+
branch_configuration: main 8.15 7.17
138134
default_branch: main
139135
repository: elastic/kibana
140136
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 8.14 7.17
25+
branch_configuration: main 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
allow_rebuilds: true
28-
branch_configuration: main 7.17 8.14 8.15
28+
branch_configuration: main 7.17 8.15
2929
default_branch: main
3030
repository: elastic/kibana
3131
pipeline_file: .buildkite/pipelines/on_merge.yml

‎.buildkite/pipelines/sonarqube.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ steps:
66
agents:
77
image: docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest
88
memory: 32G
9+
cpu: 4
10+
env:
11+
SONAR_SCANNER_JAVA_OPTS: '-Xmx16384m'
912
command: /scan-source-code.sh

‎.buildkite/scripts/steps/capture_oas_snapshot.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ if is_pr && ! is_auto_commit_disabled; then
1010
cmd="$cmd --update"
1111
fi
1212

13+
if [[ $BUILDKITE_PULL_REQUEST != "false" && "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" != "main" ]] || [[ $BUILDKITE_PULL_REQUEST == "false" && "$BUILDKITE_BRANCH" != "main" ]]; then
14+
cmd="$cmd --no-serverless"
15+
fi
16+
1317
eval "$cmd"
1418
check_for_changed_files "$cmd" true

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion

‎api_docs/ai_assistant_management_selection.mdx‎

Lines changed: 1 addition & 1 deletion

‎api_docs/aiops.mdx‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)