Merge branch 'main' into remove-reserved-state

Author: prdoyle

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -76,7 +76,7 @@ public void setup() {
             Locale.US,
             null,
             null,
-            new QueryPragmas(Settings.EMPTY),
+            QueryPragmas.EMPTY,
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_MAX_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
             "",

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -56,6 +56,7 @@
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;
 import org.elasticsearch.xpack.esql.planner.Layout;
+import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -358,7 +359,7 @@ private static Configuration configuration() {
             Locale.ROOT,
             null,
             null,
-            null,
+            QueryPragmas.EMPTY,
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_MAX_SIZE.get(Settings.EMPTY),
             AnalyzerSettings.QUERY_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY),
             null,

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

@@ -53,6 +53,7 @@ public class InternalDistributionModuleCheckTaskProvider {
         "org.elasticsearch.base",
         "org.elasticsearch.cli",
         "org.elasticsearch.entitlement",
+        "org.elasticsearch.exponentialhistogram",
         "org.elasticsearch.geo",
         "org.elasticsearch.grok",
         "org.elasticsearch.logging",

docs/changelog/135961.yaml

@@ -0,0 +1,5 @@
+pr: 135961
+summary: Late materialization of dimension fields in time-series
+area: TSDB
+type: enhancement
+issues: []

docs/changelog/136541.yaml

@@ -0,0 +1,6 @@
+pr: 136541
+summary: Multiple patterns for grok command
+area: ES|QL
+type: enhancement
+issues:
+ - 132486

docs/changelog/136650.yaml

@@ -0,0 +1,5 @@
+pr: 136709
+summary: Fix log formatting in `SnapshotLifecycleTask`
+area: ILM+SLM
+type: bug
+issues: []

docs/changelog/136709.yaml

@@ -0,0 +1,6 @@
+pr: 136751
+summary: Adjust jinaai rerank response parser to handle document field as string or
+  object
+area: Machine Learning
+type: bug
+issues: []

docs/changelog/136751.yaml

@@ -131,6 +131,7 @@ Elastic provides a Grade plugin, `elasticsearch.stable-esplugin`, that makes it
       "filter":  ["hello_world"]
     }
     ```
+    % TEST[skip:would require this plugin to be installed]
 
 
 
@@ -162,6 +163,7 @@ If you are using the `elasticsearch.stable-esplugin` plugin for Gradle, you can
         }
     }
     ```
+    % NOTCONSOLE
 
 4. In `src/yamlRestTest/resources/rest-api-spec/test/plugin`, create the `10_token_filter.yml` YAML file:
 

docs/extend/example-text-analysis-plugin.md

@@ -168,19 +168,23 @@ Lets say that documents 1 and 3 end up on shard A and documents 2 and 4 end up o
 This is run once on each shard before any document collection is performed, and so we will have a copy on each shard:
 
 Shard A
-:   ```js
-"state" : {
-    "transactions" : []
-}
-```
+:   
+  ```js
+  "state" : {
+      "transactions" : []
+  }
+  ```
+  % NOTCONSOLE
 
 
 Shard B
-:   ```js
-"state" : {
-    "transactions" : []
-}
-```
+:   
+  ```js
+  "state" : {
+      "transactions" : []
+  }
+  ```
+  % NOTCONSOLE
 
 
 
@@ -189,19 +193,23 @@ Shard B
 Each shard collects its documents and runs the map_script on each document that is collected:
 
 Shard A
-:   ```js
-"state" : {
-    "transactions" : [ 80, -30 ]
-}
-```
+:   
+  ```js
+  "state" : {
+      "transactions" : [ 80, -30 ]
+  }
+  ```
+  % NOTCONSOLE
 
 
 Shard B
-:   ```js
-"state" : {
-    "transactions" : [ -10, 130 ]
-}
-```
+:   
+  ```js
+  "state" : {
+      "transactions" : [ -10, 130 ]
+  }
+  ```
+  % NOTCONSOLE