Skip to content

Commit b1964d7

Browse files
authored
Merge branch 'main' into fix_113049
2 parents 8690dba + cfe2507 commit b1964d7

File tree

1,039 files changed

+8607
-4707
lines changed

Some content is hidden

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

1,039 files changed

+8607
-4707
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:dd66beec64a7f9b19c6c35a1195153b2b630a55e16ec71949ed5187c5947eea1",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:bd401704a162a7937cd1015f755ca9da9aba0fdf967fc6bf90bf8d3f6b2eb557",
2626
"-wolfi",
2727
"apk"
2828
),

build-tools-internal/src/main/resources/changelog-schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@
291291
"JVM option",
292292
"Java API",
293293
"Logging",
294+
"Logs",
294295
"Mapping",
295296
"Packaging",
296297
"Painless",

catalog-info.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ spec:
123123
pipeline_file: .buildkite/pipelines/lucene-snapshot/build-snapshot.yml
124124
env:
125125
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
126-
SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
126+
SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
127127
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
128128
branch_configuration: lucene_snapshot
129129
default_branch: lucene_snapshot
@@ -167,7 +167,7 @@ spec:
167167
pipeline_file: .buildkite/pipelines/lucene-snapshot/update-branch.yml
168168
env:
169169
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
170-
SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
170+
SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
171171
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
172172
default_branch: lucene_snapshot
173173
teams:
@@ -210,7 +210,7 @@ spec:
210210
pipeline_file: .buildkite/pipelines/lucene-snapshot/run-tests.yml
211211
env:
212212
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
213-
SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
213+
SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
214214
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
215215
branch_configuration: lucene_snapshot
216216
default_branch: lucene_snapshot

docs/build.gradle

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,9 @@ buildRestTests.setups['library'] = '''
855855
856856
'''
857857
buildRestTests.setups['sensor_rollup_job'] = '''
858+
- requires:
859+
test_runner_features: [ "allowed_warnings" ]
860+
858861
- do:
859862
indices.create:
860863
index: dummy-rollup-index
@@ -885,9 +888,10 @@ buildRestTests.setups['sensor_rollup_job'] = '''
885888
node:
886889
type: keyword
887890
- do:
888-
raw:
889-
method: PUT
890-
path: _rollup/job/sensor
891+
allowed_warnings:
892+
- "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
893+
rollup.put_job:
894+
id: sensor
891895
body: >
892896
{
893897
"index_pattern": "sensor-*",
@@ -917,6 +921,9 @@ buildRestTests.setups['sensor_rollup_job'] = '''
917921
}
918922
'''
919923
buildRestTests.setups['sensor_started_rollup_job'] = '''
924+
- requires:
925+
test_runner_features: [ "allowed_warnings" ]
926+
920927
- do:
921928
indices.create:
922929
index: dummy-rollup-index
@@ -966,9 +973,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
966973
{"timestamp": 1516297294000, "temperature": 202, "voltage": 4.0, "node": "c"}
967974
968975
- do:
969-
raw:
970-
method: PUT
971-
path: _rollup/job/sensor
976+
allowed_warnings:
977+
- "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
978+
rollup.put_job:
979+
id: sensor
972980
body: >
973981
{
974982
"index_pattern": "sensor-*",
@@ -997,9 +1005,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
9971005
]
9981006
}
9991007
- do:
1000-
raw:
1001-
method: POST
1002-
path: _rollup/job/sensor/_start
1008+
allowed_warnings:
1009+
- "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
1010+
rollup.start_job:
1011+
id: sensor
10031012
'''
10041013

10051014
buildRestTests.setups['sensor_index'] = '''

docs/changelog/113131.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pr: 113131
2+
summary: Emit deprecation warning when executing one of the rollup APIs
3+
area: Rollup
4+
type: deprecation
5+
issues: []
6+
deprecation:
7+
title: Emit deprecation warning when executing one of the rollup APIs
8+
area: Rollup
9+
details: Rollup is already deprecated since 8.11.0 via documentation and since 8.15.0 it is no longer possible to create new rollup jobs in clusters without rollup usage. This change updates the rollup APIs to emit a deprecation warning.
10+
impact: Returning a deprecation warning when using one of the rollup APIs.

docs/changelog/116026.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pr: 116026
2+
summary: Change Elasticsearch timeouts to 429 response instead of 5xx
3+
area: Infra/Core
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Change most Elasticsearch timeouts to 429 response instead of 5xx
8+
area: REST API
9+
details: When a timeout occurs in most REST requests, whether via a per-request timeout, or a system default, the
10+
request would return a 5xx response code. The response code from those APIs when a timeout occurs is now 429.
11+
impact: Adjust any code relying on retrying on 5xx responses for timeouts to look for a 429 response code and
12+
inspect the response to determine whether a timeout occured.
13+
notable: false

docs/changelog/120064.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120064
2+
summary: Change the auditor to write via an alias
3+
area: Machine Learning
4+
type: upgrade
5+
issues: []

docs/changelog/120340.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120340
2+
summary: Add support for `extended_stats`
3+
area: Transform
4+
type: enhancement
5+
issues: []

docs/changelog/120542.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 120542
2+
summary: "Feat: add a user-configurable timeout parameter to the `_resolve/cluster`\
3+
\ API"
4+
area: Search
5+
type: enhancement
6+
issues: []

docs/changelog/120551.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120551
2+
summary: Set default reranker for text similarity reranker to Elastic reranker
3+
area: Ranking
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)