elastic · Jun 6, 2023 · Jun 6, 2023 · Jun 6, 2023 · Jun 7, 2023 · Jun 7, 2023
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,7 +3,7 @@
   "targetBranchChoices" : [ "main", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
   "targetPRLabels" : [ "backport" ],
   "branchLabelMapping" : {
-    "^v8.8.1$" : "main",
+    "^v8.8.2$" : "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
 }
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -89,3 +89,4 @@ BWC_VERSION:
   - "8.7.1"
   - "8.8.0"
   - "8.8.1"
+  - "8.8.2"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,3 +1,3 @@
 BWC_VERSION:
   - "7.17.11"
-  - "8.8.1"
+  - "8.8.2"
diff --git a/...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JarApiComparisonTask.java b/...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JarApiComparisonTask.java
@@ -14,6 +14,7 @@
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.CompileClasspath;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.internal.jvm.Jvm;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -127,7 +128,7 @@ public List<String> disassembleFromJar(String fileInJarPath, String classpath) {
         static List<String> disassemble(String location, String modulePath, String classpath) {
             ProcessBuilder pb = new ProcessBuilder();
             List<String> command = new ArrayList<>();
-            command.add("javap");
+            command.add(Jvm.current().getExecutable("javap").getPath());
             if (modulePath != null) {
                 command.add("--module-path");
                 command.add(modulePath);

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,4 +1,4 @@
-elasticsearch     = 8.8.1
+elasticsearch     = 8.8.2
 lucene            = 9.6.0
 
 bundled_jdk_vendor = openjdk

diff --git a/docs/build.gradle b/docs/build.gradle
@@ -65,6 +65,13 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
     keystorePassword 'keystore-password'
   }
 
+  // debug ccr test failures:
+  // https://github.com/elastic/elasticsearch/issues/95678
+  // https://github.com/elastic/elasticsearch/issues/94359
+  // https://github.com/elastic/elasticsearch/issues/96561
+  setting 'logger.org.elasticsearch.transport.SniffConnectionStrategy', 'DEBUG'
+  setting 'logger.org.elasticsearch.transport.RemoteClusterService', 'DEBUG'
+
   // enable regexes in painless so our tests don't complain about example snippets that use them
   setting 'script.painless.regex.enabled', 'true'
   setting 'xpack.security.enabled', 'false'

diff --git a/docs/changelog/96035.yaml b/docs/changelog/96035.yaml
diff --git a/docs/changelog/96243.yaml b/docs/changelog/96243.yaml
@@ -0,0 +1,5 @@
+pr: 96243
+summary: Support dotted field notations in the reroute processor
+area: Ingest Node
+type: bug
+issues: []
diff --git a/docs/changelog/96265.yaml b/docs/changelog/96265.yaml
diff --git a/docs/changelog/96286.yaml b/docs/changelog/96286.yaml
diff --git a/docs/changelog/96293.yaml b/docs/changelog/96293.yaml
diff --git a/docs/changelog/96317.yaml b/docs/changelog/96317.yaml
diff --git a/docs/changelog/96432.yaml b/docs/changelog/96432.yaml
diff --git a/docs/changelog/96461.yaml b/docs/changelog/96461.yaml
diff --git a/docs/changelog/96494.yaml b/docs/changelog/96494.yaml
diff --git a/docs/changelog/96540.yaml b/docs/changelog/96540.yaml
@@ -0,0 +1,6 @@
+pr: 96540
+summary: Fix translation of queries involving Version vals
+area: SQL
+type: bug
+issues:
+ - 96509
diff --git a/docs/changelog/96606.yaml b/docs/changelog/96606.yaml
@@ -0,0 +1,6 @@
+pr: 96606
+summary: The get data stream api incorrectly prints warning log for upgraded tsdb
+  data streams
+area: TSDB
+type: bug
+issues: []
diff --git a/docs/changelog/96668.yaml b/docs/changelog/96668.yaml
@@ -0,0 +1,6 @@
+pr: 96668
+summary: Fix iteration of empty percentiles throwing Null Pointer Exception
+area: Aggregations
+type: bug
+issues:
+ - 96626
diff --git a/docs/changelog/96738.yaml b/docs/changelog/96738.yaml
@@ -0,0 +1,5 @@
+pr: 96738
+summary: Ensure NLP model inference queue is always cleared after shutdown or failure
+area: Machine Learning
+type: bug
+issues: []
diff --git a/docs/changelog/96782.yaml b/docs/changelog/96782.yaml
@@ -0,0 +1,5 @@
+pr: 96782
+summary: Increase concurrent request of opening point-in-time
+area: Search
+type: bug
+issues: []
diff --git a/docs/changelog/96785.yaml b/docs/changelog/96785.yaml
@@ -0,0 +1,6 @@
+pr: 96785
+summary: Adding null check to fix potential NPE
+area: Transform
+type: enhancement
+issues:
+  - 96781
diff --git a/docs/changelog/96821.yaml b/docs/changelog/96821.yaml
@@ -0,0 +1,6 @@
+pr: 96821
+summary: Change rollup thread pool settings
+area: TSDB
+type: enhancement
+issues:
+ - 96758
diff --git a/docs/changelog/96843.yaml b/docs/changelog/96843.yaml
@@ -0,0 +1,6 @@
+pr: 96843
+summary: Uses `ClusterSettings` instead of Node `Settings` in `HealthMetadataService`
+area: Health
+type: bug
+issues:
+ - 96219
diff --git a/docs/reference/aggregations/bucket/rare-terms-aggregation.asciidoc b/docs/reference/aggregations/bucket/rare-terms-aggregation.asciidoc
@@ -79,7 +79,7 @@ A `rare_terms` aggregation looks like this in isolation:
 |`field` |The field we wish to find rare terms in |Required |
 |`max_doc_count` |The maximum number of documents a term should appear in. |Optional |`1`
 |`precision` |The precision of the internal CuckooFilters. Smaller precision leads to
-better approximation, but higher memory usage. Cannot be smaller than `0.00001` |Optional |`0.01`
+better approximation, but higher memory usage. Cannot be smaller than `0.00001` |Optional |`0.001`
 |`include` |Terms that should be included in the aggregation|Optional |
 |`exclude` |Terms that should be excluded from the aggregation|Optional |
 |`missing` |The value that should be used if a document does not have the field being aggregated|Optional |
@@ -352,4 +352,4 @@ that require `depth_first`. In particular, scoring sub-aggregations that are ins
 in `depth_first` mode. This will throw an exception since RareTerms is unable to process `depth_first`.
 
 As a concrete example, if `rare_terms` aggregation is the child of a `nested` aggregation, and one of the child aggregations of `rare_terms`
-needs document scores (like a `top_hits` aggregation), this will throw an exception.
+needs document scores (like a `top_hits` aggregation), this will throw an exception.
diff --git a/docs/reference/aggregations/metrics/top-metrics-aggregation.asciidoc b/docs/reference/aggregations/metrics/top-metrics-aggregation.asciidoc
@@ -142,6 +142,78 @@ Which returns:
 ----
 // TESTRESPONSE
 
+
+==== `missing`
+
+The `missing` parameter defines how documents with a missing value are treated. 
+By default, if any of the key components are missing, the entire document is 
+ignored. It is possible to treat the missing components as if they had a value 
+by using the `missing` parameter.
+
+[source,console]
+----
+PUT /my-index
+{
+  "mappings": {
+    "properties": {
+      "nr":    { "type": "integer" },  
+      "state":  { "type": "keyword"  } <1>
+    }
+  }
+}
+POST /my-index/_bulk?refresh
+{"index": {}}
+{"nr": 1, "state": "started"}
+{"index": {}}
+{"nr": 2, "state": "stopped"}
+{"index": {}}
+{"nr": 3, "state": "N/A"}
+{"index": {}}
+{"nr": 4} <2>
+POST /my-index/_search?filter_path=aggregations
+{
+  "aggs": {
+    "my_top_metrics": {
+      "top_metrics": {
+        "metrics": {
+          "field": "state",
+          "missing": "N/A"}, <3>
+        "sort": {"nr": "desc"}
+      }
+    }
+  }
+}
+----
+
+<1> If you want to use an aggregation on textual content, it must be a `keyword`
+type field or you must enable fielddata on that field.
+<2> This document has a missing `state` field value.
+<3> The `missing` parameter defines that if `state` field has a missing value, 
+it should be treated as if it had the `N/A` value. 
+
+The request results in the following response:
+
+[source,console-result]
+----
+{
+  "aggregations": {
+    "my_top_metrics": {
+      "top": [
+        {
+          "sort": [
+            4
+          ],
+          "metrics": {
+            "state": "N/A"
+          }
+        }
+      ]
+    }
+  }
+}
+----
+
+
 ==== `size`
 
 `top_metrics` can return the top few document's worth of metrics using the size parameter:

diff --git a/docs/reference/analysis/normalizers.asciidoc b/docs/reference/analysis/normalizers.asciidoc
@@ -11,7 +11,7 @@ following: `arabic_normalization`, `asciifolding`, `bengali_normalization`,
 `cjk_width`, `decimal_digit`, `elision`, `german_normalization`,
 `hindi_normalization`, `indic_normalization`, `lowercase`,
 `persian_normalization`, `scandinavian_folding`, `serbian_normalization`,
-`sorani_normalization`, `uppercase`.
+`sorani_normalization`, `trim`, `uppercase`.
 
 Elasticsearch ships with a `lowercase` built-in normalizer. For other forms of
 normalization a custom configuration is required.

diff --git a/docs/reference/behavioral-analytics/apis/delete-analytics-collection.asciidoc b/docs/reference/behavioral-analytics/apis/delete-analytics-collection.asciidoc
@@ -2,6 +2,8 @@
 [[delete-analytics-collection]]
 === Delete Analytics Collection
 
+beta::[]
+
 ++++
 <titleabbrev>Delete Analytics Collection</titleabbrev>
 ++++

diff --git a/docs/reference/behavioral-analytics/apis/index.asciidoc b/docs/reference/behavioral-analytics/apis/index.asciidoc
@@ -1,6 +1,8 @@
 [[behavioral-analytics-apis]]
 == Behavioral Analytics APIs
 
+beta::[]
+
 ++++
 <titleabbrev>Behavioral Analytics APIs</titleabbrev>
 ++++

diff --git a/docs/reference/behavioral-analytics/apis/list-analytics-collection.asciidoc b/docs/reference/behavioral-analytics/apis/list-analytics-collection.asciidoc
@@ -2,6 +2,8 @@
 [[list-analytics-collection]]
 === List Analytics Collections
 
+beta::[]
+
 ++++
 <titleabbrev>List Analytics Collections</titleabbrev>
 ++++

diff --git a/docs/reference/behavioral-analytics/apis/post-analytics-collection-event.asciidoc b/docs/reference/behavioral-analytics/apis/post-analytics-collection-event.asciidoc
@@ -2,6 +2,8 @@
 [[post-analytics-collection-event]]
 === Post Event to an Analytics Collection
 
+beta::[]
+
 ++++
 <titleabbrev>Post Analytics Collection Event</titleabbrev>
 ++++

diff --git a/docs/reference/behavioral-analytics/apis/put-analytics-collection.asciidoc b/docs/reference/behavioral-analytics/apis/put-analytics-collection.asciidoc
@@ -2,6 +2,8 @@
 [[put-analytics-collection]]
 === Put Analytics Collection
 
+beta::[]
+
 ++++
 <titleabbrev>Put Analytics Collection</titleabbrev>
 ++++

diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc
@@ -6,6 +6,7 @@
 
 This section summarizes the changes in each release.
 
+* <<release-notes-8.8.1>>
 * <<release-notes-8.8.0>>
 * <<release-notes-8.7.1>>
 * <<release-notes-8.7.0>>
@@ -42,6 +43,7 @@ This section summarizes the changes in each release.
 
 --
 
+include::release-notes/8.8.1.asciidoc[]
 include::release-notes/8.8.0.asciidoc[]
 include::release-notes/8.7.1.asciidoc[]
 include::release-notes/8.7.0.asciidoc[]

diff --git a/docs/reference/release-notes/8.8.0.asciidoc b/docs/reference/release-notes/8.8.0.asciidoc
@@ -178,6 +178,7 @@ Ingest Node::
 Machine Learning::
 * Add `_meta` field to data frame analytics config {es-pull}94529[#94529]
 * Add `embedding_size` to text embedding config {es-pull}95176[#95176]
+* Anomaly score explanation for rare detector {ml-pull}2449[#2449]
 * Include model definition install status for Pytorch models {es-pull}95271[#95271]
 * Integrate ELSER model download into put trained model API {es-pull}95281[#95281]
 * Start, stop and infer of a trained model can now optionally use a deployment ID that is different to the model ID {es-pull}95168[#95168]

diff --git a/docs/reference/release-notes/8.8.1.asciidoc b/docs/reference/release-notes/8.8.1.asciidoc
@@ -0,0 +1,34 @@
+[[release-notes-8.8.1]]
+== {es} version 8.8.1
+
+Also see <<breaking-changes-8.8,Breaking changes in 8.8>>.
+
+[[bug-8.8.1]]
+[float]
+=== Bug fixes
+
+Data streams::
+* Allow the removal of an in-use template if there are other ones matching the dependent data streams {es-pull}96286[#96286]
+
+Geo::
+* API rest compatibility for type parameter in `geo_bounding_box` query {es-pull}96317[#96317]
+
+Rollup::
+* Do not copy `index.default_pipeline` and `index.final_pipeline` {es-pull}96494[#96494] (issue: {es-issue}96478[#96478])
+
+TSDB::
+* Expand start and end time to nanoseconds during coordinator rewrite when needed {es-pull}96035[#96035] (issue: {es-issue}96030[#96030])
+* Fix NPE when indexing a document that just has been deleted in a tsdb index {es-pull}96461[#96461]
+
+Transform::
+* Improve error message on transform `_update` conflict {es-pull}96432[#96432]
+* Report version conflict on concurrent updates {es-pull}96293[#96293] (issue: {es-issue}96311[#96311])
+
+[[enhancement-8.8.1]]
+[float]
+=== Enhancements
+
+Query Languages::
+* Reduce nesting of same bool queries {es-pull}96265[#96265] (issue: {es-issue}96236[#96236])
+
+
-Original file line number
+Diff line change
@@ @@ -89,3 +89,4 @@ BWC_VERSION: @@
       - "8.7.1"
       - "8.8.0"
       - "8.8.1"
+      - "8.8.2"