Remove warm phase from default ILM policy (#6322)

(cherry picked from commit c3d27d4) # Conflicts: # changelogs/head.asciidoc
elastic · Oct 12, 2021 · b206b52 · b206b52
1 parent 2ff4d3b
commit b206b52
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -0,0 +1,49 @@
+[[release-notes-head]]
+== APM Server version HEAD
+
+https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
+
+[float]
+==== Breaking Changes
+- Removed unused stacktrace/frame monitoring counters {pull}5984[5984]
+- Removed unused support for top-level metricsets and metricset tags for RUMv3 {pull}6065[6065]
+- Removed `apm-server.mode` configuration, and "experimental" fields {pull}6086[6086]
+- `transaction.sampled` is now only set for sampled transactions {pull}6066[6066]
+- Unknown metrics are dropped when `transaction.*` or `span.*` are present in a metricset {pull}6111[6111]
+- Removed `metricset.period` from service_destination metrics {pull}6111[6111]
+- Removed `http.request.socket` fields {pull}6152[6152]
+- Removed unused `transaction.duration.{count,sum.us}` metric fields {pull}6174[6174]
+- Removed `apm-server.sampling.tail.storage_dir` config {pull}6236[6236]
+- Removed `ProcessPending` self-instrumentation events {pull}6243[6243]
+- Removed warm phase from default ILM policy {pull}6322[6322]
+
+[float]
+==== Bug fixes
+- processor/otel: don't truncate `db.statement` {pull}6305[6305]
+- Use timestamp of original events for transaction/span metrics {pull}6311[6311]
+
+[float]
+==== Intake API Changes
+- `faas`, `service.origin.*`, and `cloud.origin.*` added for supporting function as a service fields {pull}6161[6161]
+- `context.message.routing_key` was added to the intake API {pull}6177[6177]
+- `transaction.dropped_spans_stats` was added to the intake API {pull}6200[6200]
+
+[float]
+==== Added
+- The `error.log.message` or `error.exception.message` field of errors will be copied to the ECS field `message` {pull}5974[5974]
+- Define index sorting for internal metrics data stream {pull}6116[6116]
+- Add histogram dynamic_template to app metrics data stream {pull}6043[6043]
+- Index OpenTelemetry span events and Jaeger logs into a log data stream {pull}6122[6122]
+- With `apm-server.data_streams.enabled` in standalone mode, the server now accepts and enqueues events while waiting for the integration to be installed {pull}6130[6130]
+- HTTP server errors (e.g. TLS handshake errors) are now logged {pull}6141[6141]
+- Span documents now duplicate extended HTTP fields, which were previously only under `span.http.*`, under `http.*` {pull}6147[6147]
+- We now record the direct network peer for incoming requests as `source.ip` and `source.port`; origin IP is recorded in `client.ip` {pull}6152[6152]
+- We now collect span destination metrics for transactions with too many spans (for example due to transaction_max_spans or exit_span_min_duration) when collected and sent by APM agents {pull}6200[6200]
+- `output.elasticsearch.experimental` can be used to enable a new, experimental Elasticsearch output using the go-elasticsearch client {pull}5970[5970]
+
+[float]
+==== Deprecated
+- Setting `service.version` as a span tag (Jaeger) or attribute (OTel) is deprecated; use tracer tags (Jaeger) and resource attributes (OTel) {pull}6131[6131]
+- Setting up Elasticsearch templates, ILM policies, and pipelines directly with apm-server is now deprecated. Users should use the integration package {pull}6145[6145]
+- `span.http.*` fields are deprecated, replaced by `http.*`, and will be removed in 8.0 {pull}6147[6147]
+- Add deprecation warning for `sampling.keep_unsampled=true` {pull}6285[6285]
diff --git 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
@@ -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
@@ -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
@@ -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"]