From 6efd5c26d5d1e19222f9166530f627bfea7bb103 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Thu, 20 Mar 2025 16:48:50 +0000 Subject: [PATCH 1/6] Disable inline shortcodes It's not worth the risk of letting content define arbitrary templates. Signed-off-by: Jack Baldry --- docs/sources/tempo/api_docs/_index.md | 2 +- docs/sources/tempo/introduction/glossary.md | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docs/sources/tempo/api_docs/_index.md b/docs/sources/tempo/api_docs/_index.md index bb1921ed0ef..608fd913183 100644 --- a/docs/sources/tempo/api_docs/_index.md +++ b/docs/sources/tempo/api_docs/_index.md @@ -93,7 +93,7 @@ Agent, OpenTelemetry Collector, or Jaeger Agent. | Jaeger | GRPC | [Link](https://www.jaegertracing.io/docs/latest/apis/#span-reporting-apis) | | Zipkin | HTTP | [Link](https://zipkin.io/zipkin-api/) | -For information on how to use the Zipkin endpoint with curl (for debugging purposes), refer to [Pushing spans with HTTP](pushing-spans-with-http/). +For information on how to use the Zipkin endpoint with curl (for debugging purposes), refer to [Pushing spans with HTTP](pushing-spans-with-http/). ### Query diff --git a/docs/sources/tempo/introduction/glossary.md b/docs/sources/tempo/introduction/glossary.md index 53d93c8097d..3d2df50f248 100644 --- a/docs/sources/tempo/introduction/glossary.md +++ b/docs/sources/tempo/introduction/glossary.md @@ -1,5 +1,5 @@ --- -description: "Glossary for traces" +description: 'Glossary for traces' keywords: - Grafana - traces @@ -12,28 +12,26 @@ weight: 500 The following terms are often used when discussing traces. -{{< glossary.inline >}}{{ (index (where site.Data.glossary "keys" "intersect" (slice (.Get 0))) 0).value | markdownify }}{{< /glossary.inline >}} - Active series -: {{< glossary.inline "active series" />}} +: {{< docs/glossary "active series" />}} Cardinality -: {{< glossary.inline "cardinality" />}} +: {{< docs/glossary "cardinality" />}} Data source -: {{< glossary.inline "data source" />}} +: {{< docs/glossary "data source" />}} Exemplar -: {{< glossary.inline "exemplar" />}} +: {{< docs/glossary "exemplar" />}} Log -: {{< glossary.inline "log" />}} +: {{< docs/glossary "log" />}} Metric -: {{< glossary.inline "metric" />}} +: {{< docs/glossary "metric" />}} Span -: {{< glossary.inline "span" />}} +: {{< docs/glossary "span" />}} Trace -: {{< glossary.inline "trace" />}} +: {{< docs/glossary "trace" />}} From ed5861c94ce32385ddab7dd4cecb9a34a7ae7a24 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Thu, 20 Mar 2025 16:48:53 +0000 Subject: [PATCH 2/6] Remove self-closing tags since the shortcodes don't use .Inner Signed-off-by: Jack Baldry --- docs/sources/tempo/introduction/glossary.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/sources/tempo/introduction/glossary.md b/docs/sources/tempo/introduction/glossary.md index 3d2df50f248..a8deabbe460 100644 --- a/docs/sources/tempo/introduction/glossary.md +++ b/docs/sources/tempo/introduction/glossary.md @@ -13,25 +13,25 @@ weight: 500 The following terms are often used when discussing traces. Active series -: {{< docs/glossary "active series" />}} +: {{< docs/glossary "active series" >}} Cardinality -: {{< docs/glossary "cardinality" />}} +: {{< docs/glossary "cardinality" >}} Data source -: {{< docs/glossary "data source" />}} +: {{< docs/glossary "data source" >}} Exemplar -: {{< docs/glossary "exemplar" />}} +: {{< docs/glossary "exemplar" >}} Log -: {{< docs/glossary "log" />}} +: {{< docs/glossary "log" >}} Metric -: {{< docs/glossary "metric" />}} +: {{< docs/glossary "metric" >}} Span -: {{< docs/glossary "span" />}} +: {{< docs/glossary "span" >}} Trace -: {{< docs/glossary "trace" />}} +: {{< docs/glossary "trace" >}} From 3b94e33c47533fde90b21fe72cb2137c623e966b Mon Sep 17 00:00:00 2001 From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:40:51 -0400 Subject: [PATCH 3/6] Update docs/sources/tempo/api_docs/_index.md --- docs/sources/tempo/api_docs/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/tempo/api_docs/_index.md b/docs/sources/tempo/api_docs/_index.md index 608fd913183..bb1921ed0ef 100644 --- a/docs/sources/tempo/api_docs/_index.md +++ b/docs/sources/tempo/api_docs/_index.md @@ -93,7 +93,7 @@ Agent, OpenTelemetry Collector, or Jaeger Agent. | Jaeger | GRPC | [Link](https://www.jaegertracing.io/docs/latest/apis/#span-reporting-apis) | | Zipkin | HTTP | [Link](https://zipkin.io/zipkin-api/) | -For information on how to use the Zipkin endpoint with curl (for debugging purposes), refer to [Pushing spans with HTTP](pushing-spans-with-http/). +For information on how to use the Zipkin endpoint with curl (for debugging purposes), refer to [Pushing spans with HTTP](pushing-spans-with-http/). ### Query From 605580135705e39da169003aaf9353627f96f55a Mon Sep 17 00:00:00 2001 From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:53:18 -0400 Subject: [PATCH 4/6] Update docs/sources/tempo/introduction/glossary.md --- docs/sources/tempo/introduction/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/tempo/introduction/glossary.md b/docs/sources/tempo/introduction/glossary.md index a8deabbe460..fa431a5440e 100644 --- a/docs/sources/tempo/introduction/glossary.md +++ b/docs/sources/tempo/introduction/glossary.md @@ -1,5 +1,5 @@ --- -description: 'Glossary for traces' +description: 'Glossary for traces' keywords: - Grafana - traces From 8a489c4f70be8470078d682f1bb18660605ddfe6 Mon Sep 17 00:00:00 2001 From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com> Date: Thu, 20 Mar 2025 17:49:45 -0400 Subject: [PATCH 5/6] Update docs/sources/tempo/introduction/glossary.md --- docs/sources/tempo/introduction/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/tempo/introduction/glossary.md b/docs/sources/tempo/introduction/glossary.md index fa431a5440e..a8deabbe460 100644 --- a/docs/sources/tempo/introduction/glossary.md +++ b/docs/sources/tempo/introduction/glossary.md @@ -1,5 +1,5 @@ --- -description: 'Glossary for traces' +description: 'Glossary for traces' keywords: - Grafana - traces From 16e0bc295403e1d368e83a015d1cbfd0061f2b15 Mon Sep 17 00:00:00 2001 From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com> Date: Thu, 20 Mar 2025 19:19:57 -0400 Subject: [PATCH 6/6] Update docs/sources/tempo/introduction/glossary.md --- docs/sources/tempo/introduction/glossary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/tempo/introduction/glossary.md b/docs/sources/tempo/introduction/glossary.md index a8deabbe460..fa431a5440e 100644 --- a/docs/sources/tempo/introduction/glossary.md +++ b/docs/sources/tempo/introduction/glossary.md @@ -1,5 +1,5 @@ --- -description: 'Glossary for traces' +description: 'Glossary for traces' keywords: - Grafana - traces