Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/updatecli/updatecli.d/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" }}'
Expand Down
3 changes: 3 additions & 0 deletions config/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions docs/_snippets/applies_to-key.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
1 change: 1 addition & 0 deletions docs/syntax/applies.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ applies_to:
edot_php:
edot_python:
edot_cf_aws:
edot_cf_azure:
---
```
:::::
Expand Down
1 change: 1 addition & 0 deletions docs/syntax/version-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
3 changes: 3 additions & 0 deletions src/Elastic.Documentation/AppliesTo/ApplicableTo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -228,7 +228,8 @@ private static bool TryGetProductApplicability(Dictionary<object, object?> 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning
// EDOT Products
public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Android", VersioningSystemId.EdotAndroid);
public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for AWS", VersioningSystemId.EdotCfAws);
public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;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&nbsp;Distribution of OpenTelemetry&nbsp;.NET", VersioningSystemId.EdotDotnet);
public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;iOS", VersioningSystemId.EdotIos);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading