Skip to content

Commit 9f1583b

Browse files
dhurley14dhurley14
committed
Merge remote-tracking branch 'upstream/main' into eql-sequence-suppression
2 parents 65b5a9c + bf1c23b commit 9f1583b

4,680 files changed

Lines changed: 116021 additions & 64927 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
@@ -4,6 +4,7 @@
44
"targetBranchChoices": [
55
"main",
66
"8.x",
7+
"8.17",
78
"8.16",
89
"8.15",
910
"8.14",
@@ -55,7 +56,7 @@
5556
],
5657
"branchLabelMapping": {
5758
"^v9.0.0$": "main",
58-
"^v8.17.0$": "8.x",
59+
"^v8.18.0$": "8.x",
5960
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
6061
},
6162
"autoMerge": true,

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ enabled:
2727
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
2828
# serverless config files that run deployment-agnostic tests
2929
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
30+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts

‎.buildkite/ftr_oblt_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ enabled:
5252
- x-pack/test/functional/apps/apm/config.ts
5353
# stateful configs that run deployment-agnostic tests
5454
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
55+
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,4 @@ enabled:
375375
- x-pack/test/custom_branding/config.ts
376376
# stateful config files that run deployment-agnostic tests
377377
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/platform.stateful.config.ts
378+
- x-pack/test/api_integration/apis/cloud/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ enabled:
100100
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/serverless.config.ts
101101
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/serverless.config.ts
102102
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/serverless.config.ts
103+
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/serverless.config.ts
103104
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
105+
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
104106
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
105107
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
106108
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,9 @@ enabled:
8080
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/ess.config.ts
8181
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/ess.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/ess.config.ts
83-
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/serverless.config.ts
8483
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/ess.config.ts
85-
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
8684
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
87-
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
8885
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
89-
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
9086
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
9187
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
9288
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-console-definitions-sync
6+
description: Opens a PR if anything changes in the console definitions in elasticsearch-definitions
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-console-definitions-sync'
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
owner: 'group:kibana-management'
13+
system: buildkite
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / Console definitions sync
19+
description: Opens a PR if anything changes in the console definitions in elasticsearch-definitions
20+
spec:
21+
env:
22+
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management'
23+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
24+
allow_rebuilds: false
25+
branch_configuration: main
26+
default_branch: main
27+
repository: elastic/kibana
28+
pipeline_file: .buildkite/pipelines/console_definitions_sync.yml
29+
provider_settings:
30+
build_branches: false
31+
build_pull_requests: false
32+
publish_commit_status: false
33+
trigger_mode: none
34+
build_tags: false
35+
prefix_pull_request_fork_branch_names: false
36+
skip_pull_request_builds_for_existing_commits: true
37+
teams:
38+
kibana-management:
39+
access_level: MANAGE_BUILD_AND_READ
40+
kibana-operations:
41+
access_level: MANAGE_BUILD_AND_READ
42+
appex-qa:
43+
access_level: MANAGE_BUILD_AND_READ
44+
kibana-tech-leads:
45+
access_level: MANAGE_BUILD_AND_READ
46+
everyone:
47+
access_level: BUILD_AND_READ
48+
schedules:
49+
Weekly build:
50+
cronline: 0 0 * * 1 America/New_York
51+
message: Weekly build
52+
branch: main
53+
tags:
54+
- kibana

‎.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 8.x 8.16 8.15 7.17
25+
branch_configuration: main 8.x 8.17 8.16 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -52,6 +52,10 @@ spec:
5252
cronline: 0 22 * * * America/New_York
5353
message: Daily build
5454
branch: '8.x'
55+
Daily build (8.17):
56+
cronline: 0 22 * * * America/New_York
57+
message: Daily build
58+
branch: '8.17'
5559
Daily build (8.16):
5660
cronline: 0 22 * * * America/New_York
5761
message: Daily build
@@ -91,7 +95,7 @@ spec:
9195
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
9296
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
9397
allow_rebuilds: true
94-
branch_configuration: main 8.x 8.16 8.15 7.17
98+
branch_configuration: main 8.x 8.17 8.16 8.15 7.17
9599
default_branch: main
96100
repository: elastic/kibana
97101
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -140,7 +144,7 @@ spec:
140144
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
141145
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
142146
allow_rebuilds: true
143-
branch_configuration: main 8.x 8.16 8.15 7.17
147+
branch_configuration: main 8.x 8.17 8.16 8.15 7.17
144148
default_branch: main
145149
repository: elastic/kibana
146150
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.x 8.16 8.15 7.17
25+
branch_configuration: main 8.x 8.17 8.16 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

0 commit comments

Comments
 (0)