Skip to content

Commit 5744cfe

Browse files
authored
Merge branch 'main' into local-llm-airgap
2 parents e82ca68 + c9c5259 commit 5744cfe

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

manage-data/data-store/data-streams/failure-store.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,3 +864,8 @@ POST _data_stream/_modify
864864

865865
This API gives you fine-grained control over the indices in your failure store, allowing you to manage backup and restoration operations as well as isolate failure data for later remediation.
866866

867+
## Cross Cluster Search compatibility [ccs-compatibility]
868+
869+
:::{important}
870+
Accessing the failure store across clusters using `::failures` is not yet supported.
871+
:::
295 KB
Loading

manage-data/lifecycle/index-lifecycle-management/tutorial-customize-built-in-policies.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ products:
1111

1212
{{es}} includes a set of built-in {{ilm-init}} policies that govern how managed indices transition as they age. This guide demonstrates how you can customize the lifecycle of a managed index, to adjust how the index transitions across [data tiers](/manage-data/lifecycle/data-tiers.md) and what [actions](/manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md#ilm-phase-actions), such as downsampling or shrinking, are performed on the index during each lifecycle phase.
1313

14+
Setting a custom {{ilm-init}} policy is useful when you have a specific set of indices, for example a set of Kubernetes logs which can grow to be quite large in volume, for which you don't want to use the default data retention duration and other {{ilm-init}} settings.
15+
1416
[{{agent}}](/reference/fleet/index.md) uses the following set of built-in {{ilm-init}} policies to manage backing indices for its data streams:
1517

1618
* `logs@lifecycle`
@@ -27,9 +29,11 @@ This tutorial covers customizing the way ingested logging data is managed. Rathe
2729
3. [Apply the new policy to your log data using a `logs@custom` component template](#example-using-index-lifecycle-policy-apply-policy).
2830

2931
:::{tip}
30-
If you're using [Elastic integrations](https://docs.elastic.co/en/integrations) and are not yet familiar with which data streams are associated with them, refer to [Manage the lifecycle policy for integrations data](/manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md).
32+
* If you're using [Elastic integrations](https://docs.elastic.co/en/integrations) and are not yet familiar with which data streams are associated with them, refer to [Manage the lifecycle policy for integrations data](/manage-data/lifecycle/index-lifecycle-management/manage-lifecycle-integrations-data.md).
33+
34+
* If you're looking for a more advanced use case, such as customizing an ILM policy for a selected set of data streams in one or more integrations or namespaces, check the set of tutorials in [Customize data retention policies](/reference/fleet/data-streams-ilm-tutorial.md) in the {{fleet}} and {{agent}} reference documentation.
3135

32-
If you're looking for a more advanced use case, such as customizing an ILM policy for a selected set of data streams in one or more integrations or namespaces, check the set of tutorials in [Customize data retention policies](/reference/fleet/data-streams-ilm-tutorial.md) in the {{fleet}} and {{agent}} reference documentation.
36+
These tutorials go into greater depth about creating and using `@custom` component templates. For example, the tutorial [Apply an ILM policy to all data streams generated from {{fleet}} integrations across all namespaces](/reference/fleet/data-streams-scenario1.md) shows how to create and use the `logs@custom` and `metrics@custom` component templates to customize {{ilm-init}} policies associated with data streams in integrations.
3337
:::
3438

3539
## Scenario [example-using-index-lifecycle-policy-scenario]
@@ -140,7 +144,20 @@ Copies of managed {{ilm-init}} policies are also marked as **Managed**. You can
140144

141145
To apply your new {{ilm-init}} policy to the `logs` index template, create or edit the `logs@custom` component template.
142146

143-
A `*@custom` component template allows you to customize the mappings and settings of managed index templates, without having to override managed index templates or component templates. This type of component template is automatically picked up by the index template. [Learn more](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template).
147+
148+
:::::{admonition} Using @custom component templates
149+
A `@custom` component template allows you to customize the mappings and settings of the managed index templates, without having to override them or their main component templates.
150+
151+
Many {{es}} managed index templates include one or more `@custom` component templates. A `@custom` component template must first be created before it can be used, and its name must exactly match the name specified in the managed index template in order to be applied automatically to indices as they're created.
152+
153+
For example, if you're ingesting OpenTelemetry (OTel) logs, any OTel log data streams and their backing indices are configured by the `logs-otel@template` managed index template. That index template automatically applies settings defined in the `logs@custom` and the `logs-otel@custom` template when they exist.
154+
155+
Go to **Index Management > Index Templates** and select any managed index to view the `@custom` component templates associated with it.
156+
157+
:::{image} /manage-data/images/elasticsearch-reference-tutorial-custom-policies-otel-template.png
158+
:alt: A screenshot showing the logs@custom and logs-otel@custom component templates associated with the logs-otel@template index template.
159+
:::
160+
:::::
144161

145162
:::{tip}
146163
If you want your {{ilm-init}} changes to apply only to specific indices, you can create a custom index template directly instead of modifying the custom component template. Use the **Index management** page in {{kib}} or the [index template](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-index-template) API to create a new template.

reference/fleet/automatic-integrations-synchronization.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ This feature is available only for certain subscription levels. For more informa
2626
* Remote clusters must be running the same {{es}} version as the management cluster, or a newer version that supports {{ccr}}.
2727
* To install integrations, remote clusters require access to the [{{package-registry}}](/reference/fleet/index.md#package-registry-intro).
2828

29+
## Limitations
30+
31+
These limitations apply when using the automatic integrations synchronization feature:
32+
33+
- [Index lifecycle management](/manage-data/lifecycle/index-lifecycle-management.md) (ILM) policies and enrich policies referenced in custom component templates are not automatically synchronized. Synchronizing custom assets that include references to ILM or enrich policies may cause custom component templates to break.
34+
- Integrations installed on the management cluster are synchronized to the remote cluster regardless of the space they are installed in. On the remote cluster, the synchronized integrations are always installed in the default space.
35+
2936
## Configure {{ccr}} on the remote cluster
3037

3138
In your remote cluster:

0 commit comments

Comments
 (0)