Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/elasticsearch into ml-parse…
Browse files Browse the repository at this point in the history
…-rate-limit-dry-run
  • Loading branch information
jonathan-buttner committed Apr 18, 2024
2 parents c852506 + fde1500 commit 4712287
Show file tree
Hide file tree
Showing 104 changed files with 1,266 additions and 1,730 deletions.
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"upstream" : "elastic/elasticsearch",
"targetBranchChoices" : [ "main", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
"targetBranchChoices" : [ "main", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
"targetPRLabels" : [ "backport" ],
"branchLabelMapping" : {
"^v8.14.0$" : "main",
"^v8.15.0$" : "main",
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
}
}
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0"]
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0", "8.15.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
8 changes: 8 additions & 0 deletions .buildkite/pipelines/lucene-snapshot/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ steps:
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
- label: part4
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
- group: bwc-snapshots
steps:
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
Expand Down
16 changes: 16 additions & 0 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,22 @@ steps:
env:
BWC_VERSION: 8.14.0

- label: "{{matrix.image}} / 8.15.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.0
timeout_in_minutes: 300
matrix:
setup:
image:
- rocky-8
- ubuntu-2004
agents:
provider: gcp
image: family/elasticsearch-{{matrix.image}}
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.15.0

- group: packaging-tests-windows
steps:
- label: "{{matrix.image}} / packaging-tests-windows"
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/periodic-platform-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: gcp
Expand All @@ -70,6 +71,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: aws
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/periodic.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: gcp
Expand Down Expand Up @@ -89,6 +90,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: gcp
Expand Down
16 changes: 14 additions & 2 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,16 @@ steps:
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.14.0
- label: 8.15.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.0#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.15.0
- label: concurrent-search-tests
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
timeout_in_minutes: 420
Expand Down Expand Up @@ -380,6 +390,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: gcp
Expand All @@ -396,7 +407,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk17
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0"]
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0", "8.15.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand All @@ -420,6 +431,7 @@ steps:
- checkPart1
- checkPart2
- checkPart3
- checkPart4
- checkRestCompat
agents:
provider: gcp
Expand All @@ -438,7 +450,7 @@ steps:
- graalvm-ce17
- openjdk17
- openjdk21
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0"]
BWC_VERSION: ["7.17.21", "8.13.3", "8.14.0", "8.15.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
1 change: 1 addition & 0 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ BWC_VERSION:
- "8.12.2"
- "8.13.3"
- "8.14.0"
- "8.15.0"
1 change: 1 addition & 0 deletions .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ BWC_VERSION:
- "7.17.21"
- "8.13.3"
- "8.14.0"
- "8.15.0"
3 changes: 3 additions & 0 deletions branches.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
{
"branch": "main"
},
{
"branch": "8.14"
},
{
"branch": "8.13"
},
Expand Down
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 8.14.0
elasticsearch = 8.15.0
lucene = 9.10.0

bundled_jdk_vendor = openjdk
Expand Down
20 changes: 0 additions & 20 deletions docs/changelog/105682.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions docs/changelog/107383.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 107383
summary: Users with monitor privileges can access async_search/status endpoint
even when setting keep_alive
area: Authorization
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/107494.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 107494
summary: Handle infinity during synthetic source construction for scaled float field
area: Mapping
type: bug
issues:
- 107101
5 changes: 5 additions & 0 deletions docs/changelog/107551.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 107551
summary: Avoid attempting to load the same empty field twice in fetch phase
area: Search
type: bug
issues: []
12 changes: 0 additions & 12 deletions docs/reference/data-streams/data-stream-apis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ preview:[]
preview:[]
* <<data-streams-get-lifecycle-stats,Get data stream lifecycle stats>>
preview:[]
* <<data-streams-put-global-retention,Update the global retention for data stream lifecycle managed data streams>>
preview:[]
* <<data-streams-get-global-retention,Get the global retention for data stream lifecycle managed data streams>>
preview:[]
* <<data-streams-delete-global-retention,Delete the global retention for data stream lifecycle managed data streams>>
preview:[]

The following API is available for <<tsds,time series data streams>>:

Expand Down Expand Up @@ -65,10 +59,4 @@ include::{es-ref-dir}/data-streams/lifecycle/apis/explain-lifecycle.asciidoc[]

include::{es-ref-dir}/data-streams/lifecycle/apis/get-lifecycle-stats.asciidoc[]

include::{es-ref-dir}/data-streams/lifecycle/apis/put-global-retention.asciidoc[]

include::{es-ref-dir}/data-streams/lifecycle/apis/get-global-retention.asciidoc[]

include::{es-ref-dir}/data-streams/lifecycle/apis/delete-global-retention.asciidoc[]

include::{es-ref-dir}/indices/downsample-data-stream.asciidoc[]

This file was deleted.

Loading

0 comments on commit 4712287

Please sign in to comment.