Skip to content

Commit 79aaf95

Browse files
authored
Merge branch 'main' into tracing/remove-dead-code
2 parents 724754e + 3b8f5d3 commit 79aaf95

File tree

36 files changed

+711
-112
lines changed

36 files changed

+711
-112
lines changed

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ private void addNameAndDescriptionToPom(Project project, NamedDomainObjectSet<Ma
175175
private static void configureWithShadowPlugin(Project project, MavenPublication publication) {
176176
var shadow = project.getExtensions().getByType(ShadowExtension.class);
177177
shadow.component(publication);
178+
publication.artifact(project.getTasks().named("javadocJar"));
179+
publication.artifact(project.getTasks().named("sourcesJar"));
178180
}
179181

180182
private static void addScmInfo(XmlProvider xml, GitInfo gitInfo) {

docs/changelog/129725.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129725
2+
summary: Throw a 400 when sorting for all types of range fields
3+
area: Search
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/configuration-reference/data-stream-lifecycle-settings.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ navigation_title: "Data stream lifecycle settings"
33
mapped_pages:
44
- https://www.elastic.co/guide/en/elasticsearch/reference/current/data-stream-lifecycle-settings.html
55
applies_to:
6-
deployment:
7-
self:
6+
stack: all
87
---
98

109
# Data stream lifecycle settings in {{es}} [data-stream-lifecycle-settings]
@@ -58,21 +57,24 @@ $$$data-streams-lifecycle-signalling-error-retry-interval$$$
5857

5958
## Index level settings [_index_level_settings]
6059

60+
:::{include} ../index-settings/_snippets/serverless-availability.md
61+
:::
62+
6163
The following index-level settings are typically configured on the backing indices of a data stream.
6264

6365
$$$index-lifecycle-prefer-ilm$$$
6466

6567
`index.lifecycle.prefer_ilm`
66-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), boolean) This setting determines which feature is managing the backing index of a data stream if, and only if, the backing index has an [{{ilm}}](docs-content://manage-data/lifecycle/index-lifecycle-management.md) ({{ilm-init}}) policy and the data stream has also a built-in lifecycle. When `true` this index is managed by {{ilm-init}}, when `false` the backing index is managed by the data stream lifecycle. Defaults to `true`.
68+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), boolean) This setting determines which feature is managing the backing index of a data stream if, and only if, the backing index has an [{{ilm}}](docs-content://manage-data/lifecycle/index-lifecycle-management.md) ({{ilm-init}}) policy and the data stream has also a built-in lifecycle. When `true` this index is managed by {{ilm-init}}, when `false` the backing index is managed by the data stream lifecycle. Defaults to `true`.
6769

6870
$$$index-data-stream-lifecycle-origination-date$$$
6971

70-
`index.lifecycle.origination_date`
71-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), long) If specified, this is the timestamp used to calculate the backing index generation age after this backing index has been [rolled over](docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md). The generation age is used to determine data retention, consequently, you can use this setting if you create a backing index that contains older data and want to ensure that the retention period or other parts of the lifecycle will be applied based on the data’s original timestamp and not the timestamp they got indexed. Specified as a Unix epoch value in milliseconds.
72+
`index.lifecycle.origination_date` {applies_to}`serverless: all`
73+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), long) If specified, this is the timestamp used to calculate the backing index generation age after this backing index has been [rolled over](docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md). The generation age is used to determine data retention, consequently, you can use this setting if you create a backing index that contains older data and want to ensure that the retention period or other parts of the lifecycle will be applied based on the data’s original timestamp and not the timestamp they got indexed. Specified as a Unix epoch value in milliseconds.
7274

7375
## Reindex settings [reindex-data-stream-settings]
7476

75-
You can use the following settings to control the behavior of the reindex data stream API:
77+
You can use the following cluster-level settings to control the behavior of the reindex data stream API:
7678

7779
`migrate.max_concurrent_indices_reindexed_per_data_stream` ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting)) The number of backing indices within a given data stream which will be reindexed concurrently. Defaults to `1`.
7880

docs/reference/elasticsearch/configuration-reference/index-lifecycle-management-settings.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ navigation_title: "{{ilm-cap}} settings"
33
mapped_pages:
44
- https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-settings.html
55
applies_to:
6-
deployment:
7-
self:
6+
stack: all
87
---
98

109
# {{ilm-cap}} settings in {{es}} [ilm-settings]
@@ -37,34 +36,37 @@ $$$indices-lifecycle-rollover-only-if-has-documents$$$
3736

3837
## Index level settings [_index_level_settings_2]
3938

39+
:::{include} ../index-settings/_snippets/serverless-availability.md
40+
:::
41+
4042
These index-level {{ilm-init}} settings are typically configured through index templates. For more information, see [Create a lifecycle policy](docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md#ilm-gs-create-policy).
4143

4244
`index.lifecycle.indexing_complete`
43-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), Boolean) Indicates whether or not the index has been rolled over. Automatically set to `true` when {{ilm-init}} completes the rollover action. You can explicitly set it to [skip rollover](docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md). Defaults to `false`.
45+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), Boolean) Indicates whether or not the index has been rolled over. Automatically set to `true` when {{ilm-init}} completes the rollover action. You can explicitly set it to [skip rollover](docs-content://manage-data/lifecycle/index-lifecycle-management/skip-rollover.md). Defaults to `false`.
4446

4547
$$$index-lifecycle-name$$$
4648

4749
`index.lifecycle.name`
48-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), string) The name of the policy to use to manage the index. For information about how {{es}} applies policy changes, see [Policy updates](docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md). If you are restoring an index from snapshot that was previously managed by {{ilm}}, you can override this setting to null during the restore operation to disable further management of the index. See also [Index level settings](#index-lifecycle-rollover-alias).
50+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), string) The name of the policy to use to manage the index. For information about how {{es}} applies policy changes, see [Policy updates](docs-content://manage-data/lifecycle/index-lifecycle-management/policy-updates.md). If you are restoring an index from snapshot that was previously managed by {{ilm}}, you can override this setting to null during the restore operation to disable further management of the index. See also [Index level settings](#index-lifecycle-rollover-alias).
4951

5052
$$$index-lifecycle-origination-date$$$
5153

52-
`index.lifecycle.origination_date`
53-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), long) If specified, this is the timestamp used to calculate the index age for its phase transitions. Use this setting if you create a new index that contains old data and want to use the original creation date to calculate the index age. Specified as a Unix epoch value in milliseconds.
54+
`index.lifecycle.origination_date` {applies_to}`serverless: all`
55+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), long) If specified, this is the timestamp used to calculate the index age for its phase transitions. Use this setting if you create a new index that contains old data and want to use the original creation date to calculate the index age. Specified as a Unix epoch value in milliseconds.
5456

5557
$$$index-lifecycle-parse-origination-date$$$
5658

5759
`index.lifecycle.parse_origination_date`
58-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), Boolean) Set to `true` to parse the origination date from the index name. This origination date is used to calculate the index age for its phase transitions. The index name must match the pattern `^.*-{{date_format}}-\\d+`, where the `date_format` is `yyyy.MM.dd` and the trailing digits are optional. An index that was rolled over would normally match the full format, for example `logs-2016.10.31-000002`). If the index name doesn’t match the pattern, index creation fails.
60+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), Boolean) Set to `true` to parse the origination date from the index name. This origination date is used to calculate the index age for its phase transitions. The index name must match the pattern `^.*-{{date_format}}-\\d+`, where the `date_format` is `yyyy.MM.dd` and the trailing digits are optional. An index that was rolled over would normally match the full format, for example `logs-2016.10.31-000002`). If the index name doesn’t match the pattern, index creation fails.
5961

6062
$$$index-lifecycle-step-wait-time-threshold$$$
6163

6264
`index.lifecycle.step.wait_time_threshold`
63-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), [time value](/reference/elasticsearch/rest-apis/api-conventions.md#time-units)) Time to wait for the cluster to resolve allocation issues during an {{ilm-init}} [`shrink`](/reference/elasticsearch/index-lifecycle-actions/ilm-shrink.md) action. Must be greater than `1h` (1 hour). Defaults to `12h` (12 hours). See [Shard allocation for shrink](/reference/elasticsearch/index-lifecycle-actions/ilm-shrink.md#ilm-shrink-shard-allocation).
65+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), [time value](/reference/elasticsearch/rest-apis/api-conventions.md#time-units)) Time to wait for the cluster to resolve allocation issues during an {{ilm-init}} [`shrink`](/reference/elasticsearch/index-lifecycle-actions/ilm-shrink.md) action. Must be greater than `1h` (1 hour). Defaults to `12h` (12 hours). See [Shard allocation for shrink](/reference/elasticsearch/index-lifecycle-actions/ilm-shrink.md#ilm-shrink-shard-allocation).
6466

6567
$$$index-lifecycle-rollover-alias$$$
6668

6769
`index.lifecycle.rollover_alias`
68-
: ([Dynamic](docs-content://deploy-manage/stack-settings.md#dynamic-cluster-setting), string) The index alias to update when the index rolls over. Specify when using a policy that contains a rollover action. When the index rolls over, the alias is updated to reflect that the index is no longer the write index. For more information about rolling indices, see [Rollover](docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md). If you are restoring an index from snapshot that was previously managed by {{ilm}}, you can override this setting to null during the restore operation to disable further management of future indices. See also [Index level settings](#index-lifecycle-name).
70+
: ([Dynamic](../index-settings/index.md#index-modules-settings-description), string) The index alias to update when the index rolls over. Specify when using a policy that contains a rollover action. When the index rolls over, the alias is updated to reflect that the index is no longer the write index. For more information about rolling indices, see [Rollover](docs-content://manage-data/lifecycle/index-lifecycle-management/rollover.md). If you are restoring an index from snapshot that was previously managed by {{ilm}}, you can override this setting to null during the restore operation to disable further management of future indices. See also [Index level settings](#index-lifecycle-name).
6971

7072

docs/reference/elasticsearch/configuration-reference/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ applies_to:
55
ess:
66
ece:
77
self:
8+
eck:
89
serverless:
910
---
1011

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
::::{admonition} Settings supported in Serverless
2+
{{serverless-full}} projects [restrict the available Elasticsearch settings](docs-content://deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md#elasticsearch-differences-serverless-settings-availability) to a supported subset, identified with a `Serverless` badge next to the setting name. For a complete list of available index settings, refer to the [Serverless index settings list](/reference/elasticsearch/index-settings/serverless.md).
3+
::::

docs/reference/elasticsearch/index-settings/data-tier-allocation.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
mapped_pages:
33
- https://www.elastic.co/guide/en/elasticsearch/reference/current/data-tier-shard-filtering.html
44
navigation_title: Data tier allocation
5+
applies_to:
6+
stack: all
57
---
68

79
# Data tier allocation settings [data-tier-shard-filtering]
810

11+
:::{include} _snippets/serverless-availability.md
12+
:::
13+
914
You can use the index-level `_tier_preference` setting to control which [data tier](docs-content://manage-data/lifecycle/data-tiers.md) an index is allocated to.
1015

1116
This setting corresponds to the data node roles:

docs/reference/elasticsearch/index-settings/history-retention.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
mapped_pages:
33
- https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-history-retention.html
44
navigation_title: History retention
5+
applies_to:
6+
stack: all
57
---
68

79
# History retention settings [index-modules-history-retention]
810

11+
:::{include} _snippets/serverless-availability.md
12+
:::
13+
914
{{es}} sometimes needs to replay some of the operations that were performed on a shard. For instance, if a replica is briefly offline then it may be much more efficient to replay the few operations it missed while it was offline than to rebuild it from scratch. Similarly, {{ccr}} works by performing operations on the leader cluster and then replaying those operations on the follower cluster.
1015

1116
At the Lucene level there are really only two write operations that {{es}} performs on an index: a new document may be indexed, or an existing document may be deleted. Updates are implemented by atomically deleting the old document and then indexing the new document. A document indexed into Lucene already contains all the information needed to replay that indexing operation, but this is not true of document deletions. To solve this, {{es}} uses a feature called *soft deletes* to preserve recent deletions in the Lucene index so that they can be replayed.
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
---
22
mapped_pages:
33
- https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-blocks.html
4-
navigation_title: Index block
4+
navigation_title: Index blocks
5+
applies_to:
6+
stack: all
57
---
68

7-
# Index block settings [index-modules-blocks]
9+
# Index blocks [index-modules-blocks]
10+
11+
:::{include} _snippets/serverless-availability.md
12+
:::
813

914
Index blocks limit the kind of operations that are available on a certain index. The blocks come in different flavours, allowing to block write, read, or metadata operations. The blocks can be set / removed using dynamic index settings, or can be added using a dedicated API, which also ensures for write blocks that, once successfully returning to the user, all shards of the index are properly accounting for the block, for example that all in-flight writes to an index have been completed after adding the write block.
1015

@@ -15,7 +20,7 @@ The following *dynamic* index settings determine the blocks present on an index:
1520

1621
$$$index-blocks-read-only$$$
1722

18-
`index.blocks.read_only`
23+
`index.blocks.read_only` {applies_to}`serverless: all`
1924
: Set to `true` to make the index and index metadata read only, `false` to allow writes and metadata changes.
2025

2126
`index.blocks.read_only_allow_delete`
@@ -27,15 +32,16 @@ $$$index-blocks-read-only$$$
2732
{{es}} adds the read-only-allow-delete index block automatically when the disk utilization exceeds the flood stage watermark, and removes this block automatically when the disk utilization falls under the high watermark. See [Disk-based shard allocation](/reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md#disk-based-shard-allocation) for more information about watermarks, and [Fix watermark errors](docs-content://troubleshoot/elasticsearch/fix-watermark-errors.md) for help with resolving watermark issues.
2833
::::
2934

30-
31-
`index.blocks.read`
35+
$$$index-blocks-read$$$
36+
`index.blocks.read` {applies_to}`serverless: all`
3237
: Set to `true` to disable read operations against the index.
3338

3439
$$$index-blocks-write$$$
3540

36-
`index.blocks.write`
41+
`index.blocks.write` {applies_to}`serverless: all`
3742
: Set to `true` to disable data write operations against the index. Unlike `read_only`, this setting does not affect metadata. For instance, you can adjust the settings of an index with a `write` block, but you cannot adjust the settings of an index with a `read_only` block.
3843

39-
`index.blocks.metadata`
44+
$$$index-blocks-metadata$$$
45+
`index.blocks.metadata` {applies_to}`serverless: all`
4046
: Set to `true` to disable index metadata reads and writes.
4147

0 commit comments

Comments
 (0)