Merge branch 'main' into lucene-release

# Conflicts:
#	server/src/main/java/org/elasticsearch/TransportVersions.java

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

@@ -229,7 +229,7 @@ private static Page page(String operation) {
             case "mv_min", "mv_min_ascending" -> {
                 var builder = LongBlock.newBlockBuilder(BLOCK_LENGTH);
                 if (operation.endsWith("ascending")) {
-                    builder.mvOrdering(Block.MvOrdering.ASCENDING);
+                    builder.mvOrdering(Block.MvOrdering.DEDUPLICATED_AND_SORTED_ASCENDING);
                 }
                 for (int i = 0; i < BLOCK_LENGTH; i++) {
                     builder.beginPositionEntry();

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

@@ -13,6 +13,7 @@
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BlockFactory;
 import org.elasticsearch.compute.data.BooleanBlock;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -107,6 +108,7 @@ private static Operator operator(String data, int topCount) {
             ClusterSettings.createBuiltInClusterSettings()
         );
         return new TopNOperator(
+            BlockFactory.getNonBreakingInstance(),
             breakerService.getBreaker(CircuitBreaker.REQUEST),
             topCount,
             elementTypes,

docs/changelog/100018.yaml

@@ -0,0 +1,5 @@
+pr: 100018
+summary: Improve time-series error and documentation
+area: "TSDB"
+type: enhancement
+issues: []

docs/changelog/100020.yaml

@@ -0,0 +1,6 @@
+pr: 100020
+summary: "[CI] `SearchResponseTests#testSerialization` failing resolved"
+area: Search
+type: bug
+issues:
+ - 100005

docs/changelog/99584.yaml

@@ -0,0 +1,5 @@
+pr: 99584
+summary: Adding an option for trained models to be platform specific
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/99832.yaml

@@ -0,0 +1,5 @@
+pr: 99832
+summary: APM Metering API
+area: Infra/Core
+type: enhancement
+issues: []

docs/changelog/99947.yaml

@@ -0,0 +1,5 @@
+pr: 99947
+summary: GET `_data_stream` displays both ILM and DSL information
+area: Data streams
+type: feature
+issues: []

docs/changelog/99995.yaml

@@ -0,0 +1,6 @@
+pr: 99995
+summary: When a primary is inactive but this is considered expected, the same applies for the replica of this shard.
+area: Health
+type: enhancement
+issues:
+ - 99951

docs/reference/aggregations/bucket/time-series-aggregation.asciidoc

@@ -67,8 +67,6 @@ PUT /my-time-series-index-0/_bulk
 --------------------------------------------------
 // NOTCONSOLE
 
-//////////////////////////
-
 To perform a time series aggregation, specify "time_series" as the aggregation type. When the boolean "keyed"
 is true, each bucket is given a unique key.
 
@@ -85,8 +83,6 @@ GET /_search
 --------------------------------------------------
 // NOTCONSOLE
 
-//////////////////////////
-
 This will return all results in the time series, however a more typical query will use sub aggregations to reduce the
 date returned to something more relevant.
 

docs/reference/data-streams/change-mappings-and-settings.asciidoc

@@ -573,15 +573,21 @@ stream's oldest backing index.
       "indices": [
         {
           "index_name": ".ds-my-data-stream-2099.03.07-000001", <1>
-          "index_uuid": "Gpdiyq8sRuK9WuthvAdFbw"
+          "index_uuid": "Gpdiyq8sRuK9WuthvAdFbw",
+          "prefer_ilm": true,
+          "managed_by": "Unmanaged"
         },
         {
           "index_name": ".ds-my-data-stream-2099.03.08-000002",
-          "index_uuid": "_eEfRrFHS9OyhqWntkgHAQ"
+          "index_uuid": "_eEfRrFHS9OyhqWntkgHAQ",
+          "prefer_ilm": true,
+          "managed_by": "Unmanaged"
         }
       ],
       "generation": 2,
       "status": "GREEN",
+      "next_generation_managed_by": "Unmanaged",
+      "prefer_ilm": true,
       "template": "my-data-stream-template",
       "hidden": false,
       "system": false,

docs/reference/data-streams/downsampling-manual.asciidoc

@@ -358,11 +358,15 @@ This returns:
       "indices": [
         {
           "index_name": ".ds-my-data-stream-2023.07.26-000001", <1>
-          "index_uuid": "ltOJGmqgTVm4T-Buoe7Acg"
+          "index_uuid": "ltOJGmqgTVm4T-Buoe7Acg",
+          "prefer_ilm": true,
+          "managed_by": "Data stream lifecycle"
         }
       ],
       "generation": 1,
       "status": "GREEN",
+      "next_generation_managed_by": "Data stream lifecycle",
+      "prefer_ilm": true,
       "template": "my-data-stream-template",
       "hidden": false,
       "system": false,

docs/reference/indices/get-data-stream.asciidoc

@@ -225,7 +225,7 @@ cluster can not write into this data stream or change its mappings.
 
 `lifecycle`::
 (object)
-Functionality in preview:[]. Contains the configuration for the data stream lifecycle management of this data stream.
+Contains the configuration for the data stream lifecycle management of this data stream.
 +
 .Properties of `lifecycle`
 [%collapsible%open]
@@ -265,18 +265,26 @@ The API returns the following response:
       "indices": [
         {
           "index_name": ".ds-my-data-stream-2099.03.07-000001",
-          "index_uuid": "xCEhwsp8Tey0-FLNFYVwSg"
+          "index_uuid": "xCEhwsp8Tey0-FLNFYVwSg",
+          "prefer_ilm": true,
+          "ilm_policy": "my-lifecycle-policy",
+          "managed_by": "Index Lifecycle Management"
         },
         {
           "index_name": ".ds-my-data-stream-2099.03.08-000002",
-          "index_uuid": "PA_JquKGSiKcAKBA8DJ5gw"
+          "index_uuid": "PA_JquKGSiKcAKBA8DJ5gw",
+          "prefer_ilm": true,
+          "ilm_policy": "my-lifecycle-policy",
+          "managed_by": "Index Lifecycle Management"
         }
       ],
       "generation": 2,
       "_meta": {
         "my-meta-field": "foo"
       },
       "status": "GREEN",
+      "next_generation_managed_by": "Index Lifecycle Management",
+      "prefer_ilm": true,
       "template": "my-index-template",
       "ilm_policy": "my-lifecycle-policy",
       "hidden": false,
@@ -292,14 +300,19 @@ The API returns the following response:
       "indices": [
         {
           "index_name": ".ds-my-data-stream-two-2099.03.08-000001",
-          "index_uuid": "3liBu2SYS5axasRt6fUIpA"
+          "index_uuid": "3liBu2SYS5axasRt6fUIpA",
+          "prefer_ilm": true,
+          "ilm_policy": "my-lifecycle-policy",
+          "managed_by": "Index Lifecycle Management"
         }
       ],
       "generation": 1,
       "_meta": {
         "my-meta-field": "foo"
       },
       "status": "YELLOW",
+      "next_generation_managed_by": "Index Lifecycle Management",
+      "prefer_ilm": true,
       "template": "my-index-template",
       "ilm_policy": "my-lifecycle-policy",
       "hidden": false,

docs/reference/indices/index-mgmt.asciidoc

@@ -49,11 +49,11 @@ Badges indicate if an index is a <<ccr-put-follow,follower index>>, a
 Clicking a badge narrows the list to only indices of that type.
 You can also filter indices using the search bar.
 
-You can drill down into each index to investigate the index
+By clicking the index name, you can open an index details page to investigate the index
 <<index-modules-settings,settings>>, <<mapping,mapping>>, and statistics.
-From this view, you can also edit the index settings. 
+On this page, you can also edit the index settings.
 
-To view and explore the documents within an index, click the compass icon image:compassicon.png[width=3%] next to the index name to open {kibana-ref}/discover.html[Discover].
+To view and explore the documents within an index, click the *Discover index* button to open {kibana-ref}/discover.html[Discover].
 
 [role="screenshot"]
 image::images/index-mgmt/management_index_details.png[Index Management UI]

docs/reference/inference/delete-inference.asciidoc

@@ -0,0 +1,57 @@
+[role="xpack"]
+[[delete-inference-api]]
+=== Delete {infer} API
+
+Deletes an {infer} model deployment.
+
+
+[discrete]
+[[delete-inference-api-request]]
+==== {api-request-title}
+
+`DELETE /_inference/<task_type>/<model_id>`
+
+[discrete]
+[[delete-inference-api-prereqs]]
+==== {api-prereq-title}
+
+* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.
+
+
+[discrete]
+[[delete-inference-api-path-params]]
+==== {api-path-parms-title}
+
+<model_id>::
+(Required, string)
+The unique identifier of the {infer} model to delete.
+
+<task_type>::
+(Required, string)
+The type of {infer} task that the model performs.
+
+
+[discrete]
+[[delete-inference-api-example]]
+==== {api-examples-title}
+
+The following API call deletes the `my-elser-model` {infer} model that can 
+perform `sparse_embedding` tasks.
+
+
+[source,console]
+------------------------------------------------------------
+DELETE /_inference/sparse_embedding/my-elser-model
+------------------------------------------------------------
+// TEST[skip:TBD]
+
+
+The API returns the following response:
+
+[source,console-result]
+------------------------------------------------------------
+{
+  "acknowledged": true
+}
+------------------------------------------------------------
+// NOTCONSOLE

docs/reference/inference/get-inference.asciidoc

@@ -0,0 +1,79 @@
+[role="xpack"]
+[[get-inference-api]]
+=== Get {infer} API
+
+Retrieves {infer} model information.
+
+[discrete]
+[[get-inference-api-request]]
+==== {api-request-title}
+
+`GET /_inference/_all`
+
+`GET /_inference/<task_type>/_all`
+
+`GET /_inference/<task_type>/<model_id>`
+
+[discrete]
+[[get-inference-api-prereqs]]
+==== {api-prereq-title}
+
+* Requires the `manage` <<privileges-list-cluster,cluster privilege>>.
+
+[discrete]
+[[get-inference-api-desc]]
+==== {api-description-title}
+
+You can get information in a single API request for: 
+
+* a single {infer} model by providing the task type and the model ID,
+* all of the {infer} models for a certain task type by providing the task type 
+and a wildcard expression,
+* all of the {infer} models by using a wildcard expression.
+
+
+[discrete]
+[[get-inference-api-path-params]]
+==== {api-path-parms-title}
+
+`<model_id>`::
+(Optional, string)
+The unique identifier of the {infer} model.
+
+
+`<task_type>`::
+(Optional, string)
+The type of {infer} task that the model performs.
+
+
+[discrete]
+[[get-inference-api-example]]
+==== {api-examples-title}
+
+The following API call retrives information about the `my-elser-model` {infer} 
+model that can perform `sparse_embedding` tasks.
+
+
+[source,console]
+------------------------------------------------------------
+GET _inference/sparse_embedding/my-elser-model
+------------------------------------------------------------
+// TEST[skip:TBD]
+
+
+The API returns the following response:
+
+[source,console-result]
+------------------------------------------------------------
+{
+  "model_id": "my-elser-model",
+  "task_type": "sparse_embedding",
+  "service": "elser_mlnode",
+  "service_settings": {
+    "num_allocations": 1,
+    "num_threads": 1
+  },
+  "task_settings": {}
+}
+------------------------------------------------------------
+// NOTCONSOLE

docs/reference/inference/inference-apis.asciidoc

@@ -0,0 +1,16 @@
+[role="xpack"]
+[[inference-apis]]
+== {infer-cap} APIs
+
+You can use the following APIs to manage {infer} models and perform {infer}:
+
+* <<delete-inference-api>>
+* <<get-inference-api>>
+* <<post-inference-api>>
+* <<put-inference-api>>
+
+
+include::delete-inference.asciidoc[]
+include::get-inference.asciidoc[]
+include::post-inference.asciidoc[]
+include::put-inference.asciidoc[]