diff --git a/.github/updatecli/updatecli.d/versions.yml b/.github/updatecli/updatecli.d/versions.yml index cb08e1bd4..f1beb71ca 100644 --- a/.github/updatecli/updatecli.d/versions.yml +++ b/.github/updatecli/updatecli.d/versions.yml @@ -59,7 +59,7 @@ sources: username: '{{ requiredEnv "GITHUB_ACTOR" }}' versionfilter: kind: semver - pattern: ">=9.0.0 <10.0.0" + pattern: "^9.0.0" latest-edot-dotnet-version: name: Get latest release version for the elastic-otel-dotnet @@ -312,7 +312,7 @@ targets: kind: yaml spec: file: config/versions.yml - key: versioning_systems.edot_collector.current + key: $.versioning_systems.edot_collector.current update-docs-docset-dotnet: name: 'Update config/versions.yml edot-dotnet {{ source "latest-edot-dotnet-version" }}' diff --git a/config/versions.yml b/config/versions.yml index 35d9627db..bd9e80766 100644 --- a/config/versions.yml +++ b/config/versions.yml @@ -92,3 +92,6 @@ versioning_systems: edot_cf_aws: base: 0.1 current: 0.2.0 + edot_cf_azure: + base: 0.1 + current: 0.6.0 \ No newline at end of file diff --git a/docs/_snippets/applies_to-key.md b/docs/_snippets/applies_to-key.md index a8f8729ec..2f86d0ac6 100644 --- a/docs/_snippets/applies_to-key.md +++ b/docs/_snippets/applies_to-key.md @@ -23,6 +23,7 @@ * `ecctl`: Applies to [Elastic cloud control](https://www.elastic.co/docs/reference/ecctl) (ECCTL). * `edot_android`: Applies to the [Elastic Distribution of OpenTelemetry Android](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/android/) (EDOT Android). * `edot_cf_aws`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). + * `edot_cf_azure`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). * `edot_collector`: Applies to the [Elastic Distribution of OpenTelemetry Collector](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (EDOT Collector). * `edot_dotnet`: Applies to the [Elastic Distribution of OpenTelemetry .NET](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/dotnet/) (EDOT .NET). * `edot_ios`: Applies to the [Elastic Distribution of OpenTelemetry iOS](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/ios/) (EDOT iOS). diff --git a/docs/syntax/applies.md b/docs/syntax/applies.md index bfd8feb54..770d91aa3 100644 --- a/docs/syntax/applies.md +++ b/docs/syntax/applies.md @@ -223,6 +223,7 @@ applies_to: edot_php: edot_python: edot_cf_aws: + edot_cf_azure: --- ``` ::::: diff --git a/docs/syntax/version-variables.md b/docs/syntax/version-variables.md index 280c57b18..838b36ca2 100644 --- a/docs/syntax/version-variables.md +++ b/docs/syntax/version-variables.md @@ -104,6 +104,7 @@ This is dictated by the [`versions.yml`](https://github.com/elastic/docs-builder * `edot_php` * `edot_python` * `edot_cf_aws` +* `edot_cf_azure` * `edot_collector` The following are available but should not be used. These map to serverless projects and have a fixed high version number. diff --git a/src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs b/src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs index a1f6525c7..4d5571a00 100644 --- a/src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs +++ b/src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs @@ -85,6 +85,8 @@ public enum VersioningSystemId EdotPython, [Display(Name = "edot_cf_aws")] EdotCfAws, + [Display(Name = "edot_cf_azure")] + EdotCfAzure, [Display(Name = "edot_collector")] EdotCollector } diff --git a/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs b/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs index 496f45291..563fcbc56 100644 --- a/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs +++ b/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs @@ -178,6 +178,9 @@ public record ProductApplicability [YamlMember(Alias = "edot_cf_aws")] public AppliesCollection? EdotCfAws { get; set; } + [YamlMember(Alias = "edot_cf_azure")] + public AppliesCollection? EdotCfAzure { get; set; } + [YamlMember(Alias = "edot_collector")] public AppliesCollection? EdotCollector { get; set; } } diff --git a/src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs b/src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs index e736e1bb9..a95815a17 100644 --- a/src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs +++ b/src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs @@ -19,7 +19,7 @@ public class ApplicableToYamlConverter : IYamlTypeConverter "elasticsearch", "observability", "security", "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_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python", "edot_cf_aws" + "edot_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python", "edot_cf_aws", "edot_cf_azure" ]; public bool Accepts(Type type) => type == typeof(ApplicableTo); @@ -228,7 +228,8 @@ private static bool TryGetProductApplicability(Dictionary dicti { "edot_node", a => productAvailability.EdotNode = a }, { "edot_php", a => productAvailability.EdotPhp = a }, { "edot_python", a => productAvailability.EdotPython = a }, - { "edot_cf_aws", a => productAvailability.EdotCfAws = a } + { "edot_cf_aws", a => productAvailability.EdotCfAws = a }, + { "edot_cf_azure", a => productAvailability.EdotCfAzure = a } }; foreach (var (key, action) in mapping) diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs index 138b04a0f..aee04d413 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs @@ -32,6 +32,7 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning // EDOT Products public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); + public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic Distribution of OpenTelemetry Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); public static readonly ApplicabilityDefinition EdotCollector = new("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector); public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs index 773bf03aa..efb907268 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs @@ -37,6 +37,7 @@ public class ApplicableToViewModel [p => p.Curator] = ApplicabilityMappings.Curator, [p => p.EdotAndroid] = ApplicabilityMappings.EdotAndroid, [p => p.EdotCfAws] = ApplicabilityMappings.EdotCfAws, + [p => p.EdotCfAzure] = ApplicabilityMappings.EdotCfAzure, [p => p.EdotCollector] = ApplicabilityMappings.EdotCollector, [p => p.EdotDotnet] = ApplicabilityMappings.EdotDotnet, [p => p.EdotIos] = ApplicabilityMappings.EdotIos,