Skip to content

Commit c64dd2c

Browse files
committed
Use hyphens for all configurations.
1 parent 102f9f1 commit c64dd2c

File tree

3 files changed

+71
-67
lines changed

3 files changed

+71
-67
lines changed

config/products.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@ products:
77
versioning: 'all'
88
apm-agent-dotnet:
99
display: 'APM .NET Agent'
10-
versioning: 'apm_agent_dotnet'
10+
versioning: 'apm-agent-dotnet'
1111
apm-agent-go:
1212
display: 'APM Go Agent'
13-
versioning: 'apm_agent_go'
13+
versioning: 'apm-agent-go'
1414
apm-agent-java:
1515
display: 'APM Java Agent'
16-
versioning: 'apm_agent_java'
16+
versioning: 'apm-agent-java'
1717
apm-agent-node:
1818
display: 'APM Node.js Agent'
19-
versioning: 'apm_agent_node'
19+
versioning: 'apm-agent-node'
2020
apm-agent-php:
2121
display: 'APM PHP Agent'
22-
versioning: 'apm_agent_php'
22+
versioning: 'apm-agent-php'
2323
apm-agent-python:
2424
display: 'APM Python Agent'
25-
versioning: 'apm_agent_python'
25+
versioning: 'apm-agent-python'
2626
apm-agent-ruby:
2727
display: 'APM Ruby Agent'
28-
versioning: 'apm_agent_ruby'
28+
versioning: 'apm-agent-ruby'
2929
apm-agent-rum-js:
3030
display: 'APM RUM JavaScript Agent'
31-
versioning: 'apm_agent_rum'
31+
versioning: 'apm-agent-rum'
3232
apm-k8s-attacher:
3333
display: 'APM Attacher for Kubernetes'
34-
versioning: 'apm_attacher'
34+
versioning: 'apm-attacher'
3535
apm-aws-lambda:
3636
display: 'APM AWS Lambda extension'
37-
versioning: 'apm_lambda'
37+
versioning: 'apm-lambda'
3838
apm-server:
3939
display: 'APM Server'
4040
versioning: 'stack'
@@ -61,7 +61,7 @@ products:
6161
versioning: 'serverless'
6262
cloud-terraform:
6363
display: 'Elastic Cloud Terraform Provider'
64-
versioning: 'cloud_terraform'
64+
versioning: 'cloud-terraform'
6565
curator:
6666
display: 'Elasticsearch Curator'
6767
versioning: 'curator'
@@ -73,31 +73,31 @@ products:
7373
versioning: 'stack'
7474
ecs-dotnet:
7575
display: 'ECS Logging .NET'
76-
versioning: 'ecs_logging_dotnet'
76+
versioning: 'ecs-logging-dotnet'
7777
ecs-logging-go-logrus:
7878
display: 'ECS Logging Go (Logrus)'
79-
versioning: 'ecs_logging_go_logrus'
79+
versioning: 'ecs-logging-go-logrus'
8080
ecs-logging-go-zap:
8181
display: 'ECS Logging Go (Zap)'
82-
versioning: 'ecs_logging_go_zap'
82+
versioning: 'ecs-logging-go-zap'
8383
ecs-logging-go-zerolog:
8484
display: 'ECS Logging Go (Zerolog)'
85-
versioning: 'ecs_logging_go_zerolog'
85+
versioning: 'ecs-logging-go-zerolog'
8686
ecs-logging-java:
8787
display: 'ECS Logging Java'
88-
versioning: 'ecs_logging_java'
88+
versioning: 'ecs-logging-java'
8989
ecs-logging-nodejs:
9090
display: 'ECS Logging Node.js'
91-
versioning: 'ecs_logging_nodejs'
91+
versioning: 'ecs-logging-nodejs'
9292
ecs-logging-php:
9393
display: 'ECS Logging PHP'
94-
versioning: 'ecs_logging_php'
94+
versioning: 'ecs-logging-php'
9595
ecs-logging-python:
9696
display: 'ECS Logging Python'
97-
versioning: 'ecs_logging_python'
97+
versioning: 'ecs-logging-python'
9898
ecs-logging-ruby:
9999
display: 'ECS Logging Ruby'
100-
versioning: 'ecs_logging_ruby'
100+
versioning: 'ecs-logging-ruby'
101101
edot-cf:
102102
display: 'EDOT Cloud Forwarder'
103103
versioning: 'stack'
@@ -109,31 +109,31 @@ products:
109109
versioning: 'stack'
110110
edot-ios:
111111
display: 'Elastic Distribution of OpenTelemetry iOS'
112-
versioning: 'edot_ios'
112+
versioning: 'edot-ios'
113113
edot-android:
114114
display: 'Elastic Distribution of OpenTelemetry Android'
115-
versioning: 'edot_android'
115+
versioning: 'edot-android'
116116
edot-dotnet:
117117
display: 'Elastic Distribution of OpenTelemetry .NET'
118-
versioning: 'edot_dotnet'
118+
versioning: 'edot-dotnet'
119119
edot-java:
120120
display: 'Elastic Distribution of OpenTelemetry Java'
121-
versioning: 'edot_java'
121+
versioning: 'edot-java'
122122
edot-node:
123123
display: 'Elastic Distribution of OpenTelemetry Node'
124-
versioning: 'edot_node'
124+
versioning: 'edot-node'
125125
edot-php:
126126
display: 'Elastic Distribution of OpenTelemetry PHP'
127-
versioning: 'edot_php'
127+
versioning: 'edot-php'
128128
edot-python:
129129
display: 'Elastic Distribution of OpenTelemetry Python'
130-
versioning: 'edot_python'
130+
versioning: 'edot-python'
131131
edot-cf-aws:
132132
display: 'EDOT Cloud Forwarder for AWS'
133-
versioning: 'edot_cf_aws'
133+
versioning: 'edot-cf-aws'
134134
edot-cf-azure:
135135
display: 'EDOT Cloud Forwarder for Azure'
136-
versioning: 'edot_cf_azure'
136+
versioning: 'edot-cf-azure'
137137
eland:
138138
display: 'Eland'
139139
versioning: 'stack'

config/versions.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,105 +36,105 @@ versioning_systems:
3636
security: *all
3737

3838
# APM agents
39-
apm_agent_dotnet:
39+
apm-agent-dotnet:
4040
base: 1.0
4141
current: 1.34.1
42-
apm_agent_go:
42+
apm-agent-go:
4343
base: 2.0
4444
current: 2.7.1
45-
apm_agent_java:
45+
apm-agent-java:
4646
base: 1.0
4747
current: 1.55.1
48-
apm_agent_node:
48+
apm-agent-node:
4949
base: 4.0
5050
current: 4.13.0
51-
apm_agent_php:
51+
apm-agent-php:
5252
base: 1.0
5353
current: 1.15.1
54-
apm_agent_python:
54+
apm-agent-python:
5555
base: 6.0
5656
current: 6.24.0
57-
apm_agent_ruby:
57+
apm-agent-ruby:
5858
base: 4.0
5959
current: 4.8.0
60-
apm_agent_rum:
60+
apm-agent-rum:
6161
base: 5.0
6262
current: 5.17.0
63-
apm_attacher:
63+
apm-attacher:
6464
base: 1.0
6565
current: 1.1.3
66-
apm_lambda:
66+
apm-lambda:
6767
base: 1.0
6868
current: 1.6.0
6969

7070
# EDOTs
71-
edot_collector:
71+
edot-collector:
7272
base: 9.0
7373
current: 9.1.4
74-
edot_ios:
74+
edot-ios:
7575
base: 1.0
7676
current: 1.3.0
77-
edot_android:
77+
edot-android:
7878
base: 1.0
7979
current: 1.2.0
80-
edot_dotnet:
80+
edot-dotnet:
8181
base: 1.0
8282
current: 1.1.0
83-
edot_java:
83+
edot-java:
8484
base: 1.0
8585
current: 1.5.0
86-
edot_node:
86+
edot-node:
8787
base: 1.0
8888
current: 1.4.0
89-
edot_php:
89+
edot-php:
9090
base: 1.0
9191
current: 1.1.1
92-
edot_python:
92+
edot-python:
9393
base: 1.0
9494
current: 1.8.0
95-
edot_cf_aws:
95+
edot-cf-aws:
9696
base: 0.1
9797
current: 0.2.0
98-
edot_cf_azure:
98+
edot-cf-azure:
9999
base: 0.1
100100
current: 0.6.0
101101

102102
# Logging
103-
ecs_logging_dotnet:
103+
ecs-logging-dotnet:
104104
base: 8.0
105105
current: 8.18.1
106-
ecs_logging_go_logrus:
106+
ecs-logging-go-logrus:
107107
base: 1.0
108108
current: 1.0.0
109-
ecs_logging_go_zap:
109+
ecs-logging-go-zap:
110110
base: 1.0
111111
current: 1.0.3
112-
ecs_logging_go_zerolog:
112+
ecs-logging-go-zerolog:
113113
base: 0.2
114114
current: 0.2.0
115-
ecs_logging_java:
115+
ecs-logging-java:
116116
base: 1.0
117117
current: 1.7.0
118-
ecs_logging_nodejs:
118+
ecs-logging-nodejs:
119119
base: 1.0
120120
current: 1.5.3
121-
ecs_logging_php:
121+
ecs-logging-php:
122122
base: 2.0
123123
current: 2.0.0
124-
ecs_logging_python:
124+
ecs-logging-python:
125125
base: 2.0
126126
current: 2.2.0
127-
ecs_logging_ruby:
127+
ecs-logging-ruby:
128128
base: 1.0
129129
current: 1.0.0
130130
esf:
131131
base: 1.0
132132
current: 1.21.0
133-
search_ui:
133+
search-ui:
134134
base: 1.0
135135
current: 1.24.2
136136

137137
# Other
138-
cloud_terraform:
138+
cloud-terraform:
139139
base: 0.11
140140
current: 0.11.17

docs/configure/site/products.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ The [`products.yml`](https://github.com/elastic/docs-builder/blob/main/config/pr
44

55
```yml
66
products:
7-
apm_agent_dotnet:
7+
apm-agent-dotnet:
88
display: 'APM .NET Agent'
9-
versioning: 'apm_agent_dotnet'
10-
edot_collector:
9+
versioning: 'apm-agent-dotnet'
10+
edot-collector:
1111
display: 'Elastic Distribution of OpenTelemetry Collector'
1212
versioning: 'stack'
1313
#...
@@ -28,17 +28,21 @@ Writing `{{ product.<product-id> }}` renders the friendly name of the product in
2828

2929
| Substitution | Result |
3030
|---------------------------------|---|
31-
| `{{ product.apm_agent_dotnet }}` |{{ product.apm_agent_dotnet }} |
32-
| `{{ product.edot_collector }}` | {{ product.edot_collector }} |
31+
| `{{ product.apm-agent-dotnet }}` |{{ product.apm-agent-dotnet }} |
32+
| `{{ product.edot-collector }}` | {{ product.edot-collector }} |
3333

3434
You can also use the shorthand notation `{{ .<product_id> }}`. For example:
3535

3636
| Substitution | Result |
3737
|---------------------------------|---|
38-
| `{{ .apm_agent_dotnet }}` |{{ .apm_agent_dotnet }} |
39-
| `{{ .edot_collector }}` | {{ .edot_collector }} |
38+
| `{{ .apm-agent-dotnet }}` |{{ .apm-agent-dotnet }} |
39+
| `{{ .edot-collector }}` | {{ .edot-collector }} |
4040

4141

42+
:::{note}
43+
While the recommended separator is a hyphen (`-`) to promote cohesion, underscores (`_`) are also supported, and internally read as hyphens.
44+
:::
45+
4246
## See also
4347

4448
[](./versions.md)

0 commit comments

Comments
 (0)