Merge branch 'main' of https://github.com/elastic/elasticsearch into …

…111712_fix

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/TransportNoopBulkAction.java

@@ -16,9 +16,9 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.plugin.noop.NoopPlugin;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/TransportNoopSearchAction.java

@@ -13,9 +13,9 @@
 import org.elasticsearch.action.search.ShardSearchFailure;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
-import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.plugin.noop.NoopPlugin;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.InternalAggregations;

docs/reference/cluster/nodes-stats.asciidoc

@@ -842,6 +842,142 @@ This is not shown for the `shards` level, since mappings may be shared across th
 
 =======
 
+`shards`::
+(object) When the `shards` level is requested, contains the aforementioned `indices` statistics for every shard (per
+index, and then per shard ID), as well as the following shard-specific statistics (which are not shown when the
+requested level is higher than `shards`):
++
+.Additional shard-specific statistics for the `shards` level
+[%collapsible%open]
+=======
+
+`routing`::
+(object) Contains routing information about the shard.
++
+.Properties of `routing`
+[%collapsible%open]
+========
+
+`state`::
+(string) State of the shard. Returned values are:
++
+* `INITIALIZING`: The shard is initializing/recovering.
+* `RELOCATING`: The shard is relocating.
+* `STARTED`: The shard has started.
+* `UNASSIGNED`: The shard is not assigned to any node.
+
+`primary`::
+(Boolean) Whether the shard is a primary shard or not.
+
+`node`::
+(string) ID of the node the shard is allocated to.
+
+`relocating_node`::
+(string) ID of the node the shard is either relocating to or relocating from, or null if shard is not relocating.
+
+========
+
+`commit`::
+(object) Contains information regarding the last commit point of the shard.
++
+.Properties of `commit`
+[%collapsible%open]
+========
+
+`id`::
+(string) Base64 version of the commit ID.
+
+`generation`::
+(integer) Lucene generation of the commit.
+
+`user_data`::
+(object) Contains additional technical information about the commit.
+
+`num_docs`::
+(integer) The number of docs in the commit.
+
+========
+
+`seq_no`::
+(object) Contains information about <<optimistic-concurrency-control,sequence numbers>> and checkpoints for the shard.
++
+.Properties of `seq_no`
+[%collapsible%open]
+========
+
+`max_seq_no`::
+(integer) The maximum sequence number issued so far.
+
+`local_checkpoint`::
+(integer) The current local checkpoint of the shard.
+
+`global_checkpoint`::
+(integer) The current global checkpoint of the shard.
+
+========
+
+`retention_leases`::
+(object) Contains information about <<index-modules-history-retention,history retention leases>>.
++
+.Properties of `retention_leases`
+[%collapsible%open]
+========
+
+`primary_term`::
+(integer) The primary term of this retention lease collection.
+
+`version`::
+(integer) The current version of the retention lease collection.
+
+`leases`::
+(array of objects) List of current leases for this shard.
++
+.Properties of `leases`
+[%collapsible%open]
+=========
+
+`id`::
+(string) The ID of the lease.
+
+`retaining_seq_no`::
+(integer) The minimum sequence number to be retained by the lease.
+
+`timestamp`::
+(integer) The timestamp of when the lease was created or renewed.
+Recorded in milliseconds since the {wikipedia}/Unix_time[Unix Epoch].
+
+`source`::
+(string) The source of the lease.
+
+=========
+========
+
+`shard_path`::
+(object)
++
+.Properties of `shard_path`
+[%collapsible%open]
+========
+
+`state_path`::
+(string) The state-path root, without the index name and the shard ID.
+
+`data_path`::
+(string) The data-path root, without the index name and the shard ID.
+
+`is_custom_data_path`::
+(boolean) Whether the data path is a custom data location and therefore outside of the nodes configured data paths.
+
+========
+
+`search_idle`::
+(boolean) Whether the shard is <<dynamic-index-search-idle-after,search idle>> or not.
+
+`search_idle_time`::
+(integer) Time since previous searcher access.
+Recorded in milliseconds.
+
+=======
 ======
 
 [[cluster-nodes-stats-api-response-body-os]]

docs/reference/ilm/actions/ilm-delete.asciidoc

@@ -15,6 +15,18 @@ Deletes the searchable snapshot created in a previous phase.
 Defaults to `true`.
 This option is applicable when the <<ilm-searchable-snapshot,searchable
 snapshot>> action is used in any previous phase.
++
+If you set this option to `false`, use the <<delete-snapshot-api,Delete
+snapshots API>> to remove {search-snaps} from your snapshot repository when
+they are no longer needed.
++
+If you manually delete an index before the {ilm-cap} delete phase runs, then
+{ilm-init} will not delete the underlying {search-snap}. Use the
+<<delete-snapshot-api,Delete snapshots API>> to remove the {search-snap} from
+your snapshot repository when it is no longer needed.
++
+See <<searchable-snapshots-reliability,Reliability of {search-snaps}>> for
+further information about deleting {search-snaps}.
 
 WARNING: If a policy with a searchable snapshot action is applied on an existing searchable snapshot index,
 the snapshot backing this index will NOT be deleted because it was not created by this policy. If you want

docs/reference/query-dsl/intervals-query.asciidoc

@@ -397,68 +397,3 @@ This query does *not* match a document containing the phrase `hot porridge is
 salty porridge`, because the intervals returned by the match query for `hot
 porridge` only cover the initial two terms in this document, and these do not
 overlap the intervals covering `salty`.
-
-Another restriction to be aware of is the case of `any_of` rules that contain
-sub-rules which overlap. In particular, if one of the rules is a strict
-prefix of the other, then the longer rule can never match, which can
-cause surprises when used in combination with `max_gaps`. Consider the
-following query, searching for `the` immediately followed by `big` or `big bad`,
-immediately followed by `wolf`:
-
-[source,console]
---------------------------------------------------
-POST _search
-{
-  "query": {
-    "intervals" : {
-      "my_text" : {
-        "all_of" : {
-          "intervals" : [
-            { "match" : { "query" : "the" } },
-            { "any_of" : {
-                "intervals" : [
-                    { "match" : { "query" : "big" } },
-                    { "match" : { "query" : "big bad" } }
-                ] } },
-            { "match" : { "query" : "wolf" } }
-          ],
-          "max_gaps" : 0,
-          "ordered" : true
-        }
-      }
-    }
-  }
-}
---------------------------------------------------
-
-Counter-intuitively, this query does *not* match the document `the big bad
-wolf`, because the `any_of` rule in the middle only produces intervals
-for `big` - intervals for `big bad` being longer than those for `big`, while
-starting at the same position, and so being minimized away. In these cases,
-it's better to rewrite the query so that all of the options are explicitly
-laid out at the top level:
-
-[source,console]
---------------------------------------------------
-POST _search
-{
-  "query": {
-    "intervals" : {
-      "my_text" : {
-        "any_of" : {
-          "intervals" : [
-            { "match" : {
-                "query" : "the big bad wolf",
-                "ordered" : true,
-                "max_gaps" : 0 } },
-            { "match" : {
-                "query" : "the big wolf",
-                "ordered" : true,
-                "max_gaps" : 0 } }
-           ]
-        }
-      }
-    }
-  }
-}
---------------------------------------------------

docs/reference/rest-api/common-parms.asciidoc

@@ -649,8 +649,9 @@ tag::level[]
 +
 --
 (Optional, string)
-Indicates whether statistics are aggregated
-at the cluster, index, or shard level.
+Indicates whether statistics are aggregated at the cluster, index, or shard level.
+If the shards level is requested, some additional
+<<cluster-nodes-stats,shard-specific statistics>> are shown.
 
 Valid values are: