Skip to content

Commit 3539843

Browse files
authored
Merge branch '8.x' into backport/8.x/pr-120291
2 parents f690656 + ff4f9d7 commit 3539843

File tree

83 files changed

+1599
-322
lines changed

Some content is hidden

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

83 files changed

+1599
-322
lines changed
Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
config:
22
allow-labels: test-release
33
steps:
4-
- label: release-tests
5-
command: .buildkite/scripts/release-tests.sh
6-
timeout_in_minutes: 300
7-
agents:
8-
provider: gcp
9-
image: family/elasticsearch-ubuntu-2004
10-
diskSizeGb: 350
11-
machineType: custom-32-98304
4+
- group: release-tests
5+
steps:
6+
- label: "{{matrix.CHECK_TASK}} / release-tests"
7+
key: "packaging-tests-unix"
8+
command: .buildkite/scripts/release-tests.sh {{matrix.CHECK_TASK}}
9+
timeout_in_minutes: 120
10+
matrix:
11+
setup:
12+
CHECK_TASK:
13+
- checkPart1
14+
- checkPart2
15+
- checkPart3
16+
- checkPart4
17+
- checkPart5
18+
agents:
19+
provider: gcp
20+
image: family/elasticsearch-ubuntu-2004
21+
diskSizeGb: 350
22+
machineType: custom-32-98304

.buildkite/scripts/release-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/m
2020
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT.zip
2121

2222
.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
23-
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef assemble functionalTests
23+
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef ${@:-functionalTests}

build.gradle

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,57 @@ allprojects {
296296
}
297297
}
298298

299+
ext.withReleaseBuild = { Closure config ->
300+
if(buildParams.snapshotBuild == false) {
301+
config.call()
302+
}
303+
}
304+
299305
plugins.withId('lifecycle-base') {
300306
if (project.path.startsWith(":x-pack:")) {
301307
if (project.path.contains("security") || project.path.contains(":ml")) {
302-
tasks.register('checkPart4') { dependsOn 'check' }
303-
} else if (project.path == ":x-pack:plugin" || project.path.contains("ql") || project.path.contains("smoke-test")) {
304-
tasks.register('checkPart3') { dependsOn 'check' }
308+
tasks.register('checkPart4') {
309+
dependsOn 'check'
310+
withReleaseBuild {
311+
dependsOn 'assemble'
312+
}
313+
}
314+
} else if (project.path == ":x-pack:plugin" || project.path.contains("ql") || project.path.contains("smoke-test")) {
315+
tasks.register('checkPart3') {
316+
dependsOn 'check'
317+
withReleaseBuild {
318+
dependsOn 'assemble'
319+
}
320+
}
305321
} else if (project.path.contains("multi-node")) {
306-
tasks.register('checkPart5') { dependsOn 'check' }
322+
tasks.register('checkPart5') {
323+
dependsOn 'check'
324+
withReleaseBuild {
325+
dependsOn 'assemble'
326+
}
327+
}
307328
} else {
308-
tasks.register('checkPart2') { dependsOn 'check' }
329+
tasks.register('checkPart2') {
330+
dependsOn 'check'
331+
withReleaseBuild {
332+
dependsOn 'assemble'
333+
}
334+
}
309335
}
310336
} else {
311-
tasks.register('checkPart1') { dependsOn 'check' }
337+
tasks.register('checkPart1') {
338+
dependsOn 'check'
339+
withReleaseBuild {
340+
dependsOn 'assemble'
341+
}
342+
}
343+
}
344+
tasks.register('functionalTests') {
345+
dependsOn 'check'
346+
withReleaseBuild {
347+
dependsOn 'assemble'
348+
}
312349
}
313-
314-
tasks.register('functionalTests') { dependsOn 'check' }
315350
}
316351

317352
/*

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/changelog/120483.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120483
2+
summary: Fix NPE on disabled API auth key cache
3+
area: Authentication
4+
type: bug
5+
issues: []

docs/changelog/120725.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 120725
2+
summary: |-
3+
A new query parameter `?include_source_on_error` was added for create / index, update and bulk REST APIs to control
4+
if to include the document source in the error response in case of parsing errors. The default value is `true`.
5+
area: Infra/REST API
6+
type: enhancement
7+
issues: []

docs/changelog/120727.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 120727
2+
summary: Esql - Support date nanos in date extract function
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 110000

docs/reference/esql/functions/kibana/definition/date_extract.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/types/date_extract.asciidoc

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-dsl/match-phrase-query.asciidoc

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,45 @@ GET /_search
1919
}
2020
--------------------------------------------------
2121

22+
[[match-phrase-field-params]]
23+
==== Parameters for `<field>`
24+
`query`::
25+
+
26+
--
27+
(Required) Text, number, boolean value or date you wish to find in the provided
28+
`<field>`.
29+
--
30+
31+
`analyzer`::
32+
(Optional, string) <<analysis,Analyzer>> used to convert the text in the `query`
33+
value into tokens. Defaults to the <<specify-index-time-analyzer,index-time
34+
analyzer>> mapped for the `<field>`. If no analyzer is mapped, the index's
35+
default analyzer is used.
36+
37+
`slop`::
38+
(Optional, integer) Maximum number of positions allowed between matching tokens.
39+
Defaults to `0`. Transposed terms have a slop of `2`.
40+
41+
`zero_terms_query`::
42+
+
43+
--
44+
(Optional, string) Indicates whether no documents are returned if the `analyzer`
45+
removes all tokens, such as when using a `stop` filter. Valid values are:
46+
47+
`none` (Default)::
48+
No documents are returned if the `analyzer` removes all tokens.
49+
50+
`all`::
51+
Returns all documents, similar to a <<query-dsl-match-all-query,`match_all`>>
52+
query.
53+
--
54+
2255
A phrase query matches terms up to a configurable `slop`
2356
(which defaults to 0) in any order. Transposed terms have a slop of 2.
2457

58+
[[query-dsl-match-query-phrase-analyzer]]
59+
===== Analyzer in the match phrase query
60+
2561
The `analyzer` can be set to control which analyzer will perform the
2662
analysis process on the text. It defaults to the field explicit mapping
2763
definition, or the default search analyzer, for example:
@@ -40,5 +76,3 @@ GET /_search
4076
}
4177
}
4278
--------------------------------------------------
43-
44-
This query also accepts `zero_terms_query`, as explained in <<query-dsl-match-query, `match` query>>.

0 commit comments

Comments
 (0)