From 8896afe167b1f7c59a7862a18d6cc946c6a0a270 Mon Sep 17 00:00:00 2001 From: kvalliyurnatt <135071014+kvalliyurnatt@users.noreply.github.com> Date: Thu, 30 May 2024 13:30:17 -0400 Subject: [PATCH] update docs and release highlights to note logstash licensing (#7860) (#7862) * update docs and release highlights to note logstash licensing --------- Co-authored-by: Michael Montgomery (cherry picked from commit 634ccd111feddf70f3bcaf21db9ecce990bc9d94) --- docs/operating-eck/licensing.asciidoc | 2 ++ docs/release-notes/2.13.0.asciidoc | 1 + docs/release-notes/highlights-2.13.0.asciidoc | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/docs/operating-eck/licensing.asciidoc b/docs/operating-eck/licensing.asciidoc index c551de15ef..c8e4fc8e61 100644 --- a/docs/operating-eck/licensing.asciidoc +++ b/docs/operating-eck/licensing.asciidoc @@ -127,3 +127,5 @@ elastic_licensing_enterprise_resource_units_total{license_level="basic"} 6 # TYPE elastic_licensing_memory_gigabytes_total gauge elastic_licensing_memory_gigabytes_total{license_level="basic"} 357.01915648 ---- + +NOTE: Logstash resources managed by ECK will be counted towards ERU usage for informational purposes. Billable consumption depends on license terms on a per customer basis (See link:https://www.elastic.co/agreements/global/self-managed[Self Managed Subscription Agreement]) diff --git a/docs/release-notes/2.13.0.asciidoc b/docs/release-notes/2.13.0.asciidoc index 0d7f4102d7..23cfc10c56 100644 --- a/docs/release-notes/2.13.0.asciidoc +++ b/docs/release-notes/2.13.0.asciidoc @@ -16,6 +16,7 @@ [float] === Enhancements +* Account for Logstash memory in resource aggregator {pull}7853[#7853] * Add Helm annotation to CRDs to prevent accidental deletion. {pull}7811[#7811] (issue: {issue}5117[#5117]) * Allow disabling of elastic user. {pull}7723[#7723] (issue: {issue}7719[#7719]) * Make automountServiceAccountToken configurable on operator Pods via Helm {pull}7690[#7690] diff --git a/docs/release-notes/highlights-2.13.0.asciidoc b/docs/release-notes/highlights-2.13.0.asciidoc index c2c3c273a4..ca0348a6fc 100644 --- a/docs/release-notes/highlights-2.13.0.asciidoc +++ b/docs/release-notes/highlights-2.13.0.asciidoc @@ -28,3 +28,9 @@ ECK 2.13.0 introduces a new option that allows a user to disable the elastic use With ECK 2.13.0, support for Logstash is moving out of technical preview and is now generally available (GA). Logstash managed by ECK is now considered production-ready. +[float] +[id="{p}-2130-eck-logstash-licensing"] +=== Logstash licensing on ECK + +ECK's resource https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-licensing.html#k8s-get-usage-data[management accounting] has been modified to include Logstash resources managed by ECK, which is provided for informational purposes. Billable consumption depends on license terms on a per customer basis (See https://www.elastic.co/agreements/global/self-managed[Self Managed Subscription Agreement]). +