Skip to content

Commit

Permalink
Merge branch 'main' into lucene_snapshot_9_12
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisHegarty committed Sep 30, 2024
2 parents 6dbd33c + 5c840f7 commit 371fc31
Show file tree
Hide file tree
Showing 38 changed files with 1,895 additions and 127 deletions.
10 changes: 10 additions & 0 deletions docs/changelog/113143.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pr: 113143
summary: Deprecate dutch_kp and lovins stemmer as they are removed in Lucene 10
area: Analysis
type: deprecation
issues: []
deprecation:
title: Deprecate dutch_kp and lovins stemmer as they are removed in Lucene 10
area: Analysis
details: kp, dutch_kp, dutchKp and lovins stemmers are deprecated and will be removed.
impact: These stemmers will be removed and will be no longer supported.
6 changes: 6 additions & 0 deletions docs/changelog/113723.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 113723
summary: Fix max file size check to use `getMaxFileSize`
area: Infra/Core
type: bug
issues:
- 113705
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ values: `Arabic`, `Armenian`, `Basque`, `Catalan`, `Danish`, `Dutch`, `English`,
`Lithuanian`, `Lovins`, `Norwegian`, `Porter`, `Portuguese`, `Romanian`,
`Russian`, `Serbian`, `Spanish`, `Swedish`, `Turkish`.

deprecated:[8.16.0, `Kp` and `Lovins` support will be removed in a future version]

For example:

[source,console]
Expand All @@ -28,7 +30,7 @@ PUT /my-index-000001
"filter": {
"my_snow": {
"type": "snowball",
"language": "Lovins"
"language": "English"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ https://snowballstem.org/algorithms/danish/stemmer.html[*`danish`*]
Dutch::
https://snowballstem.org/algorithms/dutch/stemmer.html[*`dutch`*],
https://snowballstem.org/algorithms/kraaij_pohlmann/stemmer.html[`dutch_kp`]
https://snowballstem.org/algorithms/kraaij_pohlmann/stemmer.html[`dutch_kp`] deprecated:[8.16.0, `dutch_kp` will be removed in a future version]
English::
https://snowballstem.org/algorithms/porter/stemmer.html[*`english`*],
https://ciir.cs.umass.edu/pubfiles/ir-35.pdf[`light_english`],
https://snowballstem.org/algorithms/lovins/stemmer.html[`lovins`],
https://snowballstem.org/algorithms/lovins/stemmer.html[`lovins`] deprecated:[8.16.0, `lovins` will be removed in a future version],
https://www.researchgate.net/publication/220433848_How_effective_is_suffixing[`minimal_english`],
https://snowballstem.org/algorithms/english/stemmer.html[`porter2`],
{lucene-analysis-docs}/en/EnglishPossessiveFilter.html[`possessive_english`]
Expand Down
124 changes: 114 additions & 10 deletions docs/reference/cluster/stats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ If a node does not respond before its timeout expires, the response does not inc
However, timed out nodes are included in the response's `_nodes.failed` property.
Defaults to no timeout.

`include_remotes`::
(Optional, Boolean) If `true`, includes remote cluster information in the response.
Defaults to `false`, so no remote cluster information is returned.

[role="child_attributes"]
[[cluster-stats-api-response-body]]
==== {api-response-body-title}
Expand Down Expand Up @@ -183,12 +187,11 @@ This number is based on documents in Lucene segments and may include documents f
This number is based on documents in Lucene segments. {es} reclaims the disk space of deleted Lucene documents when a segment is merged.

`total_size_in_bytes`::
(integer)
Total size in bytes across all primary shards assigned to selected nodes.
(integer) Total size in bytes across all primary shards assigned to selected nodes.

`total_size`::
(string)
Total size across all primary shards assigned to selected nodes, as a human-readable string.
(string) Total size across all primary shards assigned to selected nodes, as a human-readable string.

=====
`store`::
Expand Down Expand Up @@ -1285,8 +1288,7 @@ They are included here for expert users, but should otherwise be ignored.
====
`repositories`::
(object) Contains statistics about the <<snapshot-restore,snapshot>> repositories defined in the cluster, broken down
by repository type.
(object) Contains statistics about the <<snapshot-restore,snapshot>> repositories defined in the cluster, broken down by repository type.
+
.Properties of `repositories`
[%collapsible%open]
Expand Down Expand Up @@ -1314,13 +1316,74 @@ Each repository type may also include other statistics about the repositories of
[%collapsible%open]
=====
`clusters`:::
(object) Contains remote cluster settings and metrics collected from them.
The keys are cluster names, and the values are per-cluster data.
Only present if `include_remotes` option is set to `true`.
+
.Properties of `clusters`
[%collapsible%open]
======

`cluster_uuid`:::
(string) The UUID of the remote cluster.

`mode`:::
(string) The <<sniff-proxy-modes, connection mode>> used to communicate with the remote cluster.

`skip_unavailable`:::
(Boolean) The `skip_unavailable` <<skip-unavailable-clusters, setting>> used for this remote cluster.

`transport.compress`:::
(string) Transport compression setting used for this remote cluster.

`version`:::
(array of strings) The list of {es} versions used by the nodes on the remote cluster.

`status`:::
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cluster-health-status]
+
See <<cluster-health>>.

`nodes_count`:::
(integer) The total count of nodes in the remote cluster.

`shards_count`:::
(integer) The total number of shards in the remote cluster.

`indices_count`:::
(integer) The total number of indices in the remote cluster.

`indices_total_size_in_bytes`:::
(integer) Total data set size, in bytes, of all shards assigned to selected nodes.

`indices_total_size`:::
(string) Total data set size, in bytes, of all shards assigned to selected nodes, as a human-readable string.

`max_heap_in_bytes`:::
(integer) Maximum amount of memory, in bytes, available for use by the heap across the nodes of the remote cluster.

`max_heap`:::
(string) Maximum amount of memory, in bytes, available for use by the heap across the nodes of the remote cluster,
as a human-readable string.

`mem_total_in_bytes`:::
(integer) Total amount, in bytes, of physical memory across the nodes of the remote cluster.

`mem_total`:::
(string) Total amount, in bytes, of physical memory across the nodes of the remote cluster, as a human-readable string.

======
`_search`:::
(object) Contains the telemetry information about the <<modules-cross-cluster-search, {ccs}>> usage in the cluster.
(object) Contains the information about the <<modules-cross-cluster-search, {ccs}>> usage in the cluster.
+
.Properties of `_search`
[%collapsible%open]
======

`total`:::
(integer) The total number of {ccs} requests that have been executed by the cluster.

Expand All @@ -1336,6 +1399,7 @@ Each repository type may also include other statistics about the repositories of
.Properties of `took`
[%collapsible%open]
=======
`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
Expand All @@ -1344,6 +1408,7 @@ Each repository type may also include other statistics about the repositories of
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`took_mrt_true`::
Expand All @@ -1361,6 +1426,7 @@ Each repository type may also include other statistics about the repositories of
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`took_mrt_false`::
Expand All @@ -1378,6 +1444,7 @@ Each repository type may also include other statistics about the repositories of
`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
=======

`remotes_per_search_max`::
Expand All @@ -1391,9 +1458,10 @@ Each repository type may also include other statistics about the repositories of
The keys are the failure reason names and the values are the number of requests that failed for that reason.

`features`::
(object) Contains statistics about the features used in {ccs} requests. The keys are the names of the search feature,
and the values are the number of requests that used that feature. Single request can use more than one feature
(e.g. both `async` and `wildcard`). Known features are:
(object) Contains statistics about the features used in {ccs} requests.
The keys are the names of the search feature, and the values are the number of requests that used that feature.
Single request can use more than one feature (e.g. both `async` and `wildcard`).
Known features are:

* `async` - <<async-search, Async search>>

Expand Down Expand Up @@ -1427,6 +1495,7 @@ This may include requests where partial results were returned, but not requests
.Properties of `took`
[%collapsible%open]
========

`max`:::
(integer) The maximum time taken to execute a {ccs} request, in milliseconds.

Expand All @@ -1435,6 +1504,7 @@ This may include requests where partial results were returned, but not requests

`p90`:::
(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.

========
=======
Expand Down Expand Up @@ -1812,3 +1882,37 @@ This API can be restricted to a subset of the nodes using <<cluster-nodes,node f
--------------------------------------------------
GET /_cluster/stats/nodes/node1,node*,master:false
--------------------------------------------------

This API call will return data about the remote clusters if any are configured:

[source,console]
--------------------------------------------------
GET /_cluster/stats?include_remotes=true
--------------------------------------------------

The resulting response will contain the `ccs` object with information about the remote clusters:

[source,js]
--------------------------------------------------
{
"ccs": {
"clusters": {
"remote_cluster": {
"cluster_uuid": "YjAvIhsCQ9CbjWZb2qJw3Q",
"mode": "sniff",
"skip_unavailable": false,
"transport.compress": "true",
"version": ["8.16.0"],
"status": "green",
"nodes_count": 10,
"shards_count": 420,
"indices_count": 10,
"indices_total_size_in_bytes": 6232658362,
"max_heap_in_bytes": 1037959168,
"mem_total_in_bytes": 137438953472
}
}
}
}
--------------------------------------------------
// TESTRESPONSE[skip:TODO]
Loading

0 comments on commit 371fc31

Please sign in to comment.