Skip to content

Commit 8896afe

Browse files
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 <[email protected]> (cherry picked from commit 634ccd1)
1 parent 0bdfbde commit 8896afe

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

docs/operating-eck/licensing.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,5 @@ elastic_licensing_enterprise_resource_units_total{license_level="basic"} 6
127127
# TYPE elastic_licensing_memory_gigabytes_total gauge
128128
elastic_licensing_memory_gigabytes_total{license_level="basic"} 357.01915648
129129
----
130+
131+
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])

docs/release-notes/2.13.0.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
[float]
1717
=== Enhancements
1818

19+
* Account for Logstash memory in resource aggregator {pull}7853[#7853]
1920
* Add Helm annotation to CRDs to prevent accidental deletion. {pull}7811[#7811] (issue: {issue}5117[#5117])
2021
* Allow disabling of elastic user. {pull}7723[#7723] (issue: {issue}7719[#7719])
2122
* Make automountServiceAccountToken configurable on operator Pods via Helm {pull}7690[#7690]

docs/release-notes/highlights-2.13.0.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,9 @@ ECK 2.13.0 introduces a new option that allows a user to disable the elastic use
2828
With ECK 2.13.0, support for Logstash is moving out of technical preview and is now generally available (GA).
2929
Logstash managed by ECK is now considered production-ready.
3030

31+
[float]
32+
[id="{p}-2130-eck-logstash-licensing"]
33+
=== Logstash licensing on ECK
34+
35+
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]).
36+

0 commit comments

Comments
 (0)