Skip to content

Commit 720291a

Browse files
committed
Merge branch 'main' into lucene_snapshot
2 parents 7624f54 + 5df57fd commit 720291a

File tree

59 files changed

+1063
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1063
-242
lines changed

docs/changelog/118599.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118599
2+
summary: Archive-Index upgrade compatibility
3+
area: Search
4+
type: enhancement
5+
issues: []

docs/changelog/118959.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118959
2+
summary: Allow kibana_system user to manage .reindexed-v8-internal.alerts indices
3+
area: Authorization
4+
type: enhancement
5+
issues: []

docs/reference/data-management.asciidoc

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,26 @@
66
--
77
The data you store in {es} generally falls into one of two categories:
88

9-
* Content: a collection of items you want to search, such as a catalog of products
10-
* Time series data: a stream of continuously-generated timestamped data, such as log entries
11-
12-
Content might be frequently updated,
9+
* *Content*: a collection of items you want to search, such as a catalog of products
10+
* *Time series data*: a stream of continuously-generated timestamped data, such as log entries
11+
*Content* might be frequently updated,
1312
but the value of the content remains relatively constant over time.
1413
You want to be able to retrieve items quickly regardless of how old they are.
1514

16-
Time series data keeps accumulating over time, so you need strategies for
15+
*Time series data* keeps accumulating over time, so you need strategies for
1716
balancing the value of the data against the cost of storing it.
1817
As it ages, it tends to become less important and less-frequently accessed,
1918
so you can move it to less expensive, less performant hardware.
2019
For your oldest data, what matters is that you have access to the data.
2120
It's ok if queries take longer to complete.
2221

23-
To help you manage your data, {es} offers you:
24-
25-
* <<index-lifecycle-management, {ilm-cap}>> ({ilm-init}) to manage both indices and data streams and it is fully customisable, and
26-
* <<data-stream-lifecycle, Data stream lifecycle>> which is the built-in lifecycle of data streams and addresses the most
27-
common lifecycle management needs.
22+
To help you manage your data, {es} offers you the following options:
2823

29-
preview::["The built-in data stream lifecycle is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but this feature is not subject to the support SLA of official GA features."]
24+
* <<index-lifecycle-management, {ilm-cap}>>
25+
* <<data-stream-lifecycle, Data stream lifecycle>>
26+
* {curator-ref-current}/about.html[Elastic Curator]
3027

31-
**{ilm-init}** can be used to manage both indices and data streams and it allows you to:
28+
**{ilm-init}** can be used to manage both indices and data streams. It allows you to do the following:
3229

3330
* Define the retention period of your data. The retention period is the minimum time your data will be stored in {es}.
3431
Data older than this period can be deleted by {es}.
@@ -38,12 +35,24 @@ Data older than this period can be deleted by {es}.
3835
for your older indices while reducing operating costs and maintaining search performance.
3936
* Perform <<async-search-intro, asynchronous searches>> of data stored on less-performant hardware.
4037

41-
**Data stream lifecycle** is less feature rich but is focused on simplicity, so it allows you to easily:
38+
**Data stream lifecycle** is less feature rich but is focused on simplicity. It allows you to do the following:
4239

4340
* Define the retention period of your data. The retention period is the minimum time your data will be stored in {es}.
4441
Data older than this period can be deleted by {es} at a later time.
45-
* Improve the performance of your data stream by performing background operations that will optimise the way your data
46-
stream is stored.
42+
* Improve the performance of your data stream by performing background operations that will optimise the way your data stream is stored.
43+
44+
**Elastic Curator** is a tool that allows you to manage your indices and snapshots using user-defined filters and predefined actions. If ILM provides the functionality to manage your index lifecycle, and you have at least a Basic license, consider using ILM in place of Curator. Many stack components make use of ILM by default. {curator-ref-current}/ilm.html[Learn more].
45+
46+
NOTE: <<xpack-rollup,Data rollup>> is a deprecated Elasticsearch feature that allows you to manage the amount of data that is stored in your cluster, similar to the downsampling functionality of {ilm-init} and data stream lifecycle. This feature should not be used for new deployments.
47+
48+
[TIP]
49+
====
50+
{ilm-init} is not available on {es-serverless}.
51+
52+
In an {ecloud} or self-managed environment, ILM lets you automatically transition indices through data tiers according to your performance needs and retention requirements. This allows you to balance hardware costs with performance. {es-serverless} eliminates this complexity by optimizing your cluster performance for you.
53+
54+
Data stream lifecycle is an optimized lifecycle tool that lets you focus on the most common lifecycle management needs, without unnecessary hardware-centric concepts like data tiers.
55+
====
4756
--
4857

4958
include::ilm/index.asciidoc[]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
= Data store architecture
2+
3+
[partintro]
4+
--
5+
6+
{es} is a distributed document store. Instead of storing information as rows of columnar data, {es} stores complex data structures that have been serialized as JSON documents. When you have multiple {es} nodes in a cluster, stored documents are distributed across the cluster and can be accessed immediately
7+
from any node.
8+
9+
The topics in this section provides information about the architecture of {es} and how it stores and retrieves data:
10+
11+
* <<nodes-shards,Nodes and shards>>: Learn about the basic building blocks of an {es} cluster, including nodes, shards, primaries, and replicas.
12+
* <<docs-replication,Reading and writing documents>>: Learn how {es} replicates read and write operations across shards and shard copies.
13+
* <<shard-allocation-relocation-recovery,Shard allocation, relocation, and recovery>>: Learn how {es} allocates and balances shards across nodes.
14+
--
15+
16+
include::nodes-shards.asciidoc[]
17+
include::docs/data-replication.asciidoc[leveloffset=-1]
18+
include::modules/shard-ops.asciidoc[]

docs/reference/docs.asciidoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
For the most up-to-date API details, refer to {api-es}/group/endpoint-document[Document APIs].
88
--
99

10-
This section starts with a short introduction to {es}'s <<docs-replication,data
11-
replication model>>, followed by a detailed description of the following CRUD
12-
APIs:
10+
This section describes the following CRUD APIs:
1311

1412
.Single document APIs
1513
* <<docs-index_>>
@@ -24,8 +22,6 @@ APIs:
2422
* <<docs-update-by-query>>
2523
* <<docs-reindex>>
2624

27-
include::docs/data-replication.asciidoc[]
28-
2925
include::docs/index_.asciidoc[]
3026

3127
include::docs/get.asciidoc[]

docs/reference/docs/data-replication.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
[[docs-replication]]
3-
=== Reading and Writing documents
3+
=== Reading and writing documents
44

55
[discrete]
66
==== Introduction

docs/reference/high-availability.asciidoc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33

44
[partintro]
55
--
6-
Your data is important to you. Keeping it safe and available is important
7-
to {es}. Sometimes your cluster may experience hardware failure or a power
8-
loss. To help you plan for this, {es} offers a number of features
9-
to achieve high availability despite failures.
6+
Your data is important to you. Keeping it safe and available is important to Elastic. Sometimes your cluster may experience hardware failure or a power loss. To help you plan for this, {es} offers a number of features to achieve high availability despite failures. Depending on your deployment type, you might need to provision servers in different zones or configure external repositories to meet your organization's availability needs.
107

11-
* With proper planning, a cluster can be
12-
<<high-availability-cluster-design,designed for resilience>> to many of the
13-
things that commonly go wrong, from the loss of a single node or network
14-
connection right up to a zone-wide outage such as power loss.
8+
* *<<high-availability-cluster-design,Design for resilience>>*
9+
+
10+
Distributed systems like Elasticsearch are designed to keep working even if some of their components have failed. An Elasticsearch cluster can continue operating normally if some of its nodes are unavailable or disconnected, as long as there are enough well-connected nodes to take over the unavailable node's responsibilities.
11+
+
12+
If you're designing a smaller cluster, you might focus on making your cluster resilient to single-node failures. Designers of larger clusters must also consider cases where multiple nodes fail at the same time.
13+
// need to improve connections to ECE, EC hosted, ECK pod/zone docs in the child topics
1514

16-
* You can use <<xpack-ccr,{ccr}>> to replicate data to a remote _follower_
17-
cluster which may be in a different data centre or even on a different
18-
continent from the leader cluster. The follower cluster acts as a hot
19-
standby, ready for you to fail over in the event of a disaster so severe that
20-
the leader cluster fails. The follower cluster can also act as a geo-replica
21-
to serve searches from nearby clients.
15+
* *<<xpack-ccr,Cross-cluster replication>>*
16+
+
17+
To effectively distribute read and write operations across nodes, the nodes in a cluster need good, reliable connections to each other. To provide better connections, you typically co-locate the nodes in the same data center or nearby data centers.
18+
+
19+
Co-locating nodes in a single location exposes you to the risk of a single outage taking your entire cluster offline. To maintain high availability, you can prepare a second cluster that can take over in case of disaster by implementing {ccr} (CCR).
20+
+
21+
CCR provides a way to automatically synchronize indices from a leader cluster to a follower cluster. This cluster could be in a different data center or even a different content from the leader cluster. If the primary cluster fails, the secondary cluster can take over.
22+
+
23+
TIP: You can also use CCR to create secondary clusters to serve read requests in geo-proximity to your users.
2224

23-
* The last line of defence against data loss is to take
24-
<<snapshots-take-snapshot,regular snapshots>> of your cluster so that you can
25-
restore a completely fresh copy of it elsewhere if needed.
25+
* *<<snapshot-restore,Snapshots>>*
26+
+
27+
Take snapshots of your cluster that can be restored in case of failure.
2628
--
2729

2830
include::high-availability/cluster-design.asciidoc[]
29-
30-
include::ccr/index.asciidoc[]

docs/reference/index.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ include::autoscaling/index.asciidoc[]
7676

7777
include::snapshot-restore/index.asciidoc[]
7878

79+
include::ccr/index.asciidoc[leveloffset=-1]
80+
7981
// reference
8082

83+
include::data-store-architecture.asciidoc[]
84+
8185
include::rest-api/index.asciidoc[]
8286

8387
include::commands/index.asciidoc[]

docs/reference/intro.asciidoc

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -397,51 +397,18 @@ geographic location of your users and your resources.
397397
[[use-multiple-nodes-shards]]
398398
==== Use multiple nodes and shards
399399

400-
[NOTE]
401-
====
402-
Nodes and shards are what make {es} distributed and scalable.
400+
When you move to production, you need to introduce multiple nodes and shards to your cluster. Nodes and shards are what make {es} distributed and scalable. The size and number of these nodes and shards depends on your data, your use case, and your budget.
403401

404-
These concepts arent essential if youre just getting started. How you <<elasticsearch-intro-deploy,deploy {es}>> in production determines what you need to know:
402+
These concepts aren't essential if you're just getting started. How you <<elasticsearch-intro-deploy,deploy {es}>> in production determines what you need to know:
405403

406404
* *Self-managed {es}*: You are responsible for setting up and managing nodes, clusters, shards, and replicas. This includes
407405
managing the underlying infrastructure, scaling, and ensuring high availability through failover and backup strategies.
408406
* *Elastic Cloud*: Elastic can autoscale resources in response to workload changes. Choose from different deployment types
409407
to apply sensible defaults for your use case. A basic understanding of nodes, shards, and replicas is still important.
410-
* *Elastic Cloud Serverless*: You dont need to worry about nodes, shards, or replicas. These resources are 100% automated
408+
* *Elastic Cloud Serverless*: You don't need to worry about nodes, shards, or replicas. These resources are 100% automated
411409
on the serverless platform, which is designed to scale with your workload.
412-
====
413-
414-
You can add servers (_nodes_) to a cluster to increase capacity, and {es} automatically distributes your data and query load
415-
across all of the available nodes.
416-
417-
Elastic is able to distribute your data across nodes by subdividing an index into _shards_. Each index in {es} is a grouping
418-
of one or more physical shards, where each shard is a self-contained Lucene index containing a subset of the documents in
419-
the index. By distributing the documents in an index across multiple shards, and distributing those shards across multiple
420-
nodes, {es} increases indexing and query capacity.
421-
422-
There are two types of shards: _primaries_ and _replicas_. Each document in an index belongs to one primary shard. A replica
423-
shard is a copy of a primary shard. Replicas maintain redundant copies of your data across the nodes in your cluster.
424-
This protects against hardware failure and increases capacity to serve read requests like searching or retrieving a document.
425-
426-
[TIP]
427-
====
428-
The number of primary shards in an index is fixed at the time that an index is created, but the number of replica shards can
429-
be changed at any time, without interrupting indexing or query operations.
430-
====
431-
432-
Shard copies in your cluster are automatically balanced across nodes to provide scale and high availability. All nodes are
433-
aware of all the other nodes in the cluster and can forward client requests to the appropriate node. This allows {es}
434-
to distribute indexing and query load across the cluster.
435-
436-
If you’re exploring {es} for the first time or working in a development environment, then you can use a cluster with a single node and create indices
437-
with only one shard. However, in a production environment, you should build a cluster with multiple nodes and indices
438-
with multiple shards to increase performance and resilience.
439-
440-
// TODO - diagram
441410

442-
To learn about optimizing the number and size of shards in your cluster, refer to <<size-your-shards,Size your shards>>.
443-
To learn about how read and write operations are replicated across shards and shard copies, refer to <<docs-replication,Reading and writing documents>>.
444-
To adjust how shards are allocated and balanced across nodes, refer to <<shard-allocation-relocation-recovery,Shard allocation, relocation, and recovery>>.
411+
Learn more about <<nodes-shards,nodes and shards>>.
445412

446413
[discrete]
447414
[[ccr-disaster-recovery-geo-proximity]]

docs/reference/modules/shard-ops.asciidoc

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[shard-allocation-relocation-recovery]]
2-
=== Shard allocation, relocation, and recovery
2+
== Shard allocation, relocation, and recovery
33

44
Each <<documents-indices,index>> in Elasticsearch is divided into one or more <<scalability,shards>>.
55
Each document in an index belongs to a single shard.
@@ -12,22 +12,25 @@ Over the course of normal operation, Elasticsearch allocates shard copies to nod
1212

1313
TIP: To learn about optimizing the number and size of shards in your cluster, refer to <<size-your-shards,Size your shards>>. To learn about how read and write operations are replicated across shards and shard copies, refer to <<docs-replication,Reading and writing documents>>.
1414

15+
[discrete]
1516
[[shard-allocation]]
16-
==== Shard allocation
17+
=== Shard allocation
1718

1819
include::{es-ref-dir}/modules/shard-allocation-desc.asciidoc[]
1920

2021
By default, the primary and replica shard copies for an index can be allocated to any node in the cluster, and may be relocated to rebalance the cluster.
2122

22-
===== Adjust shard allocation settings
23+
[discrete]
24+
==== Adjust shard allocation settings
2325

2426
You can control how shard copies are allocated using the following settings:
2527

2628
- <<modules-cluster,Cluster-level shard allocation settings>>: Use these settings to control how shard copies are allocated and balanced across the entire cluster. For example, you might want to allocate nodes availability zones, or prevent certain nodes from being used so you can perform maintenance.
2729

2830
- <<index-modules-allocation,Index-level shard allocation settings>>: Use these settings to control how the shard copies for a specific index are allocated. For example, you might want to allocate an index to a node in a specific data tier, or to an node with specific attributes.
2931

30-
===== Monitor shard allocation
32+
[discrete]
33+
==== Monitor shard allocation
3134

3235
If a shard copy is unassigned, it means that the shard copy is not allocated to any node in the cluster. This can happen if there are not enough nodes in the cluster to allocate the shard copy, or if the shard copy can't be allocated to any node that satisfies the shard allocation filtering rules. When a shard copy is unassigned, your cluster is considered unhealthy and returns a yellow or red cluster health status.
3336

@@ -39,12 +42,14 @@ You can use the following APIs to monitor shard allocation:
3942

4043
<<red-yellow-cluster-status,Learn more about troubleshooting unassigned shard copies and recovering your cluster health>>.
4144

45+
[discrete]
4246
[[shard-recovery]]
43-
==== Shard recovery
47+
=== Shard recovery
4448

4549
include::{es-ref-dir}/modules/shard-recovery-desc.asciidoc[]
4650

47-
===== Adjust shard recovery settings
51+
[discrete]
52+
==== Adjust shard recovery settings
4853

4954
To control how shards are recovered, for example the resources that can be used by recovery operations, and which indices should be prioritized for recovery, you can adjust the following settings:
5055

@@ -54,21 +59,24 @@ To control how shards are recovered, for example the resources that can be used
5459

5560
Shard recovery operations also respect general shard allocation settings.
5661

57-
===== Monitor shard recovery
62+
[discrete]
63+
==== Monitor shard recovery
5864

5965
You can use the following APIs to monitor shard allocation:
6066

6167
- View a list of in-progress and completed recoveries using the <<cat-recovery,cat recovery API>>
6268
- View detailed information about a specific recovery using the <<indices-recovery,index recovery API>>
6369

70+
[discrete]
6471
[[shard-relocation]]
65-
==== Shard relocation
72+
=== Shard relocation
6673

6774
Shard relocation is the process of moving shard copies from one node to another. This can happen when a node joins or leaves the cluster, or when the cluster is rebalancing.
6875

6976
When a shard copy is relocated, it is created as a new shard copy on the target node. When the shard copy is fully allocated and recovered, the old shard copy is deleted. If the shard copy being relocated is a primary, then the new shard copy is marked as primary before the old shard copy is deleted.
7077

71-
===== Adjust shard relocation settings
78+
[discrete]
79+
==== Adjust shard relocation settings
7280

7381
You can control how and when shard copies are relocated. For example, you can adjust the rebalancing settings that control when shard copies are relocated to balance the cluster, or the high watermark for disk-based shard allocation that can trigger relocation. These settings are part of the <<modules-cluster,cluster-level shard allocation settings>>.
7482

0 commit comments

Comments
 (0)