diff --git a/.github/workflows/component-owners.yml b/.github/workflows/component-owners.yml
index 09e36b0b3f96..88f42dbc6df3 100644
--- a/.github/workflows/component-owners.yml
+++ b/.github/workflows/component-owners.yml
@@ -1,6 +1,7 @@
name: Component owners
on:
- pull_request_target:
+ workflow_dispatch:
+ # pull_request_target:
jobs:
run_self:
diff --git a/.htmltest.yml b/.htmltest.yml
index b68ed6e7d7fb..35205e1f40d6 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -15,6 +15,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
- ^((/..)?/docs/migration/)?opencensus/$
- ^(/community/end-user/)?feedback-survey/$
+ - ^/../docs/specs/?$ # non-default locale spec redirect
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
- ^https://www\.googletagmanager\.com
@@ -72,5 +73,3 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^https://wikipedia.org/wiki/(S.M.A.R.T|Hop_)
# TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
- ^https://shorturl.at/vLYZ0$
- # TODO remove the following temporary ignore rule (@chalin)
- - ^/en/docs/specs$
diff --git a/content/en/blog/2024/kubecon-china.md b/content/en/blog/2024/kubecon-china.md
index a09e59731462..8e3a787985e2 100644
--- a/content/en/blog/2024/kubecon-china.md
+++ b/content/en/blog/2024/kubecon-china.md
@@ -19,8 +19,8 @@ conference begins.
## Maintainer sessions
- **[OpenTelemetry Community Update | OpenTelemetry社区更新](https://sched.co/1eYcJ)**
- by Zihao Rao & Huxing Zhang, Alibaba Cloud
Wednesday, August 21 • 3:35 -
- 4:10
+ by Zihao Rao & Huxing Zhang & Wanqi Yang, Alibaba Cloud & Jared Tan,
+ DaoCloud
Wednesday, August 21 • 3:35 - 4:10
## AI_dev talks
@@ -41,7 +41,7 @@ by Zihao Rao & Ziyi Lin, Alibaba Cloud
Thursday, August 22 • 1:50 - 2:25
by Husni Alhamdani, Censhare & Herbert Sianturi, Krom Bank
Thursday,
August 22 • 3:35 - 4:10
- **[OpenTelemetry Amplified: Full Observability with EBPF-Enabled Distributed Tracing | OpenTelemetry放大:使用eBPF启用的分布式跟踪实现全面的可观测性](https://sched.co/1eYZq)**
- by Kai Liu, Alibaba Cloud & Wanqi Yang, Sun Yat
Thursday, August 22 •
- 5:15 - 5:50
+ by Kai Liu, Alibaba Cloud & Wanqi Yang, Sun Yat-sen University
Thursday,
+ August 22 • 5:15 - 5:50
Come listen, learn, and get involved in OpenTelemetry. See you in Hong Kong!
diff --git a/content/ja/docs/specs/_index.md b/content/ja/docs/specs/_index.md
index 63087076a600..3a226277cc25 100644
--- a/content/ja/docs/specs/_index.md
+++ b/content/ja/docs/specs/_index.md
@@ -1,12 +1,8 @@
---
title: Specifications
linkTitle: Specs ↗
-description: _Redirect page_
weight: 960
-# _build: { render: link }
-redirect: /en/docs/specs 301!
-redirects: [{ from: '*', to: '/en/docs/specs/:splat' }]
+_build: { render: link }
+redirects: [{ from: '*', to: '/docs/specs/:splat' }]
default_lang_commit: 3b44fbfa49ced919daea01123abfaed836d2d0ec
---
-
-Netlify redirect target: [{{% param "title" %}}]({{% param "redirect" %}}).
diff --git a/data/ecosystem/vendors.yaml b/data/ecosystem/vendors.yaml
index 1579c7ebc4a4..51bac4831a74 100644
--- a/data/ecosystem/vendors.yaml
+++ b/data/ecosystem/vendors.yaml
@@ -47,6 +47,12 @@
contact: support@causely.io
oss: false
commercial: true
+- name: Centreon
+ nativeOTLP: true
+ url: https://docs.centreon.com/pp/integrations/plugin-packs/getting-started/how-to-guides/telegraf/
+ contact: contact@centreon.com
+ oss: false
+ commercial: true
- name: Chronosphere
distribution: false
nativeOTLP: true
diff --git a/data/registry/instrumentation-cpp-httpd.yml b/data/registry/instrumentation-cpp-httpd.yml
index db9278178b37..fe7c8fcf91b4 100644
--- a/data/registry/instrumentation-cpp-httpd.yml
+++ b/data/registry/instrumentation-cpp-httpd.yml
@@ -13,3 +13,4 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/httpd
createdAt: 2021-11-11
+isFirstParty: false
diff --git a/data/registry/instrumentation-cpp-nginx.yml b/data/registry/instrumentation-cpp-nginx.yml
index 1e37643bc499..0547093a381f 100644
--- a/data/registry/instrumentation-cpp-nginx.yml
+++ b/data/registry/instrumentation-cpp-nginx.yml
@@ -14,3 +14,4 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/nginx
createdAt: 2021-11-11
+isFirstParty: false
diff --git a/data/registry/instrumentation-cpp-otel-webserver-module.yml b/data/registry/instrumentation-cpp-otel-webserver-module.yml
index 81bc9aeabf29..691e9a5052e3 100644
--- a/data/registry/instrumentation-cpp-otel-webserver-module.yml
+++ b/data/registry/instrumentation-cpp-otel-webserver-module.yml
@@ -17,3 +17,4 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/otel-webserver-module
createdAt: 2022-06-10
+isFirstParty: false
diff --git a/data/registry/instrumentation-dotnet-aspnet-telemetryhttpmodule.yml b/data/registry/instrumentation-dotnet-aspnet-telemetryhttpmodule.yml
index 2672670ab5ef..b97e79e0bc99 100644
--- a/data/registry/instrumentation-dotnet-aspnet-telemetryhttpmodule.yml
+++ b/data/registry/instrumentation-dotnet-aspnet-telemetryhttpmodule.yml
@@ -17,6 +17,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
createdAt: 2022-11-07
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
diff --git a/data/registry/instrumentation-dotnet-aspnet.yml b/data/registry/instrumentation-dotnet-aspnet.yml
index 01b49f49c57d..202aeece130a 100644
--- a/data/registry/instrumentation-dotnet-aspnet.yml
+++ b/data/registry/instrumentation-dotnet-aspnet.yml
@@ -14,6 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AspNet
diff --git a/data/registry/instrumentation-dotnet-aspnetcore.yml b/data/registry/instrumentation-dotnet-aspnetcore.yml
index e19af860289e..c2bcf993bb08 100644
--- a/data/registry/instrumentation-dotnet-aspnetcore.yml
+++ b/data/registry/instrumentation-dotnet-aspnetcore.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNetCore
createdAt: 2022-11-07
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AspNetCore
diff --git a/data/registry/instrumentation-dotnet-aws.yml b/data/registry/instrumentation-dotnet-aws.yml
index 170f515e7f4a..9868c99005e3 100644
--- a/data/registry/instrumentation-dotnet-aws.yml
+++ b/data/registry/instrumentation-dotnet-aws.yml
@@ -16,6 +16,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWS
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AWS
diff --git a/data/registry/instrumentation-dotnet-awslambda.yml b/data/registry/instrumentation-dotnet-awslambda.yml
index 1f93ce548de2..f6dd111d777a 100644
--- a/data/registry/instrumentation-dotnet-awslambda.yml
+++ b/data/registry/instrumentation-dotnet-awslambda.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWSLambda
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AWSLambda
diff --git a/data/registry/instrumentation-dotnet-azure-sdk.yml b/data/registry/instrumentation-dotnet-azure-sdk.yml
index 870562402f54..10431116ae27 100644
--- a/data/registry/instrumentation-dotnet-azure-sdk.yml
+++ b/data/registry/instrumentation-dotnet-azure-sdk.yml
@@ -15,3 +15,4 @@ authors:
urls:
repo: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/Diagnostics.md#opentelemetry-with-azure-monitor-zipkin-and-others
createdAt: 2021-12-16
+isFirstParty: true
diff --git a/data/registry/instrumentation-dotnet-cassandra.yml b/data/registry/instrumentation-dotnet-cassandra.yml
index 6063aaa843ed..5b89f4d28817 100644
--- a/data/registry/instrumentation-dotnet-cassandra.yml
+++ b/data/registry/instrumentation-dotnet-cassandra.yml
@@ -13,6 +13,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Cassandra
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Cassandra
diff --git a/data/registry/instrumentation-dotnet-confluentkafka.yml b/data/registry/instrumentation-dotnet-confluentkafka.yml
index c9523743779d..930f6a7edb10 100644
--- a/data/registry/instrumentation-dotnet-confluentkafka.yml
+++ b/data/registry/instrumentation-dotnet-confluentkafka.yml
@@ -13,3 +13,4 @@ description: Confluent.Kafka client instrumentation for OpenTelemetry
authors:
- name: OpenTelemetry Authors
createdAt: 2024-07-08
+isFirstParty: false
diff --git a/data/registry/instrumentation-dotnet-elasticsearchclient.yml b/data/registry/instrumentation-dotnet-elasticsearchclient.yml
index 425fc48568f2..8d4026d5cadd 100644
--- a/data/registry/instrumentation-dotnet-elasticsearchclient.yml
+++ b/data/registry/instrumentation-dotnet-elasticsearchclient.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.ElasticsearchClient
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.ElasticsearchClient
diff --git a/data/registry/instrumentation-dotnet-entityframeworkcore.yml b/data/registry/instrumentation-dotnet-entityframeworkcore.yml
index f239c9aa6883..e4b03d4040ff 100644
--- a/data/registry/instrumentation-dotnet-entityframeworkcore.yml
+++ b/data/registry/instrumentation-dotnet-entityframeworkcore.yml
@@ -16,6 +16,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EntityFrameworkCore
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.EntityFrameworkCore
diff --git a/data/registry/instrumentation-dotnet-eventcounters.yml b/data/registry/instrumentation-dotnet-eventcounters.yml
index 514702470b02..8001e5bc0962 100644
--- a/data/registry/instrumentation-dotnet-eventcounters.yml
+++ b/data/registry/instrumentation-dotnet-eventcounters.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EventCounters
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.EventCounters
diff --git a/data/registry/instrumentation-dotnet-grpccore.yml b/data/registry/instrumentation-dotnet-grpccore.yml
index 7670c1542814..6cb4d90f7f4e 100644
--- a/data/registry/instrumentation-dotnet-grpccore.yml
+++ b/data/registry/instrumentation-dotnet-grpccore.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.GrpcCore
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.GrpcCore
diff --git a/data/registry/instrumentation-dotnet-grpcnetclient.yml b/data/registry/instrumentation-dotnet-grpcnetclient.yml
index 95ed0781e057..74d0e1d3d17f 100644
--- a/data/registry/instrumentation-dotnet-grpcnetclient.yml
+++ b/data/registry/instrumentation-dotnet-grpcnetclient.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.GrpcNetClient
createdAt: 2022-11-07
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.GrpcNetClient
diff --git a/data/registry/instrumentation-dotnet-hangfire.yml b/data/registry/instrumentation-dotnet-hangfire.yml
index 3ca94260df88..47443043bbe6 100644
--- a/data/registry/instrumentation-dotnet-hangfire.yml
+++ b/data/registry/instrumentation-dotnet-hangfire.yml
@@ -14,6 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Hangfire
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Hangfire
diff --git a/data/registry/instrumentation-dotnet-http.yml b/data/registry/instrumentation-dotnet-http.yml
index c13fce8d045a..9ff5d883609f 100644
--- a/data/registry/instrumentation-dotnet-http.yml
+++ b/data/registry/instrumentation-dotnet-http.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Http
createdAt: 2022-11-07
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Http
diff --git a/data/registry/instrumentation-dotnet-instrumentation-aws.yml b/data/registry/instrumentation-dotnet-instrumentation-aws.yml
index 4bbe2df1847c..e44d1fda85f6 100644
--- a/data/registry/instrumentation-dotnet-instrumentation-aws.yml
+++ b/data/registry/instrumentation-dotnet-instrumentation-aws.yml
@@ -12,6 +12,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AWS
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AWS
diff --git a/data/registry/instrumentation-dotnet-masstransit.yml b/data/registry/instrumentation-dotnet-masstransit.yml
index ce390c30a54d..fc5d024fa1ce 100644
--- a/data/registry/instrumentation-dotnet-masstransit.yml
+++ b/data/registry/instrumentation-dotnet-masstransit.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.MassTransit
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.MassTransit
diff --git a/data/registry/instrumentation-dotnet-mysqldata.yml b/data/registry/instrumentation-dotnet-mysqldata.yml
index 8edb6f6fa15b..c2a6eb68a49f 100644
--- a/data/registry/instrumentation-dotnet-mysqldata.yml
+++ b/data/registry/instrumentation-dotnet-mysqldata.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.MySqlData
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.MySqlData
diff --git a/data/registry/instrumentation-dotnet-owin.yml b/data/registry/instrumentation-dotnet-owin.yml
index 0bad2de40dc2..04092e7b7bb3 100644
--- a/data/registry/instrumentation-dotnet-owin.yml
+++ b/data/registry/instrumentation-dotnet-owin.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Owin
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Owin
diff --git a/data/registry/instrumentation-dotnet-process.yml b/data/registry/instrumentation-dotnet-process.yml
index 2aef8e3740ec..26a503204eee 100644
--- a/data/registry/instrumentation-dotnet-process.yml
+++ b/data/registry/instrumentation-dotnet-process.yml
@@ -14,6 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Process
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Process
diff --git a/data/registry/instrumentation-dotnet-quartz.yml b/data/registry/instrumentation-dotnet-quartz.yml
index fe72238b0624..e40542da388c 100644
--- a/data/registry/instrumentation-dotnet-quartz.yml
+++ b/data/registry/instrumentation-dotnet-quartz.yml
@@ -12,6 +12,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Quartz
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Quartz
diff --git a/data/registry/instrumentation-dotnet-runtime.yml b/data/registry/instrumentation-dotnet-runtime.yml
index 3986036b6a70..0cef068ab6f3 100644
--- a/data/registry/instrumentation-dotnet-runtime.yml
+++ b/data/registry/instrumentation-dotnet-runtime.yml
@@ -16,6 +16,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Runtime
createdAt: 2022-08-16
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Runtime
diff --git a/data/registry/instrumentation-dotnet-sqlclient.yml b/data/registry/instrumentation-dotnet-sqlclient.yml
index 6e7df293932b..3a838c4aa2b2 100644
--- a/data/registry/instrumentation-dotnet-sqlclient.yml
+++ b/data/registry/instrumentation-dotnet-sqlclient.yml
@@ -15,6 +15,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.SqlClient
createdAt: 2022-11-07
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.SqlClient
diff --git a/data/registry/instrumentation-dotnet-stackexchangeredis.yml b/data/registry/instrumentation-dotnet-stackexchangeredis.yml
index 30cf38d83b39..d92711b74e79 100644
--- a/data/registry/instrumentation-dotnet-stackexchangeredis.yml
+++ b/data/registry/instrumentation-dotnet-stackexchangeredis.yml
@@ -16,6 +16,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.StackExchangeRedis
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.StackExchangeRedis
diff --git a/data/registry/instrumentation-dotnet-wcf.yml b/data/registry/instrumentation-dotnet-wcf.yml
index 7d1b6144e8ce..4480d36da7aa 100644
--- a/data/registry/instrumentation-dotnet-wcf.yml
+++ b/data/registry/instrumentation-dotnet-wcf.yml
@@ -14,6 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Wcf
createdAt: 2022-10-28
+isFirstParty: false
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Wcf
diff --git a/layouts/index.redirects b/layouts/index.redirects
index 7e7f4ac8073a..9b97c3c690bb 100644
--- a/layouts/index.redirects
+++ b/layouts/index.redirects
@@ -1,78 +1,14 @@
# Netlify redirects. See https://www.netlify.com/docs/redirects/
-{{/* cSpell:ignore cond wordmark */ -}}
-
-{{ range $p := .Site.Pages -}}
-
-{{ range $p.Params.redirects -}}
- {{ $from := cond (strings.HasPrefix .from "/")
- .from
- (print $p.RelPermalink .from) -}}
- {{ $to := cond (strings.HasPrefix .to "/")
- .to
- (print $p.RelPermalink .to) -}}
- {{ $from | printf "%-35s" }} {{ $to }}
-{{ end -}}
-
-{{ range $p.Aliases -}}
-{{/* Temporary workaround for semconv alias errors */ -}}
-{{ if strings.HasPrefix . "docs/specs/semconv/general" -}}
-{{ . | printf "%-35s" }} {{ $p.RelPermalink }}
-{{ else -}}
-{{ $alias := cond (strings.HasPrefix . "/")
- .
- (partial "relative-redirects-alias" (dict "alias" . "p" $p.Parent)) -}}
-{{ $alias | printf "%-35s" }} {{ $p.RelPermalink }}
-{{ end -}}
-{{ end -}}
-
-{{ with $p.Params.redirect -}}
- {{ $p.RelPermalink | printf "%-35s" }} {{ . }}
-{{ end -}}
-
-{{ end }}{{/* range $p */ -}}
-
-{{ $languages := (.Site.GetPage "/docs/instrumentation").Pages -}}
-{{ range $languages -}}
-{{ $lang := .File.ContentBaseName -}}
-{{ if ne $lang "other" -}}
-/docs/{{ $lang }} /docs/instrumentation/{{ $lang }}
-/docs/{{ $lang }}/* /docs/instrumentation/{{ $lang }}/:splat
-{{ end -}}
-{{ end -}}
+{{ partial "redirects/pages.txt" . | partial "func/trim-lines.html" -}}
+{{ partial "redirects/languages.txt" . | partial "func/trim-lines.html" -}}
+{{/* TODO: move the following into the spec index file. */ -}}
/docs/reference/specification /docs/specs/otel
/docs/reference/specification/* /docs/specs/otel/:splat
/docs/specification/otel/* /docs/specs/otel/:splat
-{{ $schemaFiles := partial "schema-file-list" . -}}
-{{ $latestSchemaFile := index $schemaFiles 0 -}}
-
-/schemas/latest /schemas/{{ $latestSchemaFile.Name }}
-
-{{/*
- Social-media image redirects. As mentioned in
- https://developers.facebook.com/docs/sharing/webmasters/images, we need to
- preserve og:image (and other social media image) URLs forever.
-*/ -}}
-
-{{ $og_image_current := `/img/social/logo-wordmark-001.png` -}}
-
-/featured-background.jpg {{ $og_image_current }} {{- /* homepage og:image used prior to 2022/08 */}}
-
-{{- define "partials/relative-redirects-alias" -}}
- {{ $result := "" }}
- {{ if strings.HasPrefix .alias "../" }}
- {{ $result = (partial "relative-redirects-alias"
- (dict
- "alias" (strings.TrimPrefix "../" .alias)
- "p" .p.Parent ))
- }}
- {{ else }}
- {{ $result = path.Join .p.RelPermalink .alias }}
- {{ end }}
- {{ return $result }}
-{{ end }}
+{{ partial "redirects/schemas.txt" . }}
-{{/* Multilingual support */ -}}
+{{ partial "redirects/social-media.txt" . }}
-{{ partial "redirects/sites.redirects" . | partial "func/trim-lines.html" -}}
+{{ partial "redirects/localization.txt" . | partial "func/trim-lines.html" }}
diff --git a/layouts/partials/func/trim-lines.html b/layouts/partials/func/trim-lines.html
index db3b92212962..ceffefd57be4 100644
--- a/layouts/partials/func/trim-lines.html
+++ b/layouts/partials/func/trim-lines.html
@@ -1,3 +1,5 @@
{{ range split . "\n" -}}
-{{ trim . " \t" }}
+{{ with trim . " \t" -}}
+{{ . }}
+{{ end -}}
{{ end -}}
diff --git a/layouts/partials/redirects/aliases.txt b/layouts/partials/redirects/aliases.txt
new file mode 100644
index 000000000000..b8cfb45aecce
--- /dev/null
+++ b/layouts/partials/redirects/aliases.txt
@@ -0,0 +1,29 @@
+{{/* Generate rules for `aliases` page param. */ -}}
+{{/* cSpell:ignore cond */ -}}
+
+{{ $p := . -}}
+{{ range $p.Aliases -}}
+ {{/* Temporary workaround for semconv alias errors */ -}}
+ {{ if strings.HasPrefix . "docs/specs/semconv/general" -}}
+ {{ . | printf "%-35s" }} {{ $p.RelPermalink }}
+ {{ else -}}
+ {{ $alias := cond (strings.HasPrefix . "/")
+ .
+ (partial "relative-redirects-alias" (dict "alias" . "p" $p.Parent)) -}}
+ {{ $alias | printf "%-35s" }} {{ $p.RelPermalink }}
+ {{ end -}}
+{{ end -}}
+
+{{- define "partials/relative-redirects-alias" -}}
+ {{ $result := "" }}
+ {{ if strings.HasPrefix .alias "../" }}
+ {{ $result = (partial "relative-redirects-alias"
+ (dict
+ "alias" (strings.TrimPrefix "../" .alias)
+ "p" .p.Parent ))
+ }}
+ {{ else }}
+ {{ $result = path.Join .p.RelPermalink .alias }}
+ {{ end }}
+ {{ return $result }}
+{{ end -}}
diff --git a/layouts/partials/redirects/languages.txt b/layouts/partials/redirects/languages.txt
new file mode 100644
index 000000000000..5166b031ee36
--- /dev/null
+++ b/layouts/partials/redirects/languages.txt
@@ -0,0 +1,12 @@
+{{/* Generate rules for all languages. */ -}}
+
+{{/* FIXME - redirect to the new canonical links */ -}}
+
+{{ $languages := (.Site.GetPage "/docs/instrumentation").Pages -}}
+{{ range $languages -}}
+ {{ $lang := .File.ContentBaseName -}}
+ {{ if ne $lang "other" -}}
+ /docs/{{ $lang }} /docs/instrumentation/{{ $lang }}
+ /docs/{{ $lang }}/* /docs/instrumentation/{{ $lang }}/:splat
+ {{ end -}}
+{{ end -}}
diff --git a/layouts/partials/redirects/sites.redirects b/layouts/partials/redirects/localization.txt
similarity index 63%
rename from layouts/partials/redirects/sites.redirects
rename to layouts/partials/redirects/localization.txt
index 70aa516cb9b5..cf79b3fd30f1 100644
--- a/layouts/partials/redirects/sites.redirects
+++ b/layouts/partials/redirects/localization.txt
@@ -1,4 +1,12 @@
-{{/* Redirect for default language when .LanguagePrefix is empty. */ -}}
+{{/* Generate Netlify redirect rules for non-default .Site.Sites */ -}}
+{{/* cSpell:ignore cond */ -}}
+
+{{/*
+ Determine what the default language code is, `en` in most cases. Redirect
+ paths that start with the default language code by effectively stripping the
+ language code from the start of the path. Hugo handles this for the
+ language-code root. The rules below handle it for all other paths using a
+ wildcard. */ -}}
{{ $defaultLang := "" -}}
{{ with .Site.Sites.Default -}}
@@ -11,9 +19,7 @@
{{ end -}}
{{ end -}}
-{{/* Process non-default languages. */ -}}
-
-/ja/docs/specs /en/docs/specs/ 301!
+{{/* Add redirect rules for non-default languages. */ -}}
{{ range after 1 .Sites -}}
@@ -22,6 +28,8 @@
# Site localization {{ $siteLang }}
{{ range $p := .Pages -}}
+ {{ partial "redirects/redirect.txt" $p -}}
+
{{ range $p.Params.redirects -}}
{{ $fallbackPage := partial "i18n/fallback-page.html" $p -}}
{{ if or (eq $siteLang $defaultLang) (not $fallbackPage) -}}
diff --git a/layouts/partials/redirects/pages.txt b/layouts/partials/redirects/pages.txt
new file mode 100644
index 000000000000..c292c1bb4809
--- /dev/null
+++ b/layouts/partials/redirects/pages.txt
@@ -0,0 +1,19 @@
+{{/* Generate redirects for all given pages */ -}}
+{{/* cSpell:ignore cond */ -}}
+
+{{ range $p := .Site.Pages -}}
+
+ {{ range $p.Params.redirects -}}
+ {{ $from := cond (strings.HasPrefix .from "/")
+ .from
+ (print $p.RelPermalink .from) -}}
+ {{ $to := cond (strings.HasPrefix .to "/")
+ .to
+ (print $p.RelPermalink .to) -}}
+ {{ $from | printf "%-35s" }} {{ $to }}
+ {{ end -}}
+
+ {{ partial "redirects/aliases.txt" $p -}}
+ {{ partial "redirects/redirect.txt" $p -}}
+
+{{ end -}}
diff --git a/layouts/partials/redirects/redirect.txt b/layouts/partials/redirects/redirect.txt
new file mode 100644
index 000000000000..c3ec5b6ff712
--- /dev/null
+++ b/layouts/partials/redirects/redirect.txt
@@ -0,0 +1,6 @@
+{{/* Generate a Netlify redirect rule for pages with a `redirect` param */ -}}
+
+{{ $p := . -}}
+{{ with $p.Params.redirect -}}
+ {{ $p.RelPermalink | printf "%-35s" }} {{ . }}
+{{ end -}}
diff --git a/layouts/partials/redirects/schemas.txt b/layouts/partials/redirects/schemas.txt
new file mode 100644
index 000000000000..dc1329d32fa5
--- /dev/null
+++ b/layouts/partials/redirects/schemas.txt
@@ -0,0 +1,4 @@
+{{ $schemaFiles := partial "schema-file-list" . -}}
+{{ $latestSchemaFile := index $schemaFiles 0 -}}
+
+/schemas/latest /schemas/{{ $latestSchemaFile.Name -}}
diff --git a/layouts/partials/redirects/social-media.txt b/layouts/partials/redirects/social-media.txt
new file mode 100644
index 000000000000..cea52810f0af
--- /dev/null
+++ b/layouts/partials/redirects/social-media.txt
@@ -0,0 +1,12 @@
+{{/*
+ Social-media image redirects. As mentioned in
+ https://developers.facebook.com/docs/sharing/webmasters/images, we need to
+ preserve og:image (and other social media image) URLs forever.
+
+ cSpell:ignore wordmark
+*/ -}}
+
+{{ $og_image_current := `/img/social/logo-wordmark-001.png` -}}
+
+{{/* homepage og:image used prior to 2022/08 */ -}}
+/featured-background.jpg {{ $og_image_current -}}
diff --git a/package.json b/package.json
index d0f88253a80f..5e4144e16f0f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"_hugo": "hugo --cleanDestinationDir",
"_list:check:*": "npm run --loglevel=warn | grep -Ee '^\\s*check:[^:]+$'",
"_list:fix:*": "npm run --loglevel=warn | grep -Ee '^\\s*fix:[^:]+$' | grep -v 'fix:all'",
- "_ls-bad-filenames": "find assets content static -name '*_*' ! -name '_*'",
+ "_ls-bad-filenames": "find assets content static -name '*_*' ! -name '[_.]*'",
"_prebuild": "npm run seq -- get:submodule cp:spec",
"_prepare:docsy": "cd themes/docsy && npm install",
"_prettier:any": "npx prettier --ignore-path ''",
diff --git a/static/refcache.json b/static/refcache.json
index 3771cb508318..6976c15dcf6b 100644
--- a/static/refcache.json
+++ b/static/refcache.json
@@ -1035,6 +1035,10 @@
"StatusCode": 206,
"LastSeen": "2024-01-18T08:53:34.715996-05:00"
},
+ "https://docs.centreon.com/pp/integrations/plugin-packs/getting-started/how-to-guides/telegraf/": {
+ "StatusCode": 206,
+ "LastSeen": "2024-07-27T17:54:47.061938869Z"
+ },
"https://docs.chronosphere.io/ingest/otel/otel-ingest": {
"StatusCode": 200,
"LastSeen": "2024-03-19T05:23:55.741827909Z"