From 70df7bb040607f2d564cb83208c5cc7c56e84b51 Mon Sep 17 00:00:00 2001
From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
Date: Thu, 5 Sep 2024 12:12:55 -0400
Subject: [PATCH] Add blog post links to rel notes (#4057)

---
 docs/sources/tempo/release-notes/v2-6.md |  8 +++-----
 docs/sources/tempo/traceql/_index.md     | 16 +++++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/sources/tempo/release-notes/v2-6.md b/docs/sources/tempo/release-notes/v2-6.md
index 6f82f6eeca9..de7416bd069 100644
--- a/docs/sources/tempo/release-notes/v2-6.md
+++ b/docs/sources/tempo/release-notes/v2-6.md
@@ -7,7 +7,7 @@ weight: 30
 
 # Version 2.6 release notes
 
-The Tempo team is pleased to announce the release of Tempo 2.5.
+The Tempo team is pleased to announce the release of Tempo 2.6.
 
 This release gives you:
 
@@ -15,13 +15,11 @@ This release gives you:
 * Additions to TraceQL metric query-types including a compare function and the ability to do instant queries (which will return faster than range queries).
 * Performance and stability enhancements
 
-<!-- add link when blog is live
-Read the [Tempo 2.6 blog post](https://grafana.com/blog/2024/06/03/grafana-tempo-2.5-release-vparquet4-streaming-endpoints-and-more-metrics/) for more examples and details about these improvements.
--->
+Read the [Tempo 2.6 blog post](https://grafana.com/blog/2024/09/05/grafana-tempo-2.6-release-performance-improvements-and-new-traceql-features/) for more examples and details about these improvements.
 
 These release notes highlight the most important features and bugfixes. For a complete list, refer to the [Tempo changelog](https://github.com/grafana/tempo/releases).
 
-<!-- add video from blog {{< youtube id=" " >}} -->
+{{< youtube id="aIDkPJ_e3W4" >}}
 
 ## Features and enhancements
 
diff --git a/docs/sources/tempo/traceql/_index.md b/docs/sources/tempo/traceql/_index.md
index 6dd929674af..47bc28b5c19 100644
--- a/docs/sources/tempo/traceql/_index.md
+++ b/docs/sources/tempo/traceql/_index.md
@@ -66,22 +66,20 @@ Queries select sets of spans and filter them through a pipeline of aggregators a
 
 ## Selecting spans
 
-In TraceQL, curly brackets `{}` always select a set of spans from the current trace. They are commonly paired with a condition to reduce the spans being passed in.
+In TraceQL, curly brackets `{}` always select a set of spans from the current trace.
+They are commonly paired with a condition to reduce the spans being passed in.
 
 TraceQL differentiates between two types of span data: intrinsics, which are fundamental to spans, and attributes, which are customizable key-value pairs.
 You can use intrinsics and attributes to build filters and select spans.
 
+{{< youtube id="aIDkPJ_e3W4" >}}
+
 Intrinsic fields are fundamental to scopes.
 Intrinsics are inherently present, as opposed to other key-value pairs (attributes) that are added by a developer.
 
 Intrinsics are always indicated using a `<scope>:`.
 Refer to the Intrinsics table for all current intrinsics.
 
-Custom attributes are prefixed with <scope>. such as `span.`,  `resource.` , `link.`, or `event`.
-Resource has no intrinsic values.
-It only has custom attributes.
-The `trace` scope is only an intrinsic and doesn't have any custom attributes at the trace level.
-
 Intrinsics example:
 ```
 { span:name = "foo" }
@@ -90,6 +88,11 @@ Intrinsics example:
 { link:traceID = "1234" }
 ```
 
+Custom attributes are prefixed with `<scope>.`, such as `span.`,  `resource.` , `link.`, or `event`.
+Resource has no intrinsic values.
+It only has custom attributes.
+The `trace` scope is only an intrinsic and doesn't have any custom attributes at the trace level.
+
 Attributes example:
 ```
 { span.foo = "bar" }
@@ -138,7 +141,6 @@ This example searches all Kubernetes clusters called `service-name` that have a
 { resource.k8s.cluster.name="service-name" && trace:rootName !~ ".*perf.*"}
 ```
 
-
 ### Attribute fields
 
 TraceQL has four different attribute scopes: span attributes, resource attributes, event attributes, and link attributes.