Merge branch '8.16' into bp-816-115477

.buildkite/pipelines/intake.yml

@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2"]
+            BWC_VERSION: ["7.17.27", "8.16.2"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -559,8 +559,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:
@@ -573,7 +573,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

.buildkite/pipelines/periodic.yml

@@ -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
@@ -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"
@@ -733,7 +733,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2"]
+            BWC_VERSION: ["7.17.27", "8.16.2"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -781,7 +781,7 @@ steps:
               - openjdk21
               - openjdk22
               - openjdk23
-            BWC_VERSION: ["7.17.27", "8.15.6", "8.16.2"]
+            BWC_VERSION: ["7.17.27", "8.16.2"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

@@ -32,5 +32,5 @@ BWC_VERSION:
   - "8.12.2"
   - "8.13.4"
   - "8.14.3"
-  - "8.15.6"
+  - "8.15.5"
   - "8.16.2"

.ci/snapshotBwcVersions

@@ -1,4 +1,3 @@
 BWC_VERSION:
   - "7.17.27"
-  - "8.15.6"
   - "8.16.2"

branches.json

@@ -13,9 +13,6 @@
     {
       "branch": "8.x"
     },
-    {
-      "branch": "8.15"
-    },
     {
       "branch": "7.17"
     }

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

@@ -27,8 +27,7 @@ public enum DockerBase {
     // Chainguard based wolfi image with latest jdk
     // This is usually updated via renovatebot
     // spotless:off
-    WOLFI(
-        "docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
+    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:1b51ff6dba78c98d3e02b0cd64a8ce3238c7a40408d21e3af12a329d44db6f23",
         "-wolfi",
         "apk"
     ),

docs/Versions.asciidoc

@@ -9,6 +9,7 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
 :docker-repo:       docker.elastic.co/elasticsearch/elasticsearch
 :docker-image:      {docker-repo}:{version}
+:docker-wolfi-image: {docker-repo}-wolfi:{version}
 :kib-docker-repo:   docker.elastic.co/kibana/kibana
 :kib-docker-image:  {kib-docker-repo}:{version}
 :plugin_url:      https://artifacts.elastic.co/downloads/elasticsearch-plugins

docs/changelog/117469.yaml

@@ -0,0 +1,6 @@
+pr: 117469
+summary: Handle exceptions in query phase can match
+area: Search
+type: bug
+issues:
+ - 104994

docs/changelog/118684.yaml

@@ -0,0 +1,8 @@
+pr: 118684
+summary: |-
+    In this release we've introduced an image based on the hardened link:https://github.com/wolfi-dev/[Wolfi] 
+    image to provide secure containers to our self-managed customers, help with compliance regulations, 
+    and improve our supply chain security posture.
+area: Packaging
+type: enhancement
+issues: []

docs/reference/release-notes.asciidoc

@@ -6,6 +6,7 @@
 
 This section summarizes the changes in each release.
 
+* <<release-notes-8.16.2>>
 * <<release-notes-8.16.1>>
 * <<release-notes-8.16.0>>
 * <<release-notes-8.15.5>>
@@ -77,6 +78,7 @@ This section summarizes the changes in each release.
 
 --
 
+include::release-notes/8.16.2.asciidoc[]
 include::release-notes/8.16.1.asciidoc[]
 include::release-notes/8.16.0.asciidoc[]
 include::release-notes/8.15.5.asciidoc[]

docs/reference/release-notes/8.16.0.asciidoc

@@ -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]
@@ -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]

docs/reference/release-notes/8.16.2.asciidoc

@@ -0,0 +1,65 @@
+[[release-notes-8.16.2]]
+== {es} version 8.16.2
+
+coming[8.16.2]
+
+Also see <<breaking-changes-8.16,Breaking changes in 8.16>>.
+
+[[bug-8.16.2]]
+[float]
+=== Bug fixes
+
+CCS::
+* Fix long metric deserialize & add - auto-resize needs to be set manually {es-pull}117105[#117105] (issue: {es-issue}116914[#116914])
+
+Data streams::
+* Acquire stats searcher for data stream stats {es-pull}117953[#117953]
+
+ES|QL::
+* ESQL: fix the column position in errors {es-pull}117153[#117153]
+* Fix BWC for ES|QL cluster request {es-pull}117865[#117865]
+* Fix CCS exchange when multi cluster aliases point to same cluster {es-pull}117297[#117297]
+* Fix COUNT filter pushdown {es-pull}117503[#117503] (issue: {es-issue}115522[#115522])
+* Fix validation of SORT by aggregate functions {es-pull}117316[#117316]
+* Opt into extra data stream resolution {es-pull}118378[#118378]
+
+Ingest Node::
+* Fix enrich cache size setting name {es-pull}117575[#117575]
+* Fix log message format bugs {es-pull}118354[#118354]
+* Fix reconstituting version string from components {es-pull}117213[#117213] (issue: {es-issue}116950[#116950])
+
+License::
+* Distinguish `LicensedFeature` by family field {es-pull}116809[#116809]
+
+Logs::
+* Prohibit changes to index mode, source, and sort settings during resize {es-pull}115812[#115812]
+
+Machine Learning::
+* Fix deberta tokenizer bug caused by bug in normalizer {es-pull}117189[#117189]
+* Fix for Deberta tokenizer when input sequence exceeds 512 tokens {es-pull}117595[#117595]
+* Propagate scoring function through random sampler {es-pull}116957[#116957] (issue: {es-issue}110134[#110134])
+* Update Deberta tokenizer {es-pull}116358[#116358]
+
+Mapping::
+* Restore original "is within leaf" value in `SparseVectorFieldMapper` {es-pull}118380[#118380]
+
+Ranking::
+* Fix for propagating filters from compound to inner retrievers {es-pull}117914[#117914]
+
+Search::
+* Don't skip shards in coord rewrite if timestamp is an alias {es-pull}117271[#117271]
+* Handle exceptions in query phase can match {es-pull}117469[#117469] (issue: {es-issue}104994[#104994])
+
+[[enhancement-8.16.2]]
+[float]
+=== Enhancements
+
+Inference::
+* [8.16] Update sparse text embeddings API route for Inference Service {es-pull}118367[#118367]
+
+Packaging::
+* In this release we've introduced an image based on the hardened link:https://github.com/wolfi-dev/[Wolfi] 
+image to provide secure containers to our self-managed customers, help with compliance regulations, 
+and improve our supply chain security posture. {es-pull}118684[#118684]
+
+

docs/reference/setup/install/docker.asciidoc

@@ -55,6 +55,12 @@ docker pull {docker-image}
 // REVIEWED[DEC.10.24]
 --
 
+Alternatevely, you can use the Wolfi based image. Using Wolfi based images requires Docker version 20.10.10 or superior.
+[source,sh,subs="attributes"]
+----
+docker pull {docker-wolfi-image}
+----
+
 . Optional: Install
 https://docs.sigstore.dev/cosign/system_config/installation/[Cosign] for your
 environment. Then use Cosign to verify the {es} image's signature.

server/src/main/java/org/elasticsearch/Version.java

@@ -190,7 +190,6 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_15_3 = new Version(8_15_03_99);
     public static final Version V_8_15_4 = new Version(8_15_04_99);
     public static final Version V_8_15_5 = new Version(8_15_05_99);
-    public static final Version V_8_15_6 = new Version(8_15_06_99);
     public static final Version V_8_16_0 = new Version(8_16_00_99);
     public static final Version V_8_16_1 = new Version(8_16_01_99);
     public static final Version V_8_16_2 = new Version(8_16_02_99);