Skip to content

Commit

Permalink
Merge branch '8.x' into lucene_9_12_1
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisHegarty authored Dec 13, 2024
2 parents fcc563a + 8793efa commit 2772f09
Show file tree
Hide file tree
Showing 154 changed files with 2,843 additions and 1,284 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2", "8.17.0", "8.18.0"]
BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,8 @@ steps:
env:
BWC_VERSION: 8.14.3

- label: "{{matrix.image}} / 8.15.6 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.6
- label: "{{matrix.image}} / 8.15.5 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.5
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -575,7 +575,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.15.6
BWC_VERSION: 8.15.5

- label: "{{matrix.image}} / 8.16.2 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.2
Expand Down
10 changes: 5 additions & 5 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.15.6 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.6#bwcTest
- label: 8.15.5 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.5#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -639,7 +639,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.15.6
BWC_VERSION: 8.15.5
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -771,7 +771,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk17
BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2", "8.17.0", "8.18.0"]
BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down Expand Up @@ -819,7 +819,7 @@ steps:
- openjdk21
- openjdk22
- openjdk23
BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2", "8.17.0", "8.18.0"]
BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ BWC_VERSION:
- "8.12.2"
- "8.13.4"
- "8.14.3"
- "8.15.6"
- "8.15.5"
- "8.16.2"
- "8.17.0"
- "8.18.0"
1 change: 0 additions & 1 deletion .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
BWC_VERSION:
- "7.17.27"
- "8.15.6"
- "8.16.2"
- "8.17.0"
- "8.18.0"
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import org.gradle.api.Project;

import java.io.File;
import java.util.Arrays;
import java.util.Map;

/**
* This plugin configures formatting for Java source using Spotless
Expand Down Expand Up @@ -66,8 +64,7 @@ public void apply(Project project) {
java.importOrderFile(new File(elasticsearchWorkspace, importOrderPath));

// Most formatting is done through the Eclipse formatter
java.eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/"))
.configFile(new File(elasticsearchWorkspace, formatterConfigPath));
java.eclipse().configFile(new File(elasticsearchWorkspace, formatterConfigPath));

// Ensure blank lines are actually empty. Since formatters are applied in
// order, apply this one last, otherwise non-empty blank lines can creep
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,10 @@ allprojects {
if (project.path.contains(":distribution:docker")) {
enabled = false
}

if (project.path.contains(":libs:cli")) {
// ensure we resolve p2 dependencies for the spotless eclipse formatter
dependsOn "spotlessJavaCheck"
}
}

plugins.withId('lifecycle-base') {
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog/117839.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 117839
summary: Add match support for `semantic_text` fields
area: "Search"
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/118035.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 118035
summary: Include hidden indices in `DeprecationInfoAction`
area: Indices APIs
type: bug
issues:
- 118020
5 changes: 5 additions & 0 deletions docs/changelog/118102.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 118102
summary: "ESQL: Enterprise license enforcement for CCS"
area: ES|QL
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/118194.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 118194
summary: Retry on `ClusterBlockException` on transform destination index
area: Machine Learning
type: enhancement
issues: []
2 changes: 1 addition & 1 deletion docs/reference/docs/update.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=refresh]
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=routing]

`_source`::
(Optional, list) Set to `false` to disable source retrieval (default: `true`).
(Optional, list) Set to `true` to enable source retrieval (default: `false`).
You can also specify a comma-separated list of the fields you want to retrieve.

`_source_excludes`::
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/index-modules.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Index mode supports the following values:

`standard`::: Standard indexing with default settings.

`tsds`::: _(data streams only)_ Index mode optimized for storage of metrics. For more information, see <<tsds-index-settings>>.
`time_series`::: _(data streams only)_ Index mode optimized for storage of metrics. For more information, see <<tsds-index-settings>>.

`logsdb`::: _(data streams only)_ Index mode optimized for <<logs-data-stream,logs>>.

Expand Down
51 changes: 51 additions & 0 deletions docs/reference/migration/migrate_8_17.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,54 @@ coming::[8.17.0]

There are no breaking changes in {es} 8.17.


[discrete]
[[deprecated-8.17]]
=== Deprecations

The following functionality has been deprecated in {es} 8.17
and will be removed in a future version.
While this won't have an immediate impact on your applications,
we strongly encourage you to take the described steps to update your code
after upgrading to 8.17.

To find out if you are using any deprecated functionality,
enable <<deprecation-logging, deprecation logging>>.

[discrete]
[[deprecations_817_mapping]]
==== Mapping deprecations

[[deprecate_source_mode_in_mappings]]
.Deprecate `_source.mode` in mappings
[%collapsible]
====
*Details* +
Configuring `_source.mode` in mappings is deprecated and will be removed in future versions. Use `index.mapping.source.mode` index setting instead.
*Impact* +
Use `index.mapping.source.mode` index setting instead
====

[discrete]
[[deprecations_817_rest_api]]
==== REST API deprecations

[[format_of_non_detailed_error_responses_changing_in_v9]]
.The format of non-detailed error responses is changing in v9
[%collapsible]
====
*Details* +
When an error occurs when processing a request, Elasticsearch returns information on that error in the REST response.
If `http:detailed_errors.enabled: false` is specified in node settings with the v8 REST API and below,
the format of this response changes significantly.
Starting with the v9 REST API, the JSON structure of responses with errors when the `http.detailed_errors.enabled: false` option is set
will be the same as when detailed errors are enabled (which is the default).
To keep using the existing format for non-detailed error responses, use the v8 REST API.
*Impact* +
If you have set `http.detailed_errors.enabled: false` (the default is `true`)
the structure of JSON when any exceptions occur will change with the v9 REST API.
To keep using the existing format, use the v8 REST API.
====

2 changes: 0 additions & 2 deletions docs/reference/release-notes/8.16.0.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ ES|QL::
* Push down filters even in case of renames in Evals {es-pull}114411[#114411]
* Speed up CASE for some parameters {es-pull}112295[#112295]
* Speed up grouping by bytes {es-pull}114021[#114021]
* Support INLINESTATS grouped on expressions {es-pull}111690[#111690]
* Use less memory in listener {es-pull}114358[#114358]
* Add support for cached strings in plan serialization {es-pull}112929[#112929]
* Add Telemetry API and track top functions {es-pull}111226[#111226]
Expand Down Expand Up @@ -462,7 +461,6 @@ ES|QL::
* Add boolean support to Max and Min aggs {es-pull}110527[#110527]
* Add boolean support to TOP aggregation {es-pull}110718[#110718]
* Added `mv_percentile` function {es-pull}111749[#111749] (issue: {es-issue}111591[#111591])
* INLINESTATS {es-pull}109583[#109583] (issue: {es-issue}107589[#107589])
* Introduce per agg filter {es-pull}113735[#113735]
* Strings support for MAX and MIN aggregations {es-pull}111544[#111544]
* Support IP fields in MAX and MIN aggregations {es-pull}110921[#110921]
Expand Down
Loading

0 comments on commit 2772f09

Please sign in to comment.