Skip to content

Commit 780867a

Browse files
authored
Merge branch 'main' into 242254_child_stream_min_length
2 parents efa7804 + 26ecbb6 commit 780867a

File tree

4,934 files changed

+130368
-73358
lines changed

Some content is hidden

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

4,934 files changed

+130368
-73358
lines changed

.buildkite/ftr_oblt_stateful_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ disabled:
66
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
77
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
88
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
9-
- x-pack/solutions/observability/test/profiling_cypress/cli_config.ts
109
#FTR configs
1110
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts
1211
- x-pack/solutions/observability/test/api_integration/config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ enabled:
169169
- x-pack/platform/test/disable_ems/config.ts
170170
- x-pack/platform/test/examples/config.ts
171171
- x-pack/platform/test/fleet_api_integration/config.agent.ts
172+
- x-pack/platform/test/fleet_api_integration/config.agentless.ts
172173
- x-pack/platform/test/fleet_api_integration/config.agent_policy.ts
173174
- x-pack/platform/test/fleet_api_integration/config.epm.ts
174175
- x-pack/platform/test/fleet_api_integration/config.event_ingested.ts

.buildkite/pipeline-resource-definitions/kibana-otel-semconv-sync.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
title: Pipeline link
1010
spec:
1111
type: buildkite-pipeline
12-
owner: 'group:obs-ux-logs-team'
12+
owner: 'group:obs-onboarding-team'
1313
system: buildkite
1414
implementation:
1515
apiVersion: buildkite.elastic.dev/v1
@@ -21,7 +21,7 @@ spec:
2121
env:
2222
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2323
SLACK_NOTIFICATIONS_ON_SUCCESS: 'true'
24-
SLACK_NOTIFICATIONS_CHANNEL: '#obs-ux-logs'
24+
SLACK_NOTIFICATIONS_CHANNEL: '#obs-onboarding'
2525
allow_rebuilds: false
2626
branch_configuration: main
2727
default_branch: main
@@ -36,7 +36,7 @@ spec:
3636
prefix_pull_request_fork_branch_names: false
3737
skip_pull_request_builds_for_existing_commits: true
3838
teams:
39-
obs-ux-logs-team:
39+
obs-onboarding-team:
4040
access_level: MANAGE_BUILD_AND_READ
4141
kibana-operations:
4242
access_level: MANAGE_BUILD_AND_READ
@@ -55,4 +55,4 @@ spec:
5555
- kibana
5656
- observability
5757
- opentelemetry
58-
- obs-ux-logs
58+
- obs-onboarding

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,13 @@ export async function pickTestGroupRunOrder() {
297297
.filter(Boolean)
298298
: ['build'];
299299

300+
const JEST_CONFIGS_DEPS =
301+
process.env.JEST_CONFIGS_DEPS !== undefined
302+
? process.env.JEST_CONFIGS_DEPS.split(',')
303+
.map((t) => t.trim())
304+
.filter(Boolean)
305+
: ['build'];
306+
300307
const ftrExtraArgs: Record<string, string> = process.env.FTR_EXTRA_ARGS
301308
? { FTR_EXTRA_ARGS: process.env.FTR_EXTRA_ARGS }
302309
: {};
@@ -424,7 +431,7 @@ export async function pickTestGroupRunOrder() {
424431
queue,
425432
maxMin: FUNCTIONAL_MAX_MINUTES,
426433
minimumIsolationMin: FUNCTIONAL_MINIMUM_ISOLATION_MIN,
427-
overheadMin: 1.5,
434+
overheadMin: 0,
428435
names,
429436
})),
430437
],
@@ -507,11 +514,12 @@ export async function pickTestGroupRunOrder() {
507514
key: 'jest',
508515
agents: {
509516
...expandAgentQueue('n2-4-spot'),
510-
diskSizeGb: 100,
517+
diskSizeGb: 115,
511518
},
512519
env: {
513520
SCOUT_TARGET_TYPE: 'local',
514521
},
522+
depends_on: JEST_CONFIGS_DEPS,
515523
retry: {
516524
automatic: [
517525
{ exit_status: '-1', limit: 3 },
@@ -533,6 +541,7 @@ export async function pickTestGroupRunOrder() {
533541
env: {
534542
SCOUT_TARGET_TYPE: 'local',
535543
},
544+
depends_on: JEST_CONFIGS_DEPS,
536545
retry: {
537546
automatic: [
538547
{ exit_status: '-1', limit: 3 },

.buildkite/pipelines/build_api_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
env:
22
PUBLISH_API_DOCS_CHANGES: 'true'
33
steps:
4-
- command: .buildkite/scripts/steps/check_types.sh
4+
- command: .buildkite/scripts/steps/typecheck/check_types.sh
55
label: 'Check types'
66
key: check_types
77
agents:

.buildkite/pipelines/flaky_tests/groups.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@
112112
"key": "cypress/apm_cypress",
113113
"name": "APM - Cypress"
114114
},
115-
{
116-
"key": "cypress/profiling_cypress",
117-
"name": "Profiling - Cypress"
118-
},
119115
{
120116
"key": "cypress/cloud_security_posture",
121117
"name": "Cloud Security Posture - Cypress"

.buildkite/pipelines/on_merge.yml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
imageProject: elastic-images-prod
1111
provider: gcp
1212
machineType: n2-standard-2
13-
diskSizeGb: 100
13+
diskSizeGb: 115
1414
retry:
1515
automatic:
1616
- exit_status: '*'
@@ -54,7 +54,7 @@ steps:
5454
provider: gcp
5555
machineType: n2-highcpu-8
5656
preemptible: true
57-
diskSizeGb: 100
57+
diskSizeGb: 115
5858
timeout_in_minutes: 60
5959
retry:
6060
automatic:
@@ -69,7 +69,7 @@ steps:
6969
provider: gcp
7070
machineType: n2-standard-2
7171
preemptible: true
72-
diskSizeGb: 100
72+
diskSizeGb: 115
7373
timeout_in_minutes: 60
7474
retry:
7575
automatic:
@@ -84,7 +84,7 @@ steps:
8484
provider: gcp
8585
machineType: n2-standard-16
8686
preemptible: true
87-
diskSizeGb: 100
87+
diskSizeGb: 115
8888
timeout_in_minutes: 60
8989
retry:
9090
automatic:
@@ -99,14 +99,14 @@ steps:
9999
provider: gcp
100100
machineType: n2-standard-32
101101
preemptible: true
102-
diskSizeGb: 100
102+
diskSizeGb: 115
103103
timeout_in_minutes: 60
104104
retry:
105105
automatic:
106106
- exit_status: '-1'
107107
limit: 3
108108

109-
- command: .buildkite/scripts/steps/check_types.sh
109+
- command: .buildkite/scripts/steps/typecheck/check_types.sh
110110
label: 'Check Types'
111111
agents:
112112
image: family/kibana-ubuntu-2404
@@ -116,7 +116,7 @@ steps:
116116
diskType: 'hyperdisk-balanced'
117117
preemptible: true
118118
spotZones: us-central1-a,us-central1-b,us-central1-c
119-
diskSizeGb: 100
119+
diskSizeGb: 115
120120
timeout_in_minutes: 60
121121
retry:
122122
automatic:
@@ -148,7 +148,7 @@ steps:
148148
provider: gcp
149149
machineType: n2-highmem-4
150150
preemptible: true
151-
diskSizeGb: 100
151+
diskSizeGb: 115
152152
timeout_in_minutes: 80
153153
retry:
154154
automatic:
@@ -164,7 +164,7 @@ steps:
164164
imageProject: elastic-images-prod
165165
provider: gcp
166166
machineType: n2-standard-2
167-
diskSizeGb: 100
167+
diskSizeGb: 115
168168
timeout_in_minutes: 10
169169
depends_on:
170170
- build
@@ -181,7 +181,7 @@ steps:
181181
imageProject: elastic-images-prod
182182
provider: gcp
183183
machineType: n2-standard-2
184-
diskSizeGb: 100
184+
diskSizeGb: 115
185185
timeout_in_minutes: 10
186186
env:
187187
JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -199,7 +199,7 @@ steps:
199199
imageProject: elastic-images-prod
200200
provider: gcp
201201
machineType: n2-standard-4
202-
diskSizeGb: 100
202+
diskSizeGb: 115
203203
key: build_scout_tests
204204
timeout_in_minutes: 15
205205
depends_on:
@@ -601,21 +601,6 @@ steps:
601601
- exit_status: '-1'
602602
limit: 1
603603

604-
- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
605-
label: 'Profiling Cypress Tests'
606-
agents:
607-
image: family/kibana-ubuntu-2404
608-
imageProject: elastic-images-prod
609-
provider: gcp
610-
machineType: n2-standard-4
611-
preemptible: true
612-
timeout_in_minutes: 120
613-
parallelism: 3
614-
retry:
615-
automatic:
616-
- exit_status: '-1'
617-
limit: 1
618-
619604
- command: .buildkite/scripts/steps/functional/apm_cypress.sh
620605
label: 'APM Cypress Tests'
621606
agents:

.buildkite/pipelines/pull_request/base.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
id: pre_build
66
agents:
77
machineType: n2-standard-2
8-
diskSizeGb: 100
8+
diskSizeGb: 115
99

1010
- wait
1111

@@ -39,7 +39,7 @@ steps:
3939
agents:
4040
machineType: n2-highcpu-8
4141
preemptible: true
42-
diskSizeGb: 100
42+
diskSizeGb: 115
4343
key: quick_checks
4444
timeout_in_minutes: 60
4545
retry:
@@ -53,7 +53,7 @@ steps:
5353
agents:
5454
machineType: n2-standard-2
5555
preemptible: true
56-
diskSizeGb: 100
56+
diskSizeGb: 115
5757
timeout_in_minutes: 60
5858
retry:
5959
automatic:
@@ -65,7 +65,7 @@ steps:
6565
agents:
6666
machineType: n2-standard-16
6767
preemptible: true
68-
diskSizeGb: 100
68+
diskSizeGb: 115
6969
key: linting
7070
timeout_in_minutes: 60
7171
retry:
@@ -78,7 +78,7 @@ steps:
7878
agents:
7979
machineType: n2-standard-32
8080
preemptible: true
81-
diskSizeGb: 100
81+
diskSizeGb: 115
8282
key: linting_with_types
8383
timeout_in_minutes: 60
8484
retry:
@@ -98,14 +98,14 @@ steps:
9898
- exit_status: '-1'
9999
limit: 3
100100

101-
- command: .buildkite/scripts/steps/check_types.sh
101+
- command: .buildkite/scripts/steps/typecheck/check_types.sh
102102
label: 'Check Types'
103103
agents:
104104
machineType: c4-standard-4
105105
diskType: 'hyperdisk-balanced'
106106
preemptible: true
107107
spotZones: us-central1-a,us-central1-b,us-central1-c
108-
diskSizeGb: 100
108+
diskSizeGb: 115
109109
key: check_types
110110
timeout_in_minutes: 60
111111
retry:
@@ -119,7 +119,7 @@ steps:
119119
label: Mark CI Stats as ready
120120
agents:
121121
machineType: n2-standard-2
122-
diskSizeGb: 100
122+
diskSizeGb: 115
123123
timeout_in_minutes: 10
124124
depends_on:
125125
- build
@@ -134,7 +134,7 @@ steps:
134134
agents:
135135
machineType: n2-highmem-4
136136
preemptible: true
137-
diskSizeGb: 100
137+
diskSizeGb: 115
138138
key: build_api_docs
139139
timeout_in_minutes: 90
140140
retry:

0 commit comments

Comments
 (0)