From ada91c112b3109c10949779e018cbae7558348c5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 03:38:39 -0400 Subject: [PATCH] [7.x] Remove warm phase from default ILM policy (backport #6322) (#6325) * Remove warm phase from default ILM policy (#6322) (cherry picked from commit c3d27d46342efbf1087c6f74256c81f688470f5e) # Conflicts: # changelogs/head.asciidoc * Delete head.asciidoc Co-authored-by: Andrew Wilkins --- _meta/beat.yml | 6 ------ apm-server.docker.yml | 6 ------ apm-server.yml | 6 ------ docs/apm-package/apm-integration.asciidoc | 3 +-- docs/ilm-reference.asciidoc | 13 +++---------- idxmgmt/ilm/config.go | 9 --------- tests/system/test_export.py | 2 +- 7 files changed, 5 insertions(+), 40 deletions(-) diff --git a/_meta/beat.yml b/_meta/beat.yml index ae2a6aab41d..dc285d844b9 100644 --- a/_meta/beat.yml +++ b/_meta/beat.yml @@ -468,12 +468,6 @@ apm-server: #max_age: "30d" #set_priority: #priority: 100 - #warm: - #min_age: "30d" - #actions: - #set_priority: - #priority: 50 - #readonly: {} diff --git a/apm-server.docker.yml b/apm-server.docker.yml index 70e3929cd09..eb3a326e8e0 100644 --- a/apm-server.docker.yml +++ b/apm-server.docker.yml @@ -468,12 +468,6 @@ apm-server: #max_age: "30d" #set_priority: #priority: 100 - #warm: - #min_age: "30d" - #actions: - #set_priority: - #priority: 50 - #readonly: {} diff --git a/apm-server.yml b/apm-server.yml index effc133a902..861d755898e 100644 --- a/apm-server.yml +++ b/apm-server.yml @@ -468,12 +468,6 @@ apm-server: #max_age: "30d" #set_priority: #priority: 100 - #warm: - #min_age: "30d" - #actions: - #set_priority: - #priority: 50 - #readonly: {} diff --git a/docs/apm-package/apm-integration.asciidoc b/docs/apm-package/apm-integration.asciidoc index 4aaaf41a832..17e86f001fc 100644 --- a/docs/apm-package/apm-integration.asciidoc +++ b/docs/apm-package/apm-integration.asciidoc @@ -46,8 +46,7 @@ Stack monitoring:: Index lifecycle management (ILM):: A default ILM policy, named `traces-apm.traces-default_policy` is created for all event types. -This policy moves indices to a warm data tier after 30 days. -No default cold or delete data tier is defined. +No default warm, cold, or delete data tiers are defined. It is not possible to configure this policy in APM Server or {agent}– it must be configured with {es} or {kib}. See {ref}/example-using-index-lifecycle-policy.html[Customize built-in ILM policies] for more information. diff --git a/docs/ilm-reference.asciidoc b/docs/ilm-reference.asciidoc index 94097f1174f..d7dd9c2da0b 100644 --- a/docs/ilm-reference.asciidoc +++ b/docs/ilm-reference.asciidoc @@ -28,15 +28,14 @@ will be applied to all APM indices as long as all of the following conditions ar * `output.elasticsearch` is enabled. * Custom `index` or `indices` settings are not configured. -The default ILM policy applies *hot* and *warm* phases to all APM events: +The default ILM policy applies only a *hot* phase to all APM events: `span`, `transaction`, `error`, and `metric`. -*Cold* and *delete* phases are not defined. + +*Warm*, *cold*, and *delete* phases are not defined. * *Hot* -- Rollover data when the index reaches a maximum size of 50gb or a maximum age of 30 days: `max_size: 50gb`, `max_age: 30d` -* *Warm* -- Move to warm phase after 30 days: `min_age: 30d` - [float] [[ilm-default-config]] === Default configuration @@ -74,12 +73,6 @@ apm-server: max_age: "30d" set_priority: priority: 100 - warm: - min_age: "30d" - actions: - set_priority: - priority: 50 - readonly: {} ---- [float] diff --git a/idxmgmt/ilm/config.go b/idxmgmt/ilm/config.go index 4f80c69d30c..fc0095c91bb 100644 --- a/idxmgmt/ilm/config.go +++ b/idxmgmt/ilm/config.go @@ -246,15 +246,6 @@ func defaultPolicies() map[string]Policy { }, }, }, - "warm": map[string]interface{}{ - "min_age": "30d", - "actions": map[string]interface{}{ - "set_priority": map[string]interface{}{ - "priority": 50, - }, - "readonly": map[string]interface{}{}, - }, - }, }, }, }, diff --git a/tests/system/test_export.py b/tests/system/test_export.py index ee4ef8f61ad..c5be43ac3af 100644 --- a/tests/system/test_export.py +++ b/tests/system/test_export.py @@ -79,7 +79,7 @@ def test_export_ilm_policy_to_files(self): with open(os.path.join(dir, file)) as f: policy = json.load(f) assert "hot" in policy["policy"]["phases"] - assert "warm" in policy["policy"]["phases"] + assert "warm" not in policy["policy"]["phases"] assert "delete" not in policy["policy"]["phases"]