Skip to content

Commit

Permalink
[release-v2.3] Set GRAFANA_VERSION used throughout shared lookups (#3101
Browse files Browse the repository at this point in the history
)

* Set GRAFANA_VERSION used throughout shared lookups (#3091)

It was working in "next" because the fallback behavior is to use the page's version for any "SOMETHING_VERSION" lookup.
Therefore, the `docs/shared` lookup coincidentally targeted "next" which exists in the Grafana documentation.

Now that we have cut a new release with these docs, the released version is being used which is causing errors because `v2.3.x` is not a valid Grafana version.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 32014d7)

* Trigger CI

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
  • Loading branch information
github-actions[bot] and jdbaldry authored Nov 1, 2023
1 parent ecdc8c4 commit 91fe37d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions docs/sources/tempo/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ title: Tempo documentation
description: Grafana Tempo is an open source distributed tracing backend.
aliases:
- /docs/tempo/
cascade:
GRAFANA_VERSION: next
---

# Tempo documentation
Expand Down
6 changes: 3 additions & 3 deletions docs/sources/tempo/traceql/query-editor/traceql-editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ title: Write TraceQL queries with the editor

# Write TraceQL queries with the editor

[//]: # 'Shared content for the TraceQL query editor'
[//]: # 'This content is located in /docs/sources/shared/datasources/tempo-editor-traceql.md'
[//]: # "Shared content for the TraceQL query editor"
[//]: # "This content is located in /docs/sources/shared/datasources/tempo-editor-traceql.md"

{{< docs/shared source="grafana" lookup="datasources/tempo-editor-traceql.md" version="<GRAFANA VERSION>" >}}
{{< docs/shared source="grafana" lookup="datasources/tempo-editor-traceql.md" version="<GRAFANA_VERSION>" >}}
4 changes: 2 additions & 2 deletions docs/sources/tempo/traceql/query-editor/traceql-search.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ This feature is automatically available in Grafana 10 (and newer) and Grafana Cl

To enable the TraceQL query builder in self-hosted Grafana through version 10.1, [enable the `traceqlSearch` feature toggle](/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/).

[//]: # 'Shared content for the Search - TraceQL query builder'
[//]: # "Shared content for the Search - TraceQL query builder"

{{< docs/shared source="grafana" lookup="datasources/tempo-search-traceql.md" leveloffset="+1" version="<GRAFANA VERSION>" >}}
{{< docs/shared source="grafana" lookup="datasources/tempo-search-traceql.md" leveloffset="+1" version="<GRAFANA_VERSION>" >}}

0 comments on commit 91fe37d

Please sign in to comment.