Skip to content

Commit 4bf5ecb

Browse files
authored
Add EDOT CF GCP (#2303)
* Add EDOT CF GCP * Update tests
1 parent 6f08f64 commit 4bf5ecb

File tree

11 files changed

+67
-39
lines changed

11 files changed

+67
-39
lines changed

.github/updatecli/updatecli.d/versions.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ sources:
7373
versionfilter:
7474
kind: latest
7575

76-
# latest-edot-cf-gcp-version:
77-
# name: Get latest release version for the edot-cf-gcp
78-
# kind: githubrelease
79-
# transformers:
80-
# - trimprefix: v
81-
# spec:
82-
# owner: elastic
83-
# repository: edot-cloud-forwarder-gcp
84-
# token: '{{ requiredEnv "GITHUB_TOKEN" }}'
85-
# username: '{{ requiredEnv "GITHUB_ACTOR" }}'
86-
# versionfilter:
87-
# kind: latest
76+
latest-edot-cf-gcp-version:
77+
name: Get latest release version for the edot-cf-gcp
78+
kind: githubrelease
79+
transformers:
80+
- trimprefix: v
81+
spec:
82+
owner: elastic
83+
repository: edot-cloud-forwarder-gcp
84+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
85+
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
86+
versionfilter:
87+
kind: latest
8888

8989
latest-edot-collector-version:
9090
name: Get latest major release version for the elastic-agent
@@ -362,14 +362,14 @@ targets:
362362
file: config/versions.yml
363363
key: versioning_systems.edot-cf-azure.current
364364

365-
# update-docs-docset-cf-gcp:
366-
# name: 'Update config/versions.yml edot-cf-gcp {{ source "latest-edot-cf-gcp-version" }}'
367-
# scmid: githubConfig
368-
# sourceid: latest-edot-cf-gcp-version
369-
# kind: yaml
370-
# spec:
371-
# file: config/versions.yml
372-
# key: versioning_systems.edot-cf-gcp.current
365+
update-docs-docset-cf-gcp:
366+
name: 'Update config/versions.yml edot-cf-gcp {{ source "latest-edot-cf-gcp-version" }}'
367+
scmid: githubConfig
368+
sourceid: latest-edot-cf-gcp-version
369+
kind: yaml
370+
spec:
371+
file: config/versions.yml
372+
key: versioning_systems.edot-cf-gcp.current
373373

374374
update-docs-docset-collector:
375375
name: 'Update config/versions.yml edot-collector {{ source "latest-edot-collector-version" }}'

config/products.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ products:
114114
display: 'EDOT Cloud Forwarder for AWS'
115115
edot-cf-azure:
116116
display: 'EDOT Cloud Forwarder for Azure'
117+
edot-cf-gcp:
118+
display: 'EDOT Cloud Forwarder for GCP'
117119
eland:
118120
display: 'Eland'
119121
versioning: 'stack'

config/versions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ versioning_systems:
101101
edot-cf-azure:
102102
base: 0.1
103103
current: 0.6.0
104-
# edot-cf-gcp:
105-
# base: 0.1
106-
# current: 0.1.0
104+
edot-cf-gcp:
105+
base: 0.1
106+
current: 0.1.0
107107

108108
# Logging
109109
ecs-logging-dotnet:

docs/_snippets/applies_to-key.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* `edot_android`: Applies to the [Elastic Distribution of OpenTelemetry Android](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/android/) (EDOT Android).
2525
* `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).
2626
* `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).
27+
* `edot_cf_gcp`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder).
2728
* `edot_collector`: Applies to the [Elastic Distribution of OpenTelemetry Collector](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (EDOT Collector).
2829
* `edot_dotnet`: Applies to the [Elastic Distribution of OpenTelemetry .NET](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/dotnet/) (EDOT .NET).
2930
* `edot_ios`: Applies to the [Elastic Distribution of OpenTelemetry iOS](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/ios/) (EDOT iOS).

src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ public enum VersioningSystemId
113113
EdotCfAws,
114114
[Display(Name = "edot-cf-azure")]
115115
EdotCfAzure,
116+
[Display(Name = "edot-cf-gcp")]
117+
EdotCfGcp,
116118
[Display(Name = "edot-collector")]
117119
EdotCollector,
118120
[Display(Name = "search-ui")]

src/Elastic.Documentation.Site/package-lock.json

Lines changed: 30 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Elastic.Documentation/AppliesTo/ApplicableTo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,9 @@ public record ProductApplicability
303303
[YamlMember(Alias = "edot-cf-azure")]
304304
public AppliesCollection? EdotCfAzure { get; set; }
305305

306+
[YamlMember(Alias = "edot-cf-gcp")]
307+
public AppliesCollection? EdotCfGcp { get; set; }
308+
306309
[YamlMember(Alias = "edot-collector")]
307310
public AppliesCollection? EdotCollector { get; set; }
308311

@@ -343,6 +346,7 @@ void AppendProduct(string name, AppliesCollection? value)
343346
AppendProduct("edot-python", EdotPython);
344347
AppendProduct("edot-cf-aws", EdotCfAws);
345348
AppendProduct("edot-cf-azure", EdotCfAzure);
349+
AppendProduct("edot-cf-gcp", EdotCfGcp);
346350
AppendProduct("edot-collector", EdotCollector);
347351

348352
return sb.ToString();

src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ private static bool TryGetProductApplicability(Dictionary<object, object?> dicti
228228
{ "edot_php", a => productAvailability.EdotPhp = a },
229229
{ "edot_python", a => productAvailability.EdotPython = a },
230230
{ "edot_cf_aws", a => productAvailability.EdotCfAws = a },
231-
{ "edot_cf_azure", a => productAvailability.EdotCfAzure = a }
231+
{ "edot_cf_azure", a => productAvailability.EdotCfAzure = a },
232+
{ "edot_cf_gcp", a => productAvailability.EdotCfGcp = a }
232233
};
233234

234235
foreach (var (key, action) in mapping)

src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning
3333
public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Android", VersioningSystemId.EdotAndroid);
3434
public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for AWS", VersioningSystemId.EdotCfAws);
3535
public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for Azure", VersioningSystemId.EdotCfAzure);
36+
public static readonly ApplicabilityDefinition EdotCfGcp = new("EDOT CF GCP", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for GCP", VersioningSystemId.EdotCfGcp);
3637
public static readonly ApplicabilityDefinition EdotCollector = new("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector);
3738
public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;.NET", VersioningSystemId.EdotDotnet);
3839
public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;iOS", VersioningSystemId.EdotIos);

src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class ApplicableToViewModel
4040
[p => p.EdotAndroid] = ApplicabilityMappings.EdotAndroid,
4141
[p => p.EdotCfAws] = ApplicabilityMappings.EdotCfAws,
4242
[p => p.EdotCfAzure] = ApplicabilityMappings.EdotCfAzure,
43+
[p => p.EdotCfGcp] = ApplicabilityMappings.EdotCfGcp,
4344
[p => p.EdotCollector] = ApplicabilityMappings.EdotCollector,
4445
[p => p.EdotDotnet] = ApplicabilityMappings.EdotDotnet,
4546
[p => p.EdotIos] = ApplicabilityMappings.EdotIos,

0 commit comments

Comments
 (0)