update docs and release highlights to note logstash licensing (elasti…

…c#7860) * update docs and release highlights to note logstash licensing --------- Co-authored-by: Michael Montgomery <mmontg1@gmail.com>
kvalliyurnatt · May 30, 2024 · 634ccd1 · 634ccd1
1 parent 292b6b6
commit 634ccd1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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]).
+