From 5aad093bae50f7d1208274acb7e416e5b601c5dc Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Thu, 3 Jul 2025 09:21:42 +0200 Subject: [PATCH 1/2] Add EDOT Collector --- src/Elastic.Documentation.Configuration/Versions/Version.cs | 4 +++- src/Elastic.Documentation.Configuration/versions.yml | 3 +++ .../Myst/Components/ApplicableToComponent.cshtml | 6 ++++++ src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Elastic.Documentation.Configuration/Versions/Version.cs b/src/Elastic.Documentation.Configuration/Versions/Version.cs index fac57f1e0..78e911567 100644 --- a/src/Elastic.Documentation.Configuration/Versions/Version.cs +++ b/src/Elastic.Documentation.Configuration/Versions/Version.cs @@ -84,7 +84,9 @@ public enum VersioningSystemId [Display(Name = "edot_python")] EdotPython, [Display(Name = "edot_cf_aws")] - EdotCfAws + EdotCfAws, + [Display(Name = "edot_collector")] + EdotCollector } [YamlSerializable] diff --git a/src/Elastic.Documentation.Configuration/versions.yml b/src/Elastic.Documentation.Configuration/versions.yml index 42ff61931..b171316b9 100644 --- a/src/Elastic.Documentation.Configuration/versions.yml +++ b/src/Elastic.Documentation.Configuration/versions.yml @@ -64,6 +64,9 @@ versioning_systems: current: 5.17.0 # EDOTs + edot_collector: + base: 9.0 + current: 9.0.3 edot_ios: base: 1.0 current: 1.2.1 diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml index fa0034614..cd1ef50d1 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml +++ b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml @@ -228,6 +228,12 @@ @RenderProduct("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws, pa.EdotCfAws) ; } + + if (pa.EdotCollector is not null) + { + @RenderProduct("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector, pa.EdotCollector) + ; + } } @functions { diff --git a/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs b/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs index 7f50998af..cd3cd078f 100644 --- a/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs +++ b/src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs @@ -177,6 +177,9 @@ public record ProductApplicability [YamlMember(Alias = "edot_cf_aws")] public AppliesCollection? EdotCfAws { get; set; } + + [YamlMember(Alias = "edot_collector")] + public AppliesCollection? EdotCollector { get; set; } } public class ApplicableToConverter : IYamlTypeConverter From 3553313ba5af4a144a4d472bd5bb0e4673615568 Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri Benedetti Date: Thu, 3 Jul 2025 09:24:54 +0200 Subject: [PATCH 2/2] Update docs --- docs/syntax/applies.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/syntax/applies.md b/docs/syntax/applies.md index 3ac4ccdac..8de237b32 100644 --- a/docs/syntax/applies.md +++ b/docs/syntax/applies.md @@ -227,16 +227,15 @@ applies_to: product: ecctl: curator: - apm_agent_android: apm_agent_dotnet: apm_agent_go: - apm_agent_ios: apm_agent_java: apm_agent_node: apm_agent_php: apm_agent_python: apm_agent_ruby: apm_agent_rum: + edot_collector: edot_ios: edot_android: edot_dotnet: @@ -244,6 +243,7 @@ applies_to: edot_node: edot_php: edot_python: + edot_cf_aws: --- ```