Skip to content

Commit 48765b8

Browse files
Merge branch 'main' into security/read-only-dashboards
2 parents 27c9862 + 4853dd9 commit 48765b8

File tree

6,401 files changed

+256097
-176403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,401 files changed

+256097
-176403
lines changed

.buildkite/ftr_chat_serverless_configs.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.buildkite/ftr_configs_manifests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
".buildkite/ftr_oblt_serverless_configs.yml",
1111
".buildkite/ftr_security_serverless_configs.yml",
1212
".buildkite/ftr_search_serverless_configs.yml",
13-
".buildkite/ftr_chat_serverless_configs.yml"
13+
".buildkite/ftr_workplace_ai_serverless_configs.yml"
1414
]
1515
}

.buildkite/ftr_oblt_stateful_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ enabled:
3838
- x-pack/solutions/observability/test/apm_api_integration/cloud/config.ts
3939
- x-pack/solutions/observability/test/apm_api_integration/rules/config.ts
4040
- x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
41-
- x-pack/solutions/observability/test/dataset_quality_api_integration/basic/config.ts
4241
- x-pack/solutions/observability/test/functional/apps/dataset_quality/config.ts
4342
- x-pack/solutions/observability/test/functional/apps/uptime/config.ts
4443
- x-pack/solutions/observability/test/observability_api_integration/basic/config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ enabled:
6565
- src/platform/test/functional/apps/dashboard_elements/input_control_vis/config.ts
6666
- src/platform/test/functional/apps/dashboard_elements/links/config.ts
6767
- src/platform/test/functional/apps/dashboard_elements/markdown/config.ts
68-
- src/platform/test/functional/apps/dashboard/background_search/config.ts
6968
- src/platform/test/functional/apps/dashboard/group1/config.ts
7069
- src/platform/test/functional/apps/dashboard/group2/config.ts
7170
- src/platform/test/functional/apps/dashboard/group3/config.ts
@@ -76,7 +75,6 @@ enabled:
7675
- src/platform/test/functional/apps/discover/ccs_compatibility/config.ts
7776
- src/platform/test/functional/apps/discover/embeddable/config.ts
7877
- src/platform/test/functional/apps/discover/esql/config.ts
79-
- src/platform/test/functional/apps/discover/background_search/config.ts
8078
- src/platform/test/functional/apps/discover/group1/config.ts
8179
- src/platform/test/functional/apps/discover/group2_data_grid1/config.ts
8280
- src/platform/test/functional/apps/discover/group2_data_grid2/config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ disabled:
3636
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/ess/rules_management.basic.config.ts
3737
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/ess/rules_management.trial.config.ts
3838

39+
# Detection Rules Management OOM Testing
40+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/oom_testing/configs/ess_basic_license.config.ts
41+
3942
defaultQueue: 'n2-4-spot'
4043
enabled:
4144
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
disabled:
2+
# Base config files, only necessary to inform config finding script
3+
- x-pack/platform/test/serverless/functional/config.workplace_ai.base.ts
4+
5+
defaultQueue: 'n2-4-spot'
6+
enabled:
7+
- x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.ts
8+
- x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.feature_flags.ts
9+
- x-pack/platform/test/serverless/api_integration/configs/workplace_ai/config.group1.ts
10+
- x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.ts
11+
- x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.feature_flags.ts
12+
- x-pack/platform/test/serverless/functional/configs/workplace_ai/config.config_compat_mode.ts
13+
- x-pack/platform/test/serverless/functional/configs/workplace_ai/config.group1.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.2 9.1 9.0 8.19 8.18
25+
branch_configuration: main 9.2 9.1 8.19
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: 3 additions & 11 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.2 9.1 9.0 8.19 8.18 7.17
25+
branch_configuration: main 9.2 9.1 8.19 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -56,18 +56,10 @@ spec:
5656
cronline: 0 22 * * * America/New_York
5757
message: Daily build
5858
branch: '9.1'
59-
Daily build (9.0):
60-
cronline: 0 22 * * * America/New_York
61-
message: Daily build
62-
branch: '9.0'
6359
Daily build (8.19):
6460
cronline: 0 22 * * * America/New_York
6561
message: Daily build
6662
branch: '8.19'
67-
Daily build (8.18):
68-
cronline: 0 22 * * * America/New_York
69-
message: Daily build
70-
branch: '8.18'
7163
Daily build (7.17):
7264
cronline: 0 20 * * * America/New_York
7365
message: Daily build
@@ -99,7 +91,7 @@ spec:
9991
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
10092
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
10193
allow_rebuilds: true
102-
branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
94+
branch_configuration: main 9.2 9.1 8.19 7.17
10395
default_branch: main
10496
repository: elastic/kibana
10597
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -148,7 +140,7 @@ spec:
148140
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
149141
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
150142
allow_rebuilds: true
151-
branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
143+
branch_configuration: main 9.2 9.1 8.19 7.17
152144
default_branch: main
153145
repository: elastic/kibana
154146
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.2 9.1 9.0 8.19 8.18 7.17
26+
branch_configuration: main 9.2 9.1 8.19 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.2 9.1 9.0 8.19 8.18 7.17
29+
branch_configuration: main 9.2 9.1 8.19 7.17
3030
default_branch: main
3131
repository: elastic/kibana
3232
pipeline_file: .buildkite/pipelines/on_merge.yml

0 commit comments

Comments
 (0)