Skip to content

Commit 342a4b9

Browse files
authored
Merge branch 'elastic:main' into kql-nested-field-support
2 parents 9799f1d + 15930cd commit 342a4b9

File tree

727 files changed

+9525
-4982
lines changed

Some content is hidden

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

727 files changed

+9525
-4982
lines changed

.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ steps:
288288
env:
289289
BWC_VERSION: 8.15.4
290290

291-
- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
292-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0
291+
- label: "{{matrix.image}} / 8.16.1 / packaging-tests-upgrade"
292+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.1
293293
timeout_in_minutes: 300
294294
matrix:
295295
setup:
@@ -302,7 +302,7 @@ steps:
302302
machineType: custom-16-32768
303303
buildDirectory: /dev/shm/bk
304304
env:
305-
BWC_VERSION: 8.16.0
305+
BWC_VERSION: 8.16.1
306306

307307
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
308308
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0

.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ steps:
306306
- signal_reason: agent_stop
307307
limit: 3
308308

309-
- label: 8.16.0 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.0#bwcTest
309+
- label: 8.16.1 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.1#bwcTest
311311
timeout_in_minutes: 300
312312
agents:
313313
provider: gcp
@@ -316,7 +316,7 @@ steps:
316316
buildDirectory: /dev/shm/bk
317317
preemptible: true
318318
env:
319-
BWC_VERSION: 8.16.0
319+
BWC_VERSION: 8.16.1
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -429,7 +429,7 @@ steps:
429429
setup:
430430
ES_RUNTIME_JAVA:
431431
- openjdk21
432-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
432+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
433433
agents:
434434
provider: gcp
435435
image: family/elasticsearch-ubuntu-2004
@@ -471,7 +471,7 @@ steps:
471471
ES_RUNTIME_JAVA:
472472
- openjdk21
473473
- openjdk23
474-
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
474+
BWC_VERSION: ["8.16.1", "8.17.0", "9.0.0"]
475475
agents:
476476
provider: gcp
477477
image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ BWC_VERSION:
1515
- "8.13.4"
1616
- "8.14.3"
1717
- "8.15.4"
18-
- "8.16.0"
18+
- "8.16.1"
1919
- "8.17.0"
2020
- "9.0.0"

.ci/dockerOnLinuxExclusions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sles-15.2
1515
sles-15.3
1616
sles-15.4
1717
sles-15.5
18+
sles-15.6
1819

1920
# These OSes are deprecated and filtered starting with 8.0.0, but need to be excluded
2021
# for PR checks

.ci/snapshotBwcVersions

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
BWC_VERSION:
2-
- "8.15.4"
3-
- "8.16.0"
2+
- "8.16.1"
43
- "8.17.0"
54
- "9.0.0"

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log4j = 2.19.0
1414
slf4j = 2.0.6
1515
ecsLogging = 1.2.0
1616
jna = 5.12.1
17-
netty = 4.1.109.Final
17+
netty = 4.1.115.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
2020

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,11 @@ gradle.projectsEvaluated {
420420
}
421421
}
422422

423-
tasks.named("validateChangelogs") {
424-
onlyIf { project.gradle.startParameter.taskNames.any { it.startsWith("checkPart") || it == 'functionalTests' } == false }
423+
tasks.named("validateChangelogs").configure {
424+
def triggeredTaskNames = gradle.startParameter.taskNames
425+
onlyIf {
426+
triggeredTaskNames.any { it.startsWith("checkPart") || it == 'functionalTests' } == false
427+
}
425428
}
426429

427430
tasks.named("precommit") {

docs/changelog/104683.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 104683
2+
summary: "Feature: re-structure document ID generation favoring _id inverted index compression"
3+
area: Logs
4+
type: enhancement
5+
issues: []

docs/changelog/106520.yaml

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

0 commit comments

Comments
 (0)