Skip to content

Commit ee494ba

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents 2e3a22d + f6d3a2c commit ee494ba

File tree

381 files changed

+10526
-2730
lines changed

Some content is hidden

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

381 files changed

+10526
-2730
lines changed

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
3+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.12
1+
8.12.1

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/README.asciidoc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,15 @@ used for its modifiers:
157157
* `// TESTRESPONSE[skip:reason]`: Skip the assertions specified by this
158158
response.
159159
* `// TESTSETUP`: Marks this snippet as the "setup" for all other snippets in
160-
this file. This is a somewhat natural way of structuring documentation. You
161-
say "this is the data we use to explain this feature" then you add the
162-
snippet that you mark `// TESTSETUP` and then every snippet will turn into
163-
a test that runs the setup snippet first. See the "painless" docs for a file
164-
that puts this to good use. This is fairly similar to `// TEST[setup:name]`
165-
but rather than the setup defined in `docs/build.gradle` the setup is defined
166-
right in the documentation file. In general, we should prefer `// TESTSETUP`
167-
over `// TEST[setup:name]` because it makes it more clear what steps have to
168-
be taken before the examples will work. Tip: `// TESTSETUP` can only be used
169-
on the first snippet of a document.
160+
this file. In order to enhance clarity and simplify understanding for readers,
161+
a straightforward approach involves marking the first snippet in the documentation file with the
162+
`// TESTSETUP` marker. By doing so, it clearly indicates that this particular snippet serves as the setup
163+
or preparation step for all subsequent snippets in the file.
164+
This helps in explaining the necessary steps that need to be executed before running the examples.
165+
Unlike the alternative convention `// TEST[setup:name]`, which relies on a setup defined in a separate file,
166+
this convention brings the setup directly into the documentation file, making it more self-contained and reducing ambiguity.
167+
By adopting this convention, users can easily identify and follow the correct sequence
168+
of steps to ensure that the examples provided in the documentation work as intended.
170169
* `// TEARDOWN`: Ends and cleans up a test series started with `// TESTSETUP` or
171170
`// TEST[setup:name]`. You can use `// TEARDOWN` to set up multiple tests in
172171
the same file.

docs/build.gradle

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
120120
// TODO: remove this once cname is prepended to transport.publish_address by default in 8.0
121121
systemProperty 'es.transport.cname_in_publish_address', 'true'
122122

123-
systemProperty 'es.queryable_built_in_roles_enabled', 'false'
124123

125124
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
126125
requiresFeature 'es.failure_store_feature_flag_enabled', Version.fromString("8.12.0")
@@ -856,6 +855,9 @@ buildRestTests.setups['library'] = '''
856855
857856
'''
858857
buildRestTests.setups['sensor_rollup_job'] = '''
858+
- requires:
859+
test_runner_features: [ "allowed_warnings" ]
860+
859861
- do:
860862
indices.create:
861863
index: dummy-rollup-index
@@ -886,9 +888,10 @@ buildRestTests.setups['sensor_rollup_job'] = '''
886888
node:
887889
type: keyword
888890
- do:
889-
raw:
890-
method: PUT
891-
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
892895
body: >
893896
{
894897
"index_pattern": "sensor-*",
@@ -918,6 +921,9 @@ buildRestTests.setups['sensor_rollup_job'] = '''
918921
}
919922
'''
920923
buildRestTests.setups['sensor_started_rollup_job'] = '''
924+
- requires:
925+
test_runner_features: [ "allowed_warnings" ]
926+
921927
- do:
922928
indices.create:
923929
index: dummy-rollup-index
@@ -967,9 +973,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
967973
{"timestamp": 1516297294000, "temperature": 202, "voltage": 4.0, "node": "c"}
968974
969975
- do:
970-
raw:
971-
method: PUT
972-
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
973980
body: >
974981
{
975982
"index_pattern": "sensor-*",
@@ -998,9 +1005,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
9981005
]
9991006
}
10001007
- do:
1001-
raw:
1002-
method: POST
1003-
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
10041012
'''
10051013

10061014
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/120222.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120222
2+
summary: Adding linear retriever to support weighted sums of sub-retrievers
3+
area: "Search"
4+
type: enhancement
5+
issues: []

docs/changelog/120291.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120291
2+
summary: ESQL - Allow full text functions disjunctions for non-full text functions
3+
area: ES|QL
4+
type: feature
5+
issues: []

docs/changelog/120527.yaml

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

0 commit comments

Comments
 (0)