Skip to content

Commit a86dea3

Browse files
maximpnmaximpn
authored
Merge branch 'main' into address-export-prebuilt-rules-test-plan
2 parents 3419177 + 08eb836 commit a86dea3

2,596 files changed

Lines changed: 31504 additions & 9017 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.

‎.backportrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"9.1",
67
"9.0",
78
"8.19",
89
"8.18",
@@ -57,7 +58,7 @@
5758
"backport"
5859
],
5960
"branchLabelMapping": {
60-
"^v9.1.0$": "main",
61+
"^v9.2.0$": "main",
6162
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
6263
},
6364
"autoMerge": true,

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ enabled:
1414
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
1515
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.logs_essentials.group1.ts
1616
- x-pack/test_serverless/api_integration/test_suites/observability/fleet/config.ts
17-
- x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
1817
- x-pack/test_serverless/functional/test_suites/observability/config.ts
1918
- x-pack/test_serverless/functional/test_suites/observability/config.logs_essentials.ts
2019
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts

‎.buildkite/ftr_oblt_stateful_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ enabled:
4040
- x-pack/test/observability_functional/with_rac_write.config.ts
4141
- x-pack/test/observability_onboarding_api_integration/basic/config.ts
4242
- x-pack/test/observability_onboarding_api_integration/cloud/config.ts
43-
- x-pack/test/observability_ai_assistant_api_integration/enterprise/config.ts
4443
- x-pack/test/observability_ai_assistant_functional/enterprise/config.ts
4544
- x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
4645
- x-pack/test/functional/apps/apm/config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ enabled:
9191
- src/platform/test/functional/apps/discover/group10/config.ts
9292
- src/platform/test/functional/apps/discover/context_awareness/config.ts
9393
- src/platform/test/functional/apps/discover/observability/config.ts
94+
- src/platform/test/functional/apps/discover/tabs/config.ts
9495
- src/platform/test/functional/apps/getting_started/config.ts
9596
- src/platform/test/functional/apps/home/config.ts
9697
- src/platform/test/functional/apps/kibana_overview/config.ts
@@ -154,7 +155,6 @@ enabled:
154155
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts
155156
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts
156157
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
157-
- x-pack/test/api_integration_basic/config.ts
158158
- x-pack/test/api_integration/apis/cases/config.ts
159159
- x-pack/test/api_integration/apis/security/config.ts
160160
- x-pack/test/banners_functional/config.ts
@@ -201,13 +201,13 @@ enabled:
201201
- x-pack/test/functional/apps/advanced_settings/config.ts
202202
- x-pack/test/functional/apps/aiops/config.ts
203203
- x-pack/test/functional/apps/api_keys/config.ts
204-
- x-pack/test/functional/apps/canvas/config.ts
204+
- x-pack/platform/test/functional/apps/canvas/config.ts
205205
- x-pack/test/functional/apps/cross_cluster_replication/config.ts
206206
- x-pack/test/functional/apps/dashboard/group1/config.ts
207207
- x-pack/test/functional/apps/dashboard/group2/config.ts
208208
- x-pack/test/functional/apps/dashboard/group3/config.ts
209209
- x-pack/test/functional/apps/data_views/config.ts
210-
- x-pack/test/functional/apps/dev_tools/config.ts
210+
- x-pack/platform/test/functional/apps/dev_tools/config.ts
211211
- x-pack/test/functional/apps/discover/group1/config.ts
212212
- x-pack/test/functional/apps/discover/group2/config.ts
213213
- x-pack/test/functional/apps/discover/group3/config.ts
@@ -266,7 +266,7 @@ enabled:
266266
- x-pack/test/functional/apps/upgrade_assistant/config.ts
267267
- x-pack/test/functional/apps/user_profiles/config.ts
268268
- x-pack/test/functional/apps/visualize/config.ts
269-
- x-pack/test/functional/apps/watcher/config.ts
269+
- x-pack/platform/test/functional/apps/watcher/config.ts
270270
- x-pack/platform/test/functional/config_security_basic.ts
271271
- x-pack/test/functional/config.ccs.ts
272272
- x-pack/test/functional/config.firefox.js
@@ -278,10 +278,10 @@ enabled:
278278
- x-pack/test/licensing_plugin/config.public.ts
279279
- x-pack/test/licensing_plugin/config.ts
280280
- x-pack/test/plugin_functional/config.ts
281-
- x-pack/test/reporting_api_integration/reporting_and_security.config.ts
282-
- x-pack/test/reporting_api_integration/reporting_without_security.config.ts
283-
- x-pack/test/reporting_functional/reporting_and_security.config.ts
284-
- x-pack/test/reporting_functional/reporting_without_security.config.ts
281+
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
282+
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
283+
- x-pack/platform/test/reporting_functional/reporting_and_security.config.ts
284+
- x-pack/platform/test/reporting_functional/reporting_without_security.config.ts
285285
- x-pack/test/rule_registry/security_and_spaces/config_basic.ts
286286
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
287287
- x-pack/test/rule_registry/spaces_only/config_basic.ts
@@ -378,6 +378,7 @@ enabled:
378378
- x-pack/platform/test/api_integration/apis/management/config.ts
379379
- x-pack/platform/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
380380
- x-pack/platform/test/api_integration/apis/maps/config.ts
381+
- x-pack/platform/test/api_integration/apis/lens/config.ts
381382
- x-pack/platform/test/api_integration/apis/ml/config.ts
382383
- x-pack/platform/test/api_integration/apis/monitoring/config.ts
383384
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts
@@ -404,5 +405,6 @@ enabled:
404405
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
405406
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts
406407
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
408+
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
407409
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
408410
- src/platform/test/api_integration/apis/unused_urls_task/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ disabled:
44
- x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
55
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
66
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts
7-
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts
7+
- x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts
88
- x-pack/solutions/security/test/osquery_cypress/serverless_config.base.ts
99

1010
# Cypress configs, for now these are still run manually
11-
- x-pack/test/defend_workflows_cypress/serverless_config.ts
11+
- x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts
1212
- x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts
1313
- x-pack/test/security_solution_cypress/serverless_config.ts
1414
- x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ disabled:
1515
- x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts
1616

1717
# Cypress configs, for now these are still run manually
18-
- x-pack/test/defend_workflows_cypress/cli_config.ts
19-
- x-pack/test/defend_workflows_cypress/config.ts
18+
- x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts
19+
- x-pack/solutions/security/test/defend_workflows_cypress/config.ts
2020
- x-pack/solutions/security/test/osquery_cypress/cli_config.ts
2121
- x-pack/solutions/security/test/osquery_cypress/config.ts
2222
- x-pack/solutions/security/test/osquery_cypress/visual_config.ts
@@ -125,3 +125,4 @@ enabled:
125125
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
126126
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts
127127
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts
128+
- x-pack/solutions/security/test/api_integration_basic/config.ts

‎.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.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-management'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: false
25-
branch_configuration: main 9.0 8.19 8.18
25+
branch_configuration: main 9.1 9.0 8.19 8.18
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/console_definitions_sync.yml

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

Lines changed: 7 additions & 3 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 9.0 8.19 8.18 8.17 7.17
25+
branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -48,6 +48,10 @@ spec:
4848
cronline: 0 22 * * * America/New_York
4949
message: Daily build
5050
branch: main
51+
Daily build (9.1):
52+
cronline: 0 22 * * * America/New_York
53+
message: Daily build
54+
branch: '9.1'
5155
Daily build (9.0):
5256
cronline: 0 22 * * * America/New_York
5357
message: Daily build
@@ -95,7 +99,7 @@ spec:
9599
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
96100
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
97101
allow_rebuilds: true
98-
branch_configuration: main 9.0 8.19 8.18 8.17 7.17
102+
branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
99103
default_branch: main
100104
repository: elastic/kibana
101105
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -144,7 +148,7 @@ spec:
144148
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
145149
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
146150
allow_rebuilds: true
147-
branch_configuration: main 9.0 8.19 8.18 8.17 7.17
151+
branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
148152
default_branch: main
149153
repository: elastic/kibana
150154
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
@@ -23,7 +23,7 @@ spec:
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
SCOUT_REPORTER_ENABLED: 'true'
2525
allow_rebuilds: true
26-
branch_configuration: main 9.0 8.19 8.18 8.17 7.17
26+
branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
2727
default_branch: main
2828
repository: elastic/kibana
2929
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
@@ -26,7 +26,7 @@ spec:
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
SCOUT_REPORTER_ENABLED: 'true'
2828
allow_rebuilds: true
29-
branch_configuration: main 9.0 8.19 8.18 8.17 7.17
29+
branch_configuration: main 9.1 9.0 8.19 8.18 8.17 7.17
3030
default_branch: main
3131
repository: elastic/kibana
3232
pipeline_file: .buildkite/pipelines/on_merge.yml

0 commit comments

Comments
 (0)