Merge remote-tracking branch 'origin/main' into otelbot/semconv-integration-v1.40.0-dev

Author: otelbot[bot]

.gitmodules

@@ -3,7 +3,7 @@
 	path = themes/docsy
 	url = https://github.com/google/docsy.git
   # cSpell:disable-next-line
-	docsy-pin = v0.14.3-34-g4db086c6
+	docsy-pin = v0.14.3-37-g6b1698a3
 	docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
 	docsy-reminder = "Ensure that any tag referenced by `docsy-pin` is present in the remote repo (url), otherwise add (push) the tags to the repo."
 [submodule "content-modules/opentelemetry-specification"]

README.md

@@ -94,28 +94,17 @@ These are the members of [@open-telemetry/docs-triagers][]:
 For more information about the triager role, see the
 [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triager).
 
-### Emeritus maintainers
-
-- [jparsana](https://github.com/jparsana)
-- [Morgan McLean](https://github.com/mtwo)
-- [Steve Flanders](https://github.com/flands)
-
-For more information about the emeritus role, see the
-[community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
-
-### Emeritus approvers
-
-- [Paul Bruce](https://github.com/paulsbruce)
-- [Michael Hausenblas](https://github.com/mhausenblas)
-- [Ted Young](https://github.com/tedsuo)
-
-For more information about the emeritus role, see the
-[community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
-
-### Emeritus triagers
-
-- [Kazunori Otani](https://github.com/katzchang)
-- [Masaki Sugimoto](https://github.com/Msksgm)
+### Emeritus
+
+- [jparsana](https://github.com/jparsana), Maintainer
+- [Kazunori Otani](https://github.com/katzchang), Triager
+- [Masaki Sugimoto](https://github.com/Msksgm), Triager
+- [Michael Hausenblas](https://github.com/mhausenblas), Approver
+- [Morgan McLean](https://github.com/mtwo), Maintainer
+- [Paul Bruce](https://github.com/paulsbruce), Approver
+- [Sergey Kanzhelev](https://github.com/SergeyKanzhelev), Approver
+- [Steve Flanders](https://github.com/flands), Maintainer
+- [Ted Young](https://github.com/tedsuo), Approver
 
 For more information about the emeritus role, see the
 [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).

config/_default/hugo.yaml

@@ -96,8 +96,9 @@ outputFormats:
     notAlternative: true
 
 outputs:
-  home: &home-outputs [HTML, RSS]
-  section: &section-outputs [HTML]
+  home: [HTML, markdown, RSS]
+  page: [HTML, markdown]
+  section: [HTML, markdown]
 
 services:
   rss: { limit: 20 }
@@ -108,16 +109,16 @@ cascade:
 
   # Enable redirects for site root (and not locales)
   - outputs:
-      # This must match the equivalent of [*home-outputs, redirects]
-      [HTML, RSS, redirects]
+      # This must match the equivalent of [outputs.home, redirects]
+      [HTML, markdown, RSS, redirects]
     target:
       kind: home
       sites: { matrix: { languages: [en] } }
 
   # Enable RSS for blog section
   - outputs:
-      # This must match the equivalent of [*section-outputs, RSS]
-      [HTML, RSS]
+      # This must match the equivalent of [outputs.section, RSS]
+      [HTML, markdown, RSS]
     target:
       kind: section
       path: '/blog'

content/en/announcements/kubecon-asia.md

@@ -17,6 +17,6 @@ community</span>!
 [blog]: /blog/2025/kubecon-japan/
 [kubecon]: https://www.cncf.io/kubecon-cloudnativecon-events
 [LF-Japan]:
-  https://events.linuxfoundation.org/kubecon-cloudnativecon-japan/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-Japan-2025&utm_content=slim-banner
+  https://events.linuxfoundation.org/kubecon-cloudnativecon-japan/register/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
 [LF-India]:
-  https://events.linuxfoundation.org/kubecon-cloudnativecon-india/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-India-2025&utm_content=slim-banner
+  https://events.linuxfoundation.org/kubecon-cloudnativecon-india/register/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner

content/en/announcements/kubecon-china.md

@@ -3,15 +3,14 @@ title: KubeCon + CloudNativeCon China 2025
 linkTitle: KubeCon China 2025
 date: 2025-05-20
 expiryDate: 2025-06-12 # keep
-build: { list: never, render: never } # Hide in favor of new Asia banner
 weight: 20250610
 params:
   # As of 2026-01-26, LF reports the event through lfasiallc.com
   eventUrl: >-
-    https://www.lfasiallc.com/kubecon-cloudnativecon-openinfra-summit-china/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-China-2026&utm_content=slim-banner
+    https://www.lfasiallc.com/kubecon-cloudnativecon-openinfra-summit-china/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
   # This is the old URL. Keeping for now. TODO: remove after 2026-08-31
   oldEventUrl: >- # This now redirects to the new URL
-    https://events.linuxfoundation.org/kubecon-cloudnativecon-china/reg/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-China-2025&utm_content=slim-banner
+    https://events.linuxfoundation.org/kubecon-cloudnativecon-china/reg/register/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
 ---
 
 <i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],

content/en/announcements/kubecon-eu.md

@@ -2,12 +2,12 @@
 title: KubeCon + CloudNativeCon Europe 2026
 linkTitle: KubeCon EU 2026
 date: 2026-02-02
-expiryDate: 2026-03-26
+expiryDate: 2026-03-26 # keep
 weight: 20260326
 params:
   eventUrl: >-
     https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/
-  queryParams: utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-EU-2026&utm_content=slim-banner
+  queryParams: utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
   blogPostURL: /blog/2026/kubecon-eu/
 ---
 
@@ -17,5 +17,5 @@ params:
 share][blog]<span class="d-none d-sm-inline"> with the Cloud Native
 community</span>!
 
-[LF]: <{{% param eventUrl %}}register/?{{% param queryParams %}}>
 [blog]: <{{% param blogPostURL %}}>
+[LF]: <{{% param eventUrl %}}register/?{{% param queryParams %}}>

content/en/announcements/kubecon-india.md

@@ -0,0 +1,23 @@
+---
+title: KubeCon + CloudNativeCon India 2026
+linkTitle: KubeCon India 2026
+date: 2026-04-06
+expiryDate: 2026-06-19 # keep
+weight: 20260619
+params:
+  eventUrl: &eventUrl >-
+    https://events.linuxfoundation.org/kubecon-cloudnativecon-india/
+  queryParams: >-
+    utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
+  # Use this when the blog post is ready:
+  # blogPostURL: /blog/2026/kubecon-india/
+  blogPostURL: *eventUrl
+---
+
+[**{{% param title %}}**][LF], **<span class="text-nowrap">18–19 June,</span>
+Mumbai**. <span class="d-none d-md-inline"><br></span> Come [collaborate, learn,
+and share][blog]<span class="d-none d-sm-inline"> with the Cloud Native
+community</span>!
+
+[blog]: <{{% param blogPostURL %}}>
+[LF]: <{{% param eventUrl %}}register/?{{% param queryParams %}}>

content/en/announcements/kubecon-japan.md

@@ -1,10 +1,14 @@
 ---
 title: KubeCon + CloudNativeCon Japan 2025
 linkTitle: KubeCon Japan 2025
-date: 2025-06-12 # Show once combined banner is hidden
+date: 2025-06-12
 expiryDate: 2025-06-18 # keep
-build: { list: never, render: never } # Hide in favor of new Asia banner
 weight: 20250616
+params:
+  eventUrl: &eventUrl >-
+    https://events.linuxfoundation.org/kubecon-cloudnativecon-japan/
+  queryParams: utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
+  blogPostURL: /blog/2025/kubecon-japan/
 ---
 
 <i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],
@@ -13,6 +17,5 @@ weight: 20250616
 share][blog]<span class="d-none d-sm-inline"> with the Cloud Native
 community</span>!
 
-[blog]: /blog/2025/kubecon-japan/
-[LF]:
-  https://events.linuxfoundation.org/kubecon-cloudnativecon-japan/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-Japan-2025&utm_content=slim-banner
+[blog]: <{{% param blogPostURL %}}>
+[LF]: <{{% param eventUrl %}}register/?{{% param queryParams %}}>

content/en/announcements/open-observability-summit-na.md

@@ -7,13 +7,13 @@ weight: 20250624
 ---
 
 <i class="fas fa-bullhorn"></i> <span class="d-none d-sm-inline">[Get
-ready][CNCF-blog] for the inaugural</span> [**{{% param title %}}**][oss] and
+ready][blog] for the inaugural</span> [**{{% param title %}}**][oss] and
 <span class="d-none d-md-inline"><br></span>
 <span class="d-none d-sm-inline">co-located </span>[**OTel Community
 Day**][ocd], **Denver CO, <span class="text-nowrap">June 24-26</span>**
 
-[CNCF-blog]: /blog/2025/otel-day/
+[blog]: /blog/2025/otel-day/
 [oss]:
-  https://events.linuxfoundation.org/open-source-summit-north-america/?utm_source=opentelemetry&utm_medium=all&utm_campaign=Open-Observability-Summit-2025&utm_content=slim-banner
+  https://events.linuxfoundation.org/open-source-summit-north-america/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner
 [ocd]:
-  https://events.linuxfoundation.org/open-observability-summit-otel-community-day/
+  https://events.linuxfoundation.org/open-observability-summit-otel-community-day/?utm_source=opentelemetry&utm_medium=website&utm_content=slim-banner

content/en/blog/2025/kubecon-china.md

@@ -38,6 +38,6 @@ the conference!
 Come listen, learn, and get involved in OpenTelemetry. See you in Hong!
 
 [KubeCon + CloudNativeCon China]:
-  https://www.lfasiallc.com/kubecon-cloudnativecon-openinfra-summit-pytorch-conference-china/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-EU-2025&utm_content=blog
+  https://www.lfasiallc.com/kubecon-cloudnativecon-openinfra-summit-pytorch-conference-china/?utm_source=opentelemetry&utm_medium=website&utm_content=blog
 [registration]:
-  https://events.linuxfoundation.org/kubecon-cloudnativecon-china/reg/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-China-2025
+  https://events.linuxfoundation.org/kubecon-cloudnativecon-china/reg/register/?utm_source=opentelemetry&utm_medium=website&utm_content=blog