Fix otel urls in documentation for fieldsets with underscores (#2486)

* Fix otel urls for fieldsets with underscores

For fieldsets with underscores, the generated otel field links were not
correct, resulting in 404 when trying to follow the link.

This generates the correct url for these fields.

* Update changelog

---------

Co-authored-by: Alexandra Konrad <alexandra.konrad@elastic.co>

Author: mjwolf

CHANGELOG.next.md

@@ -27,6 +27,8 @@ Thanks, you're awesome :-) -->
 
 #### Bugfixes
 
+* Fix otel urls for fieldsets with underscores. #2486
+
 #### Added
 
 #### Improvements

docs/reference/ecs-otel-alignment-details.md

@@ -213,6 +213,6 @@ The following table gives an overview of mappings between individual ECS fields
 | $$$otel-mapping-for-user-name$$$ [user.name](/reference/ecs-user.md#field-user-name) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user.name](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user/#user-name) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |
 | $$$otel-mapping-for-user-roles$$$ [user.roles](/reference/ecs-user.md#field-user-roles) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user.roles](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user/#user-roles) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |
 | **User agent Fields** |
-| $$$otel-mapping-for-user-agent-name$$$ [user_agent.name](/reference/ecs-user_agent.md#field-user-agent-name) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.name](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-name) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |
-| $$$otel-mapping-for-user-agent-original$$$ [user_agent.original](/reference/ecs-user_agent.md#field-user-agent-original) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.original](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-original) | ![stable](https://img.shields.io/badge/✔-93c93e?style=flat) |
-| $$$otel-mapping-for-user-agent-version$$$ [user_agent.version](/reference/ecs-user_agent.md#field-user-agent-version) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.version](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-version) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |
+| $$$otel-mapping-for-user-agent-name$$$ [user_agent.name](/reference/ecs-user_agent.md#field-user-agent-name) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.name](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-name) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |
+| $$$otel-mapping-for-user-agent-original$$$ [user_agent.original](/reference/ecs-user_agent.md#field-user-agent-original) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.original](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-original) | ![stable](https://img.shields.io/badge/✔-93c93e?style=flat) |
+| $$$otel-mapping-for-user-agent-version$$$ [user_agent.version](/reference/ecs-user_agent.md#field-user-agent-version) | [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) | [user_agent.version](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-version) | ![development](https://img.shields.io/badge/✘-fed10c?style=flat) |

docs/reference/ecs-user_agent.md

@@ -18,9 +18,9 @@ They often show up in web service logs coming from the parsed user agent string.
 | Field | Description | Level |
 | --- | --- | --- |
 | $$$field-user-agent-device-name$$$ [user_agent.device.name](#field-user-agent-device-name) | Name of the device.<br><br>type: keyword<br><br>example: `iPhone` | extended |
-| $$$field-user-agent-name$$$ [user_agent.name](#field-user-agent-name) | Name of the user agent.<br><br>type: keyword<br><br>example: `Safari`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.name](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-name) | extended |
-| $$$field-user-agent-original$$$ [user_agent.original](#field-user-agent-original) | Unparsed user_agent string.<br><br>type: keyword<br><br>Multi-fields:<br><br>* user_agent.original.text (type: match_only_text)<br><br>example: `Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.original](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-original) | extended |
-| $$$field-user-agent-version$$$ [user_agent.version](#field-user-agent-version) | Version of the user agent.<br><br>type: keyword<br><br>example: `12.0`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.version](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user_agent/#user-agent-version) | extended |
+| $$$field-user-agent-name$$$ [user_agent.name](#field-user-agent-name) | Name of the user agent.<br><br>type: keyword<br><br>example: `Safari`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.name](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-name) | extended |
+| $$$field-user-agent-original$$$ [user_agent.original](#field-user-agent-original) | Unparsed user_agent string.<br><br>type: keyword<br><br>Multi-fields:<br><br>* user_agent.original.text (type: match_only_text)<br><br>example: `Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.original](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-original) | extended |
+| $$$field-user-agent-version$$$ [user_agent.version](#field-user-agent-version) | Version of the user agent.<br><br>type: keyword<br><br>example: `12.0`<br><br>![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry) [![match](https://img.shields.io/badge/match-93c93e?style=flat)](/reference/ecs-opentelemetry.md#ecs-opentelemetry-relation) [user_agent.version](https://opentelemetry.io/docs/specs/semconv/attributes-registry/user-agent/#user-agent-version) | extended |
 
 
 ### Field sets that can be nested under User agent [ecs-user_agent-nestings]

scripts/templates/macros.j2

@@ -20,7 +20,7 @@
 {# macro - OTel attribute link #}
 {%- macro otel_attribute_link(field, otel) -%}
 [{{ otel_attribute(field, otel) }}](https://opentelemetry.io/docs/specs/semconv/attributes-registry/
-{{- otel_attribute(field, otel).split(".")[0] -}}
+{{- otel_attribute(field, otel).split(".")[0] | replace("_", "-") -}}
 /#
 {{- otel_attribute_dashed_name(field, otel) -}}
 )
@@ -107,4 +107,4 @@ Not applicable.
 {%- endmacro -%}
 
 {# OTel badge #}
-{%- set otel_badge = "![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry)" -%}
+{%- set otel_badge = "![OTel Badge](https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentelemetry)" -%}