Merge branch 'evictorero/snapshtos-mt-cleanup-expired' into evictorero/snapshots-dual-write-support

fix lint
Merge branch 'main' into evictorero/snapshtos-mt-cleanup-expired
2026-01-09 08:09:21 -03:00 · 2026-01-09 08:06:55 -03:00 · 2026-01-09 08:04:48 -03:00 · 2026-01-08 17:47:54 -03:00 · 2026-01-07 15:28:18 -03:00 · 2026-01-06 11:12:19 -03:00
64 changed files with 767 additions and 786 deletions
--- a/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_schema_gen.go
+++ b/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_schema_gen.go
@@ -13,7 +13,7 @@ import (
 // schema is unexported to prevent accidental overwrites
 var (
 	schemaReceiver = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", NewReceiver(), &ReceiverList{}, resource.WithKind("Receiver"),
-		resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{
+		resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{
 			FieldSelector: "spec.title",
 			FieldValueFunc: func(o resource.Object) (string, error) {
 				cast, ok := o.(*Receiver)
--- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
@@ -790,8 +790,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
--- a/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
@@ -794,8 +794,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
--- a/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}

 // Copy methods for all subresource types

-
-
 // DeepCopy creates a full deep copy of DashboardStatus
 func (s *DashboardStatus) DeepCopy() *DashboardStatus {
 	cpy := &DashboardStatus{}
--- a/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_object_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_object_gen.go
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}

 // Copy methods for all subresource types

-
-
 // DeepCopy creates a full deep copy of DashboardStatus
 func (s *DashboardStatus) DeepCopy() *DashboardStatus {
 	cpy := &DashboardStatus{}
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
@@ -794,8 +794,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
@@ -1411,8 +1411,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
@@ -798,8 +798,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
@@ -1414,8 +1414,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
--- a/apps/dashboard/pkg/apis/dashboard_manifest.go
+++ b/apps/dashboard/pkg/apis/dashboard_manifest.go
--- a/apps/folder/pkg/apis/manifestdata/folder_manifest.go
+++ b/apps/folder/pkg/apis/manifestdata/folder_manifest.go
@@ -18,8 +18,6 @@ import (
 	v1beta1 "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
 )

-var ()
-
 var appManifestData = app.ManifestData{
 	AppName:          "folder",
 	Group:            "folder.grafana.app",
--- a/apps/iam/go.sum
+++ b/apps/iam/go.sum
@@ -82,8 +82,8 @@ cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2zn
 cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
 cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
 cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
-connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
-connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
+connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
+connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
 cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
 cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0=
@@ -749,8 +749,6 @@ github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
 github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
 github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
 github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/gnostic v0.7.1 h1:t5Kc7j/8kYr8t2u11rykRrPPovlEMG4+xdc/SpekATs=
-github.com/google/gnostic v0.7.1/go.mod h1:KSw6sxnxEBFM8jLPfJd46xZP+yQcfE8XkiqfZx5zR28=
 github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
 github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -889,8 +887,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
-github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f h1:fTlIj5n4x5dU63XHItug7GLjtnaeJdPqBlqg4zlABq0=
-github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f/go.mod h1:VBNcIhunCZsJ3/mcYx+j7uFf0P/108eiWa+8+Z9ll3o=
+github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae h1:35W3Wjp9KWnSoV/DuymmyIj5aHE0CYlDQ5m2KeXUPAc=
+github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
 github.com/grafana/sqlds/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
--- a/docs/sources/alerting/monitor-status/view-alert-rules.md
+++ b/docs/sources/alerting/monitor-status/view-alert-rules.md
@@ -41,13 +41,9 @@ Select a group to expand it and view the list of alert rules within that group.

 The list view includes a number of filters to simplify managing large volumes of alerts.

-## Filter and save searches
-
 Click the **Filter** button to open the filter popup. You can filter by name, label, folder/namespace, evaluation group, data source, contact point, rule source, rule state, rule type, and the health of the alert rule from the popup menu. Click **Apply** at the bottom of the filter popup to enact the filters as you search.

-Click the **Saved searches** button to open the list of previously saved searches, or click **+ Save current search** to add your current search to the saved searches list. You can also rename a saved search or set it as a default search. When you set a saved search as the default search, the Alert rules page opens with the search applied.
-
-{{< figure src="/media/docs/alerting/alerting-saved-searches.png" max-width="750px" alt="Alert rule filter options" >}}
+{{< figure src="/media/docs/alerting/alerting-list-view-filter.png" max-width="750px" alt="Alert rule filter options" >}}

 ## Change alert rules list view

--- a/docs/sources/tutorials/alerting-get-started-pt6/index.md
+++ b/docs/sources/tutorials/alerting-get-started-pt6/index.md
@@ -23,8 +23,6 @@ killercoda:

 This tutorial is a continuation of the [Get started with Grafana Alerting - Route alerts using dynamic labels](http://www.grafana.com/tutorials/alerting-get-started-pt5/) tutorial.

-{{< youtube id="mqj_hN24zLU" >}}
-
 <!-- USE CASE -->

 In this tutorial you will learn how to:
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.36.2-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling
 	cloud.google.com/go/kms v1.22.0 // @grafana/grafana-backend-group
 	cloud.google.com/go/storage v1.55.0 // @grafana/grafana-backend-group
-	connectrpc.com/connect v1.19.1 // @grafana/observability-traces-and-profiling
+	connectrpc.com/connect v1.18.1 // @grafana/observability-traces-and-profiling
 	cuelang.org/go v0.11.1 // @grafana/grafana-as-code
 	dario.cat/mergo v1.0.2 // @grafana/grafana-app-platform-squad
 	filippo.io/age v1.2.1 // @grafana/identity-access-team
@@ -111,7 +111,7 @@ require (
 	github.com/grafana/nanogit v0.3.0 // indirect; @grafana/grafana-git-ui-sync-team
 	github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // @grafana/observability-traces-and-profiling
-	github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f // @grafana/observability-traces-and-profiling
+	github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae // @grafana/observability-traces-and-profiling
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/grafana-search-and-storage
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // @grafana/plugins-platform-backend
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // @grafana/grafana-backend-group
@@ -681,7 +681,6 @@ require (
 	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
 	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
 	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
-	github.com/google/gnostic v0.7.1 // indirect
 	github.com/gophercloud/gophercloud/v2 v2.9.0 // indirect
 	github.com/grafana/sqlds/v5 v5.0.3 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
--- a/go.sum
+++ b/go.sum
@@ -627,8 +627,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS
 cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
 cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
-connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
-connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
+connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
+connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
 cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
 cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
@@ -1503,8 +1503,6 @@ github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PU
 github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
 github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/gnostic v0.7.1 h1:t5Kc7j/8kYr8t2u11rykRrPPovlEMG4+xdc/SpekATs=
-github.com/google/gnostic v0.7.1/go.mod h1:KSw6sxnxEBFM8jLPfJd46xZP+yQcfE8XkiqfZx5zR28=
 github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
 github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -1687,8 +1685,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
-github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f h1:fTlIj5n4x5dU63XHItug7GLjtnaeJdPqBlqg4zlABq0=
-github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f/go.mod h1:VBNcIhunCZsJ3/mcYx+j7uFf0P/108eiWa+8+Z9ll3o=
+github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae h1:35W3Wjp9KWnSoV/DuymmyIj5aHE0CYlDQ5m2KeXUPAc=
+github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
 github.com/grafana/saml v0.4.15-0.20240917091248-ae3bbdad8a56 h1:SDGrP81Vcd102L3UJEryRd1eestRw73wt+b8vnVEFe0=
--- a/go.work.sum
+++ b/go.work.sum
@@ -755,8 +755,6 @@ github.com/felixge/fgprof v0.9.4/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZP
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
 github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
-github.com/flowstack/go-jsonschema v0.1.1 h1:dCrjGJRXIlbDsLAgTJZTjhwUJnnxVWl1OgNyYh5nyDc=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c h1:yKN46XJHYC/gvgH2UsisJ31+n4K3S7QYZSfU2uAWjuI=
 github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c/go.mod h1:L92h+dgwElEyUuShEwjbiHjseW410WIcNz+Bjutc8YQ=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -400,6 +400,10 @@ export interface FeatureToggles {
  */
  tableSharedCrosshair?: boolean;
  /**
+  * Use the kubernetes API for feature toggle management in the frontend
+  */
+  kubernetesFeatureToggles?: boolean;
+  /**
  * Enabled grafana cloud specific RBAC roles
  */
  cloudRBACRoles?: boolean;
@@ -1259,8 +1263,4 @@ export interface FeatureToggles {
  * Enables the creation of keepers that manage secrets stored on AWS secrets manager
  */
  secretsManagementAppPlatformAwsKeeper?: boolean;
-  /**
-  * Enables profiles exemplars support in profiles drilldown
-  */
-  profilesExemplars?: boolean;
 }
--- a/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
@@ -25,10 +25,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
   * Allows to group the results.
   */
  groupBy: Array<string>;
-  /**
-   * If set to true, exemplars will be requested
-   */
-  includeExemplars: boolean;
  /**
   * Specifies the query label selectors.
   */
@@ -53,7 +49,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {

 export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
  groupBy: [],
-  includeExemplars: false,
  labelSelector: '{}',
  spanSelector: [],
 };
--- a/packages/grafana-sql/src/SQLVariableSupport.tsx
+++ b/packages/grafana-sql/src/SQLVariableSupport.tsx
@@ -1,174 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import {
-  CustomVariableSupport,
-  DataQueryRequest,
-  DataQueryResponse,
-  QueryEditorProps,
-  Field,
-  DataFrame,
-  MetricFindValue,
-} from '@grafana/data';
-import { t } from '@grafana/i18n';
-import { EditorMode, EditorRows, EditorRow, EditorField } from '@grafana/plugin-ui';
-import { Combobox, ComboboxOption } from '@grafana/ui';
-
-import { SqlQueryEditorLazy } from './components/QueryEditorLazy';
-import { SqlDatasource } from './datasource/SqlDatasource';
-import { applyQueryDefaults } from './defaults';
-import { QueryFormat, type SQLQuery, type SQLOptions, type SQLQueryMeta } from './types';
-
-type SQLVariableQuery = { query: string } & SQLQuery;
-
-const refId = 'SQLVariableQueryEditor-VariableQuery';
-
-export class SQLVariableSupport extends CustomVariableSupport<SqlDatasource, SQLQuery> {
-  constructor(readonly datasource: SqlDatasource) {
-    super();
-  }
-  editor = SQLVariablesQueryEditor;
-  query(request: DataQueryRequest<SQLQuery>): Observable<DataQueryResponse> {
-    if (request.targets.length < 1) {
-      throw new Error('no variable query found');
-    }
-    const updatedQuery = migrateVariableQuery(request.targets[0]);
-    return this.datasource.query({ ...request, targets: [updatedQuery] }).pipe(
-      map((d: DataQueryResponse) => {
-        const frames = d.data || [];
-        const metricFindValues = convertDataFramesToMetricFindValues(frames, updatedQuery.meta);
-        return { data: metricFindValues };
-      })
-    );
-  }
-  getDefaultQuery(): Partial<SQLQuery> {
-    return applyQueryDefaults({ refId, editorMode: EditorMode.Builder, format: QueryFormat.Table });
-  }
-}
-
-type SQLVariableQueryEditorProps = QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions>;
-
-const SQLVariablesQueryEditor = (props: SQLVariableQueryEditorProps) => {
-  const query = migrateVariableQuery(props.query);
-  return (
-    <>
-      <SqlQueryEditorLazy {...props} query={query} />
-      <FieldMapping {...props} query={query} />
-    </>
-  );
-};
-
-const FieldMapping = (props: SQLVariableQueryEditorProps) => {
-  const { query, datasource, onChange } = props;
-  const [choices, setChoices] = useState<ComboboxOption[]>([]);
-  useEffect(() => {
-    let isActive = true;
-    // eslint-disable-next-line
-    const subscription = datasource.query({ targets: [query] } as DataQueryRequest<SQLQuery>).subscribe({
-      next: (response) => {
-        if (!isActive) {
-          return;
-        }
-        const fieldNames = (response.data[0] || { fields: [] }).fields.map((f: Field) => f.name);
-        setChoices(fieldNames.map((f: Field) => ({ value: f, label: f })));
-      },
-      error: () => {
-        if (isActive) {
-          setChoices([]);
-        }
-      },
-    });
-    return () => {
-      isActive = false;
-      subscription.unsubscribe();
-    };
-  }, [datasource, query]);
-  const onMetaPropChange = <Key extends keyof SQLQueryMeta, Value extends SQLQueryMeta[Key]>(
-    key: Key,
-    value: Value,
-    meta = query.meta || {}
-  ) => {
-    onChange({ ...query, meta: { ...meta, [key]: value } });
-  };
-  return (
-    <EditorRows>
-      <EditorRow>
-        <EditorField label={t('grafana-sql.components.query-meta.variables.valueField', 'Value Field')}>
-          <Combobox
-            isClearable
-            value={query.meta?.valueField}
-            onChange={(e) => onMetaPropChange('valueField', e?.value)}
-            width={40}
-            options={choices}
-          />
-        </EditorField>
-        <EditorField label={t('grafana-sql.components.query-meta.variables.textField', 'Text Field')}>
-          <Combobox
-            isClearable
-            value={query.meta?.textField}
-            onChange={(e) => onMetaPropChange('textField', e?.value)}
-            width={40}
-            options={choices}
-          />
-        </EditorField>
-      </EditorRow>
-    </EditorRows>
-  );
-};
-
-const migrateVariableQuery = (rawQuery: string | SQLQuery): SQLVariableQuery => {
-  if (typeof rawQuery !== 'string') {
-    return {
-      ...rawQuery,
-      refId: rawQuery.refId || refId,
-      query: rawQuery.rawSql || '',
-    };
-  }
-  return {
-    ...applyQueryDefaults({
-      refId,
-      rawSql: rawQuery,
-      editorMode: rawQuery ? EditorMode.Code : EditorMode.Builder,
-    }),
-    query: rawQuery,
-  };
-};
-
-const convertDataFramesToMetricFindValues = (frames: DataFrame[], meta?: SQLQueryMeta): MetricFindValue[] => {
-  if (!frames.length) {
-    throw new Error('no results found');
-  }
-
-  const frame = frames[0];
-
-  const fields = frame.fields;
-
-  if (fields.length < 1) {
-    throw new Error('no fields found in the response');
-  }
-
-  let textField = fields.find((f) => f.name === '__text');
-  let valueField = fields.find((f) => f.name === '__value');
-  if (meta?.textField) {
-    textField = fields.find((f) => f.name === meta.textField);
-  }
-  if (meta?.valueField) {
-    valueField = fields.find((f) => f.name === meta.valueField);
-  }
-  const resolvedTextField = textField || valueField || fields[0];
-  const resolvedValueField = valueField || textField || fields[0];
-
-  const results: MetricFindValue[] = [];
-  const rowCount = frame.length;
-  for (let i = 0; i < rowCount; i++) {
-    const text = String(resolvedTextField.values[i] ?? '');
-    const value = String(resolvedValueField.values[i] ?? '');
-    const properties: Record<string, string> = {};
-    for (const field of fields) {
-      properties[field.name] = String(field.values[i] ?? '');
-    }
-    results.push({ text, value, properties });
-  }
-  return results;
-};
--- a/packages/grafana-sql/src/index.ts
+++ b/packages/grafana-sql/src/index.ts
@@ -21,7 +21,6 @@ export { TLSSecretsConfig } from './components/configuration/TLSSecretsConfig';
 export { useMigrateDatabaseFields } from './components/configuration/useMigrateDatabaseFields';
 export { SqlQueryEditorLazy } from './components/QueryEditorLazy';
 export type { QueryHeaderProps } from './components/QueryHeader';
-export { SQLVariableSupport } from './SQLVariableSupport';
 export { createSelectClause, haveColumns } from './utils/sql.utils';
 export { applyQueryDefaults } from './defaults';
 export { makeVariable } from './utils/testHelpers';
--- a/packages/grafana-sql/src/locales/en-US/grafana-sql.json
+++ b/packages/grafana-sql/src/locales/en-US/grafana-sql.json
@@ -69,12 +69,6 @@
        "placeholder-select-format": "Select format",
        "run-query": "Run query"
      },
-      "query-meta": {
-        "variables": {
-          "textField": "Text Field",
-          "valueField": "Value Field"
-        }
-      },
      "query-toolbox": {
        "content-hit-ctrlcmdreturn-to-run-query": "Hit CTRL/CMD+Return to run query",
        "tooltip-collapse": "Collapse editor",
--- a/packages/grafana-sql/src/types.ts
+++ b/packages/grafana-sql/src/types.ts
@@ -50,8 +50,6 @@ export enum QueryFormat {
  Table = 'table',
 }

-export type SQLQueryMeta = { valueField?: string; textField?: string };
-
 export interface SQLQuery extends DataQuery {
  alias?: string;
  format?: QueryFormat;
@@ -61,7 +59,6 @@ export interface SQLQuery extends DataQuery {
  sql?: SQLExpression;
  editorMode?: EditorMode;
  rawQuery?: boolean;
-  meta?: SQLQueryMeta;
 }

 export interface NameValue {
--- a/pkg/registry/apis/dashboard/register.go
+++ b/pkg/registry/apis/dashboard/register.go
@@ -122,6 +122,7 @@ type DashboardsAPIBuilder struct {
 	publicDashboardService       publicdashboards.Service
 	snapshotService              dashboardsnapshots.Service
 	snapshotOptions              dashv0.SnapshotSharingOptions
+	snapshotStorage              rest.Storage // for dual-write support in routes
 	namespacer                   request.NamespaceMapper
 	dashboardActivityChannel     live.DashboardActivityChannel
 	isStandalone                 bool // skips any handling including anything to do with legacy storage
@@ -747,15 +748,26 @@ func (b *DashboardsAPIBuilder) storageForVersion(
 		}
 	}

-	// Legacy only (for now) and only v0alpha1
+	// Snapshots - only v0alpha1
 	if snapshots != nil && dashboards.GroupVersion().Version == "v0alpha1" {
 		snapshotLegacyStore := &snapshot.SnapshotLegacyStore{
 			ResourceInfo: *snapshots,
 			Service:      b.snapshotService,
 			Namespacer:   b.namespacer,
 		}
-		storage[snapshots.StoragePath()] = snapshotLegacyStore
-		storage[snapshots.StoragePath("dashboard")], err = snapshot.NewDashboardREST(dashboards, b.snapshotService)
+
+		unifiedSnapshotStore, err := grafanaregistry.NewRegistryStore(opts.Scheme, *snapshots, opts.OptsGetter)
+		if err != nil {
+			return err
+		}
+		snapshotGr := snapshots.GroupResource()
+		snapshotDualWrite, err := opts.DualWriteBuilder(snapshotGr, snapshotLegacyStore, unifiedSnapshotStore)
+		if err != nil {
+			return err
+		}
+		storage[snapshots.StoragePath()] = snapshotDualWrite
+		b.snapshotStorage = snapshotDualWrite // store for use in routes
+		storage[snapshots.StoragePath("dashboard")], err = snapshot.NewDashboardREST(snapshotDualWrite)
 		if err != nil {
 			return err
 		}
@@ -979,7 +991,9 @@ func (b *DashboardsAPIBuilder) GetAPIRoutes(gv schema.GroupVersion) *builder.API

 	defs := b.GetOpenAPIDefinitions()(func(path string) spec.Ref { return spec.Ref{} })
 	searchAPIRoutes := b.search.GetAPIRoutes(defs)
-	snapshotAPIRoutes := snapshot.GetRoutes(b.snapshotService, b.snapshotOptions, defs)
+	snapshotAPIRoutes := snapshot.GetRoutes(b.snapshotService, b.snapshotOptions, defs, func() rest.Storage {
+		return b.snapshotStorage
+	})

 	return &builder.APIRoutes{
 		Namespace: append(searchAPIRoutes.Namespace, snapshotAPIRoutes.Namespace...),
--- a/pkg/registry/apis/dashboard/snapshot/conversions.go
+++ b/pkg/registry/apis/dashboard/snapshot/conversions.go
@@ -7,6 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

 	dashV0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
@@ -59,7 +60,10 @@ func convertSnapshotToK8sResource(v *dashboardsnapshots.DashboardSnapshot, names
 			Namespace:         namespacer(v.OrgID),
 		},
 		Spec: dashV0.SnapshotSpec{
-			Title: &v.Name,
+			Title:       &v.Name,
+			Expires:     &expires,
+			External:    &v.External,
+			ExternalUrl: &v.ExternalURL,
 		},
 	}

@@ -78,3 +82,68 @@ func convertSnapshotToK8sResource(v *dashboardsnapshots.DashboardSnapshot, names
 	}
 	return snap
 }
+
+// convertK8sResourceToCreateCommand converts a K8s Snapshot to a CreateDashboardSnapshotCommand
+func convertK8sResourceToCreateCommand(snap *dashV0.Snapshot, orgID int64, userID int64) *dashboardsnapshots.CreateDashboardSnapshotCommand {
+	cmd := &dashboardsnapshots.CreateDashboardSnapshotCommand{
+		OrgID:  orgID,
+		UserID: userID,
+	}
+
+	// Map title
+	if snap.Spec.Title != nil {
+		cmd.Name = *snap.Spec.Title
+	}
+
+	// Map dashboard (convert map[string]interface{} to *common.Unstructured)
+	if snap.Spec.Dashboard != nil {
+		cmd.Dashboard = &common.Unstructured{Object: snap.Spec.Dashboard}
+	}
+
+	// Map expires
+	if snap.Spec.Expires != nil {
+		cmd.Expires = *snap.Spec.Expires
+	}
+
+	// Map external settings
+	if snap.Spec.External != nil && *snap.Spec.External {
+		cmd.External = true
+		if snap.Spec.ExternalUrl != nil {
+			cmd.ExternalURL = *snap.Spec.ExternalUrl
+		}
+	}
+
+	return cmd
+}
+
+// convertCreateCmdToK8sSnapshot converts a CreateDashboardSnapshotCommand request to a K8s Snapshot
+// Used by routes.go to create a Snapshot object from the incoming create command
+func convertCreateCmdToK8sSnapshot(cmd *dashboardsnapshots.CreateDashboardSnapshotCommand, namespace string) *dashV0.Snapshot {
+	snap := &dashV0.Snapshot{
+		TypeMeta: dashV0.SnapshotResourceInfo.TypeMeta(),
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+		},
+		Spec: dashV0.SnapshotSpec{
+			Title: &cmd.Name,
+		},
+	}
+
+	// Convert *common.Unstructured to map[string]interface{}
+	if cmd.Dashboard != nil {
+		snap.Spec.Dashboard = cmd.Dashboard.Object
+	}
+
+	if cmd.Expires > 0 {
+		snap.Spec.Expires = &cmd.Expires
+	}
+
+	if cmd.External {
+		snap.Spec.External = &cmd.External
+		if cmd.ExternalURL != "" {
+			snap.Spec.ExternalUrl = &cmd.ExternalURL
+		}
+	}
+
+	return snap
+}
--- a/pkg/registry/apis/dashboard/snapshot/routes.go
+++ b/pkg/registry/apis/dashboard/snapshot/routes.go
@@ -6,7 +6,10 @@ import (
 	"net/http"

 	"github.com/gorilla/mux"
+	"github.com/grafana/grafana/pkg/setting"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8srequest "k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/kube-openapi/pkg/common"
 	"k8s.io/kube-openapi/pkg/spec3"
 	"k8s.io/kube-openapi/pkg/validation/spec"
@@ -14,6 +17,7 @@ import (
 	authlib "github.com/grafana/authlib/types"
 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/services/apiserver/builder"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
@@ -22,7 +26,7 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )

-func GetRoutes(service dashboardsnapshots.Service, options dashv0.SnapshotSharingOptions, defs map[string]common.OpenAPIDefinition) *builder.APIRoutes {
+func GetRoutes(service dashboardsnapshots.Service, options dashv0.SnapshotSharingOptions, defs map[string]common.OpenAPIDefinition, storageGetter func() rest.Storage) *builder.APIRoutes {
 	prefix := dashv0.SnapshotResourceInfo.GroupResource().Resource
 	tags := []string{dashv0.SnapshotResourceInfo.GroupVersionKind().Kind}

@@ -97,9 +101,10 @@ func GetRoutes(service dashboardsnapshots.Service, options dashv0.SnapshotSharin
 					},
 				},
 				Handler: func(w http.ResponseWriter, r *http.Request) {
-					user, err := identity.GetRequester(r.Context())
+					ctx := r.Context()
+					user, err := identity.GetRequester(ctx)
 					if err != nil {
-						errhttp.Write(r.Context(), err, w)
+						errhttp.Write(ctx, err, w)
 						return
 					}
 					wrap := &contextmodel.ReqContext{
@@ -107,11 +112,15 @@ func GetRoutes(service dashboardsnapshots.Service, options dashv0.SnapshotSharin
 							Req:  r,
 							Resp: web.NewResponseWriter(r.Method, w),
 						},
-						// SignedInUser: user, ????????????
 					}

+					if !options.SnapshotsEnabled {
+						wrap.JsonApiErr(http.StatusForbidden, "Dashboard Snapshots are disabled", nil)
+						return
+					}
 					vars := mux.Vars(r)
-					info, err := authlib.ParseNamespace(vars["namespace"])
+					namespace := vars["namespace"]
+					info, err := authlib.ParseNamespace(namespace)
 					if err != nil {
 						wrap.JsonApiErr(http.StatusBadRequest, "expected namespace", nil)
 						return
@@ -128,8 +137,82 @@ func GetRoutes(service dashboardsnapshots.Service, options dashv0.SnapshotSharin
 						return
 					}

-					// Use the existing snapshot service
-					dashboardsnapshots.CreateDashboardSnapshot(wrap, options, cmd, service)
+					if cmd.External && !options.ExternalEnabled {
+						wrap.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
+						return
+					}
+
+					// fill cmd data
+					if cmd.Name == "" {
+						cmd.Name = "Unnamed snapshot"
+					}
+					cmd.OrgID = user.GetOrgID()
+					cmd.UserID, _ = identity.UserIdentifier(user.GetID())
+
+					//originalDashboardURL, err := dashboardsnapshots.CreateOriginalDashboardURL(&cmd)
+
+					// TODO: add logic for external and internal snapshots
+					if cmd.External {
+						// TODO: if it is an external dashboard make a POST to the public snapshot server
+					} else {
+
+					}
+
+					// TODO: validate dashboard exists. Need to call dashboards api, Maybe in a validation hook?
+
+					storage := storageGetter()
+					if storage == nil {
+						errhttp.Write(ctx, fmt.Errorf("snapshot storage not available"), w)
+						return
+					}
+					creater, ok := storage.(rest.Creater)
+					if !ok {
+						errhttp.Write(ctx, fmt.Errorf("snapshot storage does not support create"), w)
+						return
+					}
+
+					// Convert command to K8s Snapshot
+					snapshot := convertCreateCmdToK8sSnapshot(&cmd, namespace)
+
+					snapshot.SetGenerateName("snapshot-")
+
+					// Set namespace in context for k8s storage layer
+					ctx = k8srequest.WithNamespace(ctx, namespace)
+
+					// Create via storage (dual-write mode decides legacy, unified, or both)
+					result, err := creater.Create(ctx, snapshot, nil, &metav1.CreateOptions{})
+					if err != nil {
+						errhttp.Write(ctx, err, w)
+						return
+					}
+
+					// Extract key and deleteKey from result
+					accessor, err := utils.MetaAccessor(result)
+					if err != nil {
+						errhttp.Write(ctx, fmt.Errorf("failed to access result metadata: %w", err), w)
+						return
+					}
+
+					deleteKey, err := util.GetRandomString(32)
+					if err != nil {
+						errhttp.Write(ctx, fmt.Errorf("failed to generate delete key: %w", err), w)
+					}
+
+					key := accessor.GetName()
+					//deleteKey := ""
+					//if annotations := accessor.GetAnnotations(); annotations != nil {
+					//	deleteKey = annotations["grafana.app/delete-key"]
+					//}
+
+					// Build response
+					response := dashv0.DashboardCreateResponse{
+						Key:       key,
+						DeleteKey: deleteKey,
+						URL:       setting.ToAbsUrl("dashboard/snapshot/" + key),
+						DeleteURL: setting.ToAbsUrl("api/snapshots-delete/" + deleteKey),
+					}
+
+					wrap.JSON(http.StatusOK, response)
 				},
 			},
 			{
--- a/pkg/registry/apis/dashboard/snapshot/snapshot_legacy_store.go
+++ b/pkg/registry/apis/dashboard/snapshot/snapshot_legacy_store.go
@@ -2,6 +2,7 @@ package snapshot

 import (
 	"context"
+	"fmt"

 	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,7 +21,10 @@ var (
 	_ rest.SingularNameProvider = (*SnapshotLegacyStore)(nil)
 	_ rest.Getter               = (*SnapshotLegacyStore)(nil)
 	_ rest.Lister               = (*SnapshotLegacyStore)(nil)
+	_ rest.Creater              = (*SnapshotLegacyStore)(nil)
+	_ rest.Updater              = (*SnapshotLegacyStore)(nil)
 	_ rest.GracefulDeleter      = (*SnapshotLegacyStore)(nil)
+	_ rest.CollectionDeleter    = (*SnapshotLegacyStore)(nil)
 	_ rest.Storage              = (*SnapshotLegacyStore)(nil)
 )

@@ -129,3 +133,51 @@ func (s *SnapshotLegacyStore) Get(ctx context.Context, name string, options *met
 	}
 	return nil, s.ResourceInfo.NewNotFound(name)
 }
+
+// Create implements rest.Creater
+func (s *SnapshotLegacyStore) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
+	snap, ok := obj.(*dashV0.Snapshot)
+	if !ok {
+		return nil, fmt.Errorf("expected Snapshot object, got %T", obj)
+	}
+
+	// Run validation if provided
+	if createValidation != nil {
+		if err := createValidation(ctx, obj); err != nil {
+			return nil, err
+		}
+	}
+
+	// Get user identity from context
+	requester, err := identity.GetRequester(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get requester: %w", err)
+	}
+
+	userID, err := requester.GetInternalID()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get user ID: %w", err)
+	}
+
+	// Convert K8s resource to service command
+	cmd := convertK8sResourceToCreateCommand(snap, requester.GetOrgID(), userID)
+
+	// Create the snapshot via service
+	result, err := s.Service.CreateDashboardSnapshot(ctx, cmd)
+	if err != nil {
+		return nil, err
+	}
+
+	// Convert result back to K8s resource
+	return convertSnapshotToK8sResource(result, s.Namespacer), nil
+}
+
+// Update implements rest.Updater - snapshots are immutable, so this returns an error
+func (s *SnapshotLegacyStore) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
+	return nil, false, fmt.Errorf("snapshots are immutable and cannot be updated")
+}
+
+// DeleteCollection implements rest.CollectionDeleter
+func (s *SnapshotLegacyStore) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) {
+	return nil, fmt.Errorf("delete collection is not supported for snapshots")
+}
--- a/pkg/registry/apis/dashboard/snapshot/sub_dashboard.go
+++ b/pkg/registry/apis/dashboard/snapshot/sub_dashboard.go
@@ -2,6 +2,7 @@ package snapshot

 import (
 	"context"
+	"fmt"
 	"net/http"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -10,22 +11,19 @@ import (

 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
-	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
-	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 )

 // Currently only works with v0alpha1
 type dashboardREST struct {
-	Service dashboardsnapshots.Service
+	getter rest.Getter
 }

 func NewDashboardREST(
-	resourceInfo utils.ResourceInfo,
-	service dashboardsnapshots.Service,
+	getter rest.Getter,
 ) (rest.Storage, error) {
 	return &dashboardREST{
-		Service: service,
+		getter: getter,
 	}, nil
 }

@@ -58,22 +56,30 @@ func (r *dashboardREST) ProducesObject(verb string) interface{} {
 }

 func (r *dashboardREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
-	_, err := request.NamespaceInfoFrom(ctx, true)
+	ns, err := request.NamespaceInfoFrom(ctx, true)
 	if err != nil {
 		return nil, err
 	}
-	snap, err := r.Service.GetDashboardSnapshot(ctx, &dashboardsnapshots.GetDashboardSnapshotQuery{Key: name})
+
+	// Get the snapshot from unified storage
+	obj, err := r.getter.Get(ctx, name, &metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
+
+	snap, ok := obj.(*dashv0.Snapshot)
+	if !ok {
+		return nil, fmt.Errorf("expected Snapshot, got %T", obj)
+	}
+
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 		// TODO... support conversions (not required in v0)
 		dash := &dashv0.Dashboard{
 			ObjectMeta: metav1.ObjectMeta{
-				Namespace: name,
+				Namespace: ns.Value,
 			},
 			Spec: v0alpha1.Unstructured{
-				Object: snap.Dashboard.MustMap(),
+				Object: snap.Spec.Dashboard,
 			},
 		}
 		responder.Object(200, dash)
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -15,7 +15,9 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"

+	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	"github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1beta1"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -61,6 +63,7 @@ type CleanUpService struct {
 	orgService                org.Service
 	teamService               team.Service
 	dataSourceService         datasources.DataSourceService
+	dynamicClientFactory      func(*rest.Config) (dynamic.Interface, error)
 }

 func ProvideService(cfg *setting.Cfg, Features featuremgmt.FeatureToggles, serverLockService *serverlock.ServerLockService,
@@ -86,6 +89,9 @@ func ProvideService(cfg *setting.Cfg, Features featuremgmt.FeatureToggles, serve
 		orgService:                orgService,
 		teamService:               teamService,
 		dataSourceService:         dataSourceService,
+		dynamicClientFactory: func(c *rest.Config) (dynamic.Interface, error) {
+			return dynamic.NewForConfig(c)
+		},
 	}
 	return s
 }
@@ -230,14 +236,93 @@ func (srv *CleanUpService) shouldCleanupTempFile(filemtime time.Time, now time.T

 func (srv *CleanUpService) deleteExpiredSnapshots(ctx context.Context) {
 	logger := srv.log.FromContext(ctx)
-	cmd := dashboardsnapshots.DeleteExpiredSnapshotsCommand{}
-	if err := srv.dashboardSnapshotService.DeleteExpiredSnapshots(ctx, &cmd); err != nil {
-		logger.Error("Failed to delete expired snapshots", "error", err.Error())
+	//nolint:staticcheck // not yet migrated to OpenFeature
+	if srv.Features.IsEnabledGlobally(featuremgmt.FlagKubernetesSnapshots) {
+		srv.deleteKubernetesExpiredSnapshots(ctx)
 	} else {
-		logger.Debug("Deleted expired snapshots", "rows affected", cmd.DeletedRows)
+		cmd := dashboardsnapshots.DeleteExpiredSnapshotsCommand{}
+		if err := srv.dashboardSnapshotService.DeleteExpiredSnapshots(ctx, &cmd); err != nil {
+			logger.Error("Failed to delete expired snapshots", "error", err.Error())
+		} else {
+			logger.Debug("Deleted expired snapshots", "rows affected", cmd.DeletedRows)
+		}
 	}
 }

+func (srv *CleanUpService) deleteKubernetesExpiredSnapshots(ctx context.Context) {
+	logger := srv.log.FromContext(ctx)
+	logger.Debug("Starting deleting expired Kubernetes snapshots")
+
+	// Create the dynamic client for Kubernetes API
+	restConfig, err := srv.clientConfigProvider.GetRestConfig(ctx)
+	if err != nil {
+		logger.Error("Failed to get REST config for Kubernetes client", "error", err.Error())
+		return
+	}
+
+	client, err := srv.dynamicClientFactory(restConfig)
+	if err != nil {
+		logger.Error("Failed to create Kubernetes client", "error", err.Error())
+		return
+	}
+
+	// Set up the GroupVersionResource for snapshots
+	gvr := v0alpha1.SnapshotKind().GroupVersionResource()
+
+	// Expiration time is now
+	expirationTime := time.Now()
+	expirationTimestamp := expirationTime.UnixMilli()
+	deletedCount := 0
+
+	// List and delete expired snapshots across all namespaces
+	orgs, err := srv.orgService.Search(ctx, &org.SearchOrgsQuery{})
+	if err != nil {
+		logger.Error("Failed to list organizations", "error", err.Error())
+		return
+	}
+
+	for _, o := range orgs {
+		ctx, _ := identity.WithServiceIdentity(ctx, o.ID)
+		namespaceMapper := request.GetNamespaceMapper(srv.Cfg)
+		snapshots, err := client.Resource(gvr).Namespace(namespaceMapper(o.ID)).List(ctx, v1.ListOptions{})
+		if err != nil {
+			logger.Error("Failed to list snapshots", "error", err.Error())
+			return
+		}
+		// Check each snapshot for expiration
+		for _, item := range snapshots.Items {
+			// Convert unstructured object to Snapshot struct
+			var snapshot v0alpha1.Snapshot
+			err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, &snapshot)
+			if err != nil {
+				logger.Error("Failed to convert unstructured object to snapshot", "name", item.GetName(), "namespace", item.GetNamespace(), "error", err.Error())
+				continue
+			}
+
+			// Only delete expired snapshots
+			if snapshot.Spec.Expires != nil && *snapshot.Spec.Expires < expirationTimestamp {
+				namespace := snapshot.Namespace
+				name := snapshot.Name
+
+				err := client.Resource(gvr).Namespace(namespace).Delete(ctx, name, v1.DeleteOptions{})
+				if err != nil {
+					// Check if it's a "not found" error, which is expected if the resource was already deleted
+					if k8serrors.IsNotFound(err) {
+						logger.Debug("Snapshot already deleted", "name", name, "namespace", namespace)
+					} else {
+						logger.Error("Failed to delete expired snapshot", "name", name, "namespace", namespace, "error", err.Error())
+					}
+				} else {
+					deletedCount++
+					logger.Debug("Successfully deleted expired snapshot", "name", name, "namespace", namespace, "creationTime", snapshot.CreationTimestamp.Unix(), "expirationTime", expirationTimestamp)
+				}
+			}
+		}
+	}
+
+	logger.Debug("Deleted expired Kubernetes snapshots", "count", deletedCount)
+}
+
 func (srv *CleanUpService) deleteExpiredDashboardVersions(ctx context.Context) {
 	logger := srv.log.FromContext(ctx)
 	cmd := dashver.DeleteExpiredVersionsCommand{}
@@ -318,7 +403,7 @@ func (srv *CleanUpService) deleteStaleKubernetesShortURLs(ctx context.Context) {
 		return
 	}

-	client, err := dynamic.NewForConfig(restConfig)
+	client, err := srv.dynamicClientFactory(restConfig)
 	if err != nil {
 		logger.Error("Failed to create Kubernetes client", "error", err.Error())
 		return
--- a/pkg/services/cleanup/cleanup_test.go
+++ b/pkg/services/cleanup/cleanup_test.go
@@ -1,11 +1,30 @@
 package cleanup

 import (
+	"context"
+	"errors"
 	"testing"
 	"time"

+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"

+	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/apiserver"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/setting"
 )

@@ -36,3 +55,223 @@ func TestCleanUpTmpFiles(t *testing.T) {
 		require.False(t, service.shouldCleanupTempFile(weekAgo, now))
 	})
 }
+
+func TestDeleteExpiredSnapshots_LegacyMode(t *testing.T) {
+	t.Run("calls DeleteExpiredSnapshots on success", func(t *testing.T) {
+		mockSnapService := dashboardsnapshots.NewMockService(t)
+		mockSnapService.On("DeleteExpiredSnapshots", mock.Anything, mock.Anything).Return(nil)
+
+		service := &CleanUpService{
+			log:                      log.New("cleanup"),
+			Features:                 featuremgmt.WithFeatures(),
+			dashboardSnapshotService: mockSnapService,
+		}
+
+		service.deleteExpiredSnapshots(context.Background())
+
+		mockSnapService.AssertCalled(t, "DeleteExpiredSnapshots", mock.Anything, mock.Anything)
+	})
+
+	t.Run("handles error gracefully", func(t *testing.T) {
+		mockSnapService := dashboardsnapshots.NewMockService(t)
+		mockSnapService.On("DeleteExpiredSnapshots", mock.Anything, mock.Anything).Return(errors.New("db error"))
+
+		service := &CleanUpService{
+			log:                      log.New("cleanup"),
+			Features:                 featuremgmt.WithFeatures(),
+			dashboardSnapshotService: mockSnapService,
+		}
+
+		// Should not panic
+		service.deleteExpiredSnapshots(context.Background())
+	})
+}
+
+func TestDeleteExpiredSnapshots_KubernetesMode(t *testing.T) {
+	t.Run("deletes expired snapshots across multiple orgs", func(t *testing.T) {
+		// Create expired snapshots - one per org
+		expiredTime := time.Now().Add(-time.Hour).UnixMilli()
+		expiredSnapshot1 := createUnstructuredSnapshot("expired-snap-1", "org-1", expiredTime)
+		expiredSnapshot2 := createUnstructuredSnapshot("expired-snap-2", "org-2", expiredTime)
+
+		// Track which namespaces were queried
+		namespacesQueried := make(map[string]bool)
+
+		mockResource := new(mockResourceInterface)
+		mockResource.On("Namespace", mock.Anything).Run(func(args mock.Arguments) {
+			ns := args.Get(0).(string)
+			namespacesQueried[ns] = true
+		}).Return(mockResource)
+		mockResource.On("List", mock.Anything, mock.Anything).Return(&unstructured.UnstructuredList{
+			Items: []unstructured.Unstructured{*expiredSnapshot1, *expiredSnapshot2},
+		}, nil)
+		mockResource.On("Delete", mock.Anything, "expired-snap-1", mock.Anything, mock.Anything).Return(nil)
+		mockResource.On("Delete", mock.Anything, "expired-snap-2", mock.Anything, mock.Anything).Return(nil)
+
+		mockDynClient := new(mockDynamicClient)
+		mockDynClient.On("Resource", mock.Anything).Return(mockResource)
+
+		service := createK8sCleanupService(t, mockDynClient)
+		service.deleteExpiredSnapshots(context.Background())
+
+		// Verify multiple namespaces were queried (one per org)
+		require.GreaterOrEqual(t, len(namespacesQueried), 2, "expected at least 2 namespaces to be queried")
+		// Verify both snapshots were deleted
+		mockResource.AssertCalled(t, "Delete", mock.Anything, "expired-snap-1", mock.Anything, mock.Anything)
+		mockResource.AssertCalled(t, "Delete", mock.Anything, "expired-snap-2", mock.Anything, mock.Anything)
+	})
+
+	t.Run("skips non-expired snapshots", func(t *testing.T) {
+		// Setup with future timestamp
+		futureTime := time.Now().Add(time.Hour).UnixMilli()
+		futureSnapshot := createUnstructuredSnapshot("future-snap", "org-1", futureTime)
+
+		mockResource := new(mockResourceInterface)
+		mockResource.On("Namespace", mock.Anything).Return(mockResource)
+		mockResource.On("List", mock.Anything, mock.Anything).Return(&unstructured.UnstructuredList{
+			Items: []unstructured.Unstructured{*futureSnapshot},
+		}, nil)
+
+		mockDynClient := new(mockDynamicClient)
+		mockDynClient.On("Resource", mock.Anything).Return(mockResource)
+
+		service := createK8sCleanupService(t, mockDynClient)
+		service.deleteExpiredSnapshots(context.Background())
+
+		mockResource.AssertNotCalled(t, "Delete", mock.Anything, mock.Anything, mock.Anything, mock.Anything)
+	})
+
+	t.Run("handles REST config error", func(t *testing.T) {
+		service := &CleanUpService{
+			log:                  log.New("cleanup"),
+			Cfg:                  &setting.Cfg{},
+			Features:             featuremgmt.WithFeatures(featuremgmt.FlagKubernetesSnapshots),
+			clientConfigProvider: apiserver.WithoutRestConfig,
+		}
+
+		// Should not panic
+		service.deleteExpiredSnapshots(context.Background())
+	})
+
+	t.Run("handles not found error gracefully", func(t *testing.T) {
+		expiredTime := time.Now().Add(-time.Hour).UnixMilli()
+		expiredSnapshot := createUnstructuredSnapshot("expired-snap", "org-1", expiredTime)
+
+		notFoundErr := k8serrors.NewNotFound(schema.GroupResource{}, "expired-snap")
+
+		mockResource := new(mockResourceInterface)
+		mockResource.On("Namespace", mock.Anything).Return(mockResource)
+		mockResource.On("List", mock.Anything, mock.Anything).Return(&unstructured.UnstructuredList{
+			Items: []unstructured.Unstructured{*expiredSnapshot},
+		}, nil)
+		mockResource.On("Delete", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(notFoundErr)
+
+		mockDynClient := new(mockDynamicClient)
+		mockDynClient.On("Resource", mock.Anything).Return(mockResource)
+
+		service := createK8sCleanupService(t, mockDynClient)
+
+		// Should not panic - not found is expected
+		service.deleteExpiredSnapshots(context.Background())
+		mockResource.AssertExpectations(t)
+	})
+}
+
+// Helper function to create unstructured snapshots for testing
+func createUnstructuredSnapshot(name, namespace string, expiresMillis int64) *unstructured.Unstructured {
+	snapshot := &v0alpha1.Snapshot{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Spec: v0alpha1.SnapshotSpec{
+			Expires: &expiresMillis,
+		},
+	}
+	obj, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(snapshot)
+	return &unstructured.Unstructured{Object: obj}
+}
+
+// Helper to create CleanUpService configured for Kubernetes mode with standard two-org setup
+func createK8sCleanupService(t *testing.T, mockDynClient *mockDynamicClient) *CleanUpService {
+	mockOrgSvc := orgtest.NewMockService(t)
+	mockOrgSvc.On("Search", mock.Anything, mock.Anything).Return([]*org.OrgDTO{
+		{ID: 1, Name: "org1"},
+		{ID: 2, Name: "org2"},
+	}, nil)
+
+	return &CleanUpService{
+		log:      log.New("cleanup"),
+		Cfg:      &setting.Cfg{},
+		Features: featuremgmt.WithFeatures(featuremgmt.FlagKubernetesSnapshots),
+		clientConfigProvider: apiserver.RestConfigProviderFunc(func(ctx context.Context) (*rest.Config, error) {
+			return &rest.Config{}, nil
+		}),
+		orgService: mockOrgSvc,
+		dynamicClientFactory: func(cfg *rest.Config) (dynamic.Interface, error) {
+			return mockDynClient, nil
+		},
+	}
+}
+
+// mockDynamicClient is a minimal mock for dynamic.Interface
+type mockDynamicClient struct {
+	mock.Mock
+}
+
+func (m *mockDynamicClient) Resource(resource schema.GroupVersionResource) dynamic.NamespaceableResourceInterface {
+	args := m.Called(resource)
+	return args.Get(0).(dynamic.NamespaceableResourceInterface)
+}
+
+// mockResourceInterface is a minimal mock for dynamic.ResourceInterface
+type mockResourceInterface struct {
+	mock.Mock
+}
+
+func (m *mockResourceInterface) Namespace(ns string) dynamic.ResourceInterface {
+	args := m.Called(ns)
+	return args.Get(0).(dynamic.ResourceInterface)
+}
+
+func (m *mockResourceInterface) List(ctx context.Context, opts metav1.ListOptions) (*unstructured.UnstructuredList, error) {
+	args := m.Called(ctx, opts)
+	if args.Get(0) == nil {
+		return nil, args.Error(1)
+	}
+	return args.Get(0).(*unstructured.UnstructuredList), args.Error(1)
+}
+
+func (m *mockResourceInterface) Delete(ctx context.Context, name string, opts metav1.DeleteOptions, subresources ...string) error {
+	args := m.Called(ctx, name, opts, subresources)
+	return args.Error(0)
+}
+
+// Unused methods - panic if called unexpectedly
+func (m *mockResourceInterface) Create(ctx context.Context, obj *unstructured.Unstructured, opts metav1.CreateOptions, subresources ...string) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) Update(ctx context.Context, obj *unstructured.Unstructured, opts metav1.UpdateOptions, subresources ...string) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) UpdateStatus(ctx context.Context, obj *unstructured.Unstructured, opts metav1.UpdateOptions) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) Get(ctx context.Context, name string, opts metav1.GetOptions, subresources ...string) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) Apply(ctx context.Context, name string, obj *unstructured.Unstructured, opts metav1.ApplyOptions, subresources ...string) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
+func (m *mockResourceInterface) ApplyStatus(ctx context.Context, name string, obj *unstructured.Unstructured, opts metav1.ApplyOptions) (*unstructured.Unstructured, error) {
+	panic("not implemented")
+}
--- a/pkg/services/dashboardsnapshots/service.go
+++ b/pkg/services/dashboardsnapshots/service.go
@@ -37,10 +37,15 @@ var client = &http.Client{
 }

 func CreateDashboardSnapshot(c *contextmodel.ReqContext, cfg snapshot.SnapshotSharingOptions, cmd CreateDashboardSnapshotCommand, svc Service) {
+	// perform all validations in the beginning
 	if !cfg.SnapshotsEnabled {
 		c.JsonApiErr(http.StatusForbidden, "Dashboard Snapshots are disabled", nil)
 		return
 	}
+	if cmd.External && !cfg.ExternalEnabled {
+		c.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
+		return
+	}

 	uid := cmd.Dashboard.GetNestedString("uid")
 	user, err := identity.GetRequester(c.Req.Context())
@@ -67,17 +72,17 @@ func CreateDashboardSnapshot(c *contextmodel.ReqContext, cfg snapshot.SnapshotSh
 	cmd.ExternalURL = ""
 	cmd.OrgID = user.GetOrgID()
 	cmd.UserID, _ = identity.UserIdentifier(user.GetID())
-	originalDashboardURL, err := createOriginalDashboardURL(&cmd)
+	originalDashboardURL, err := CreateOriginalDashboardURL(&cmd)
 	if err != nil {
 		c.JsonApiErr(http.StatusInternalServerError, "Invalid app URL", err)
 		return
 	}

 	if cmd.External {
-		if !cfg.ExternalEnabled {
-			c.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
-			return
-		}
+		//if !cfg.ExternalEnabled {
+		//	c.JsonApiErr(http.StatusForbidden, "External dashboard creation is disabled", nil)
+		//	return
+		//}

 		resp, err := createExternalDashboardSnapshot(cmd, cfg.ExternalSnapshotURL)
 		if err != nil {
@@ -203,7 +208,7 @@ func createExternalDashboardSnapshot(cmd CreateDashboardSnapshotCommand, externa
 	return &createSnapshotResponse, nil
 }

-func createOriginalDashboardURL(cmd *CreateDashboardSnapshotCommand) (string, error) {
+func CreateOriginalDashboardURL(cmd *CreateDashboardSnapshotCommand) (string, error) {
 	dashUID := cmd.Dashboard.GetNestedString("uid")
 	if ok := util.IsValidShortUID(dashUID); !ok {
 		return "", fmt.Errorf("invalid dashboard UID")
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -650,6 +650,13 @@ var (
 			Stage:        FeatureStageExperimental,
 			Owner:        grafanaDatavizSquad,
 		},
+		{
+			Name:         "kubernetesFeatureToggles",
+			Description:  "Use the kubernetes API for feature toggle management in the frontend",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaOperatorExperienceSquad,
+		},
 		{
 			Name:            "cloudRBACRoles",
 			Description:     "Enabled grafana cloud specific RBAC roles",
@@ -2083,13 +2090,6 @@ var (
 			FrontendOnly: false,
 			Owner:        grafanaOperatorExperienceSquad,
 		},
-		{
-			Name:         "profilesExemplars",
-			Description:  "Enables profiles exemplars support in profiles drilldown",
-			Stage:        FeatureStageExperimental,
-			Owner:        grafanaObservabilityTracesAndProfilingSquad,
-			FrontendOnly: false,
-		},
 	}
 )

--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -90,6 +90,7 @@ pdfTables,preview,@grafana/grafana-operator-experience-squad,false,false,false
 canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true
 timeComparison,experimental,@grafana/dataviz-squad,false,false,true
 tableSharedCrosshair,experimental,@grafana/dataviz-squad,false,false,true
+kubernetesFeatureToggles,experimental,@grafana/grafana-operator-experience-squad,false,false,true
 cloudRBACRoles,preview,@grafana/identity-access-team,false,true,false
 alertingQueryOptimization,GA,@grafana/alerting-squad,false,false,false
 jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,false,true,false
@@ -282,4 +283,3 @@ useMTPlugins,experimental,@grafana/plugins-platform-backend,false,false,true
 multiPropsVariables,experimental,@grafana/dashboards-squad,false,false,true
 smoothingTransformation,experimental,@grafana/datapro,false,false,true
 secretsManagementAppPlatformAwsKeeper,experimental,@grafana/grafana-operator-experience-squad,false,false,false
-profilesExemplars,experimental,@grafana/observability-traces-and-profiling,false,false,false
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -785,8 +785,4 @@ const (
 	// FlagSecretsManagementAppPlatformAwsKeeper
 	// Enables the creation of keepers that manage secrets stored on AWS secrets manager
 	FlagSecretsManagementAppPlatformAwsKeeper = "secretsManagementAppPlatformAwsKeeper"
-
-	// FlagProfilesExemplars
-	// Enables profiles exemplars support in profiles drilldown
-	FlagProfilesExemplars = "profilesExemplars"
 )
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2044,8 +2044,7 @@
      "metadata": {
        "name": "kubernetesFeatureToggles",
        "resourceVersion": "1764664939750",
-        "creationTimestamp": "2024-01-18T05:32:44Z",
-        "deletionTimestamp": "2026-01-07T12:02:51Z"
+        "creationTimestamp": "2024-01-18T05:32:44Z"
      },
      "spec": {
        "description": "Use the kubernetes API for feature toggle management in the frontend",
@@ -2867,18 +2866,6 @@
        "expression": "true"
      }
    },
-    {
-      "metadata": {
-        "name": "profilesExemplars",
-        "resourceVersion": "1767777507980",
-        "creationTimestamp": "2026-01-07T09:18:27Z"
-      },
-      "spec": {
-        "description": "Enables profiles exemplars support in profiles drilldown",
-        "stage": "experimental",
-        "codeowner": "@grafana/observability-traces-and-profiling"
-      }
-    },
    {
      "metadata": {
        "name": "prometheusAzureOverrideAudience",
--- a/pkg/tsdb/grafana-pyroscope-datasource/exemplar/exemplar.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/exemplar/exemplar.go
@@ -1,43 +0,0 @@
-package exemplar
-
-import (
-	"time"
-
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-)
-
-type Exemplar struct {
-	Id        string
-	Value     float64
-	Timestamp int64
-}
-
-func CreateExemplarFrame(labels map[string]string, exemplars []*Exemplar) *data.Frame {
-	frame := data.NewFrame("exemplar")
-	frame.Meta = &data.FrameMeta{
-		DataTopic: data.DataTopicAnnotations,
-	}
-	fields := []*data.Field{
-		data.NewField("Time", nil, []time.Time{}),
-		data.NewField("Value", labels, []float64{}), // add labels here?
-		data.NewField("Id", nil, []string{}),
-	}
-	fields[2].Config = &data.FieldConfig{
-		DisplayName: "Profile ID",
-	}
-	for name := range labels {
-		fields = append(fields, data.NewField(name, nil, []string{}))
-	}
-	frame.Fields = fields
-
-	for _, e := range exemplars {
-		frame.AppendRow(time.UnixMilli(e.Timestamp), e.Value, e.Id)
-		for name, value := range labels {
-			field, _ := frame.FieldByName(name)
-			if field != nil {
-				field.Append(value)
-			}
-		}
-	}
-	return frame
-}
--- a/pkg/tsdb/grafana-pyroscope-datasource/exemplar/exemplar_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/exemplar/exemplar_test.go
@@ -1,34 +0,0 @@
-package exemplar
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestCreateExemplarFrame(t *testing.T) {
-	exemplars := []*Exemplar{
-		{Id: "1", Value: 1.0, Timestamp: 100},
-		{Id: "2", Value: 2.0, Timestamp: 200},
-	}
-	labels := map[string]string{
-		"foo": "bar",
-	}
-	frame := CreateExemplarFrame(labels, exemplars)
-
-	require.Equal(t, "exemplar", frame.Name)
-	require.Equal(t, 4, len(frame.Fields))
-	require.Equal(t, "Time", frame.Fields[0].Name)
-	require.Equal(t, "Value", frame.Fields[1].Name)
-	require.Equal(t, "Id", frame.Fields[2].Name)
-	require.Equal(t, "foo", frame.Fields[3].Name)
-
-	rows, err := frame.RowLen()
-	require.NoError(t, err)
-	require.Equal(t, 2, rows)
-	row := frame.RowCopy(0)
-	require.Equal(t, 4, len(row))
-	require.Equal(t, 1.0, row[1])
-	require.Equal(t, "1", row[2])
-	require.Equal(t, "bar", row[3])
-}
--- a/pkg/tsdb/grafana-pyroscope-datasource/instance.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
@@ -18,8 +18,6 @@ import (
 	"github.com/prometheus/prometheus/promql/parser"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
-
-	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
 )

 var (
@@ -33,7 +31,7 @@ type ProfilingClient interface {
 	ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error)
 	LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error)
 	LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error)
-	GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error)
+	GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error)
 	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
 	GetSpanProfile(ctx context.Context, profileTypeID string, labelSelector string, spanSelector []string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
 }
--- a/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
@@ -32,8 +32,6 @@ type GrafanaPyroscopeDataQuery struct {
 	Limit *int64 `json:"limit,omitempty"`
 	// Sets the maximum number of nodes in the flamegraph.
 	MaxNodes *int64 `json:"maxNodes,omitempty"`
-	// If set to true, the response will contain annotations
-	Annotations *bool `json:"annotations,omitempty"`
 	// A unique identifier for the query within the list of targets.
 	// In server side expressions, the refId is used as a variable name to identify results.
 	// By default, the UI will assign A->Z; however setting meaningful names may be useful.
@@ -43,8 +41,8 @@ type GrafanaPyroscopeDataQuery struct {
 	// Specify the query flavor
 	// TODO make this required and give it a default
 	QueryType *string `json:"queryType,omitempty"`
-	// If set to true, exemplars will be requested
-	IncludeExemplars bool `json:"includeExemplars"`
+	// If set to true, the response will contain annotations
+	Annotations *bool `json:"annotations,omitempty"`
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
 	// TODO find a better way to do this ^ that's friendly to schema
@@ -55,8 +53,7 @@ type GrafanaPyroscopeDataQuery struct {
 // NewGrafanaPyroscopeDataQuery creates a new GrafanaPyroscopeDataQuery object.
 func NewGrafanaPyroscopeDataQuery() *GrafanaPyroscopeDataQuery {
 	return &GrafanaPyroscopeDataQuery{
-		LabelSelector:    "{}",
-		GroupBy:          []string{},
-		IncludeExemplars: false,
+		LabelSelector: "{}",
+		GroupBy:       []string{},
 	}
 }
--- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
@@ -8,16 +8,14 @@ import (

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
-
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"

 	"connectrpc.com/connect"
+	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
+	"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
-
-	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
-	"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
 )

 type ProfileType struct {
@@ -51,13 +49,6 @@ type Point struct {
 	// Milliseconds unix timestamp
 	Timestamp   int64
 	Annotations []*typesv1.ProfileAnnotation
-	Exemplars   []*Exemplar
-}
-
-type Exemplar struct {
-	Id        string
-	Value     uint64
-	Timestamp int64
 }

 type ProfileResponse struct {
@@ -108,7 +99,7 @@ func (c *PyroscopeClient) ProfileTypes(ctx context.Context, start int64, end int
 	}
 }

-func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error) {
+func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error) {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetSeries", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector)))
 	defer span.End()
 	req := connect.NewRequest(&querierv1.SelectSeriesRequest{
@@ -119,7 +110,6 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
 		Step:          step,
 		GroupBy:       groupBy,
 		Limit:         limit,
-		ExemplarType:  exemplarType,
 	})

 	resp, err := c.connectClient.SelectSeries(ctx, req)
@@ -147,16 +137,6 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
 				Timestamp:   p.Timestamp,
 				Annotations: p.Annotations,
 			}
-			if len(p.Exemplars) > 0 {
-				points[i].Exemplars = make([]*Exemplar, len(p.Exemplars))
-				for j, e := range p.Exemplars {
-					points[i].Exemplars[j] = &Exemplar{
-						Id:        e.ProfileId,
-						Value:     e.Value,
-						Timestamp: e.Timestamp,
-					}
-				}
-			}
 		}

 		series[i] = &Series{
--- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go
@@ -5,11 +5,10 @@ import (
 	"testing"

 	"connectrpc.com/connect"
-	"github.com/stretchr/testify/require"
-
 	googlev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1"
 	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
+	"github.com/stretchr/testify/require"
 )

 func Test_PyroscopeClient(t *testing.T) {
@@ -20,7 +19,7 @@ func Test_PyroscopeClient(t *testing.T) {

 	t.Run("GetSeries", func(t *testing.T) {
 		limit := int64(42)
-		resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15, typesv1.ExemplarType_EXEMPLAR_TYPE_NONE)
+		resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15)
 		require.Nil(t, err)

 		series := &SeriesResponse{
@@ -33,21 +32,6 @@ func Test_PyroscopeClient(t *testing.T) {
 		require.Equal(t, series, resp)
 	})

-	t.Run("GetSeriesWithExemplars", func(t *testing.T) {
-		limit := int64(42)
-		resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15, typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL)
-		require.Nil(t, err)
-
-		series := &SeriesResponse{
-			Series: []*Series{
-				{Labels: []*LabelPair{{Name: "foo", Value: "bar"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30, Exemplars: []*Exemplar{{Id: "id1", Value: 3, Timestamp: 1000}}}, {Timestamp: int64(2000), Value: 10, Exemplars: []*Exemplar{{Id: "id2", Value: 1, Timestamp: 2000}}}}},
-			},
-			Units: "short",
-			Label: "alloc_objects",
-		}
-		require.Equal(t, series, resp)
-	})
-
 	t.Run("GetProfile", func(t *testing.T) {
 		maxNodes := int64(-1)
 		resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, &maxNodes)
@@ -131,21 +115,6 @@ func (f *FakePyroscopeConnectClient) SelectMergeStacktraces(ctx context.Context,

 func (f *FakePyroscopeConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
 	f.Req = req
-	if req.Msg.ExemplarType == typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL {
-		return &connect.Response[querierv1.SelectSeriesResponse]{
-			Msg: &querierv1.SelectSeriesResponse{
-				Series: []*typesv1.Series{
-					{
-						Labels: []*typesv1.LabelPair{{Name: "foo", Value: "bar"}},
-						Points: []*typesv1.Point{
-							{Timestamp: int64(1000), Value: 30, Exemplars: []*typesv1.Exemplar{{Timestamp: int64(1000), Value: 3, ProfileId: "id1"}}},
-							{Timestamp: int64(2000), Value: 10, Exemplars: []*typesv1.Exemplar{{Timestamp: int64(2000), Value: 1, ProfileId: "id2"}}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
 	return &connect.Response[querierv1.SelectSeriesResponse]{
 		Msg: &querierv1.SelectSeriesResponse{
 			Series: []*typesv1.Series{
--- a/pkg/tsdb/grafana-pyroscope-datasource/query.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query.go
@@ -13,7 +13,6 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/live"
-	"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/exemplar"
 	"github.com/xlab/treeprint"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -22,8 +21,6 @@ import (

 	"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
 	"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery"
-
-	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
 )

 type queryModel struct {
@@ -39,12 +36,8 @@ const (
 	queryTypeProfile = string(dataquery.PyroscopeQueryTypeProfile)
 	queryTypeMetrics = string(dataquery.PyroscopeQueryTypeMetrics)
 	queryTypeBoth    = string(dataquery.PyroscopeQueryTypeBoth)
-
-	exemplarsFeatureToggle = "profilesExemplars"
 )

-var identityTransformation = func(value float64) float64 { return value }
-
 // query processes single Pyroscope query transforming the response to data.Frame packaged in DataResponse
 func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
 	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
@@ -84,10 +77,6 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 					logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
 				}
 			}
-			exemplarType := typesv1.ExemplarType_EXEMPLAR_TYPE_NONE
-			if qm.IncludeExemplars && backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(exemplarsFeatureToggle) {
-				exemplarType = typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL
-			}
 			seriesResp, err := d.client.GetSeries(
 				gCtx,
 				profileTypeId,
@@ -97,7 +86,6 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 				qm.GroupBy,
 				qm.Limit,
 				math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
-				exemplarType,
 			)
 			if err != nil {
 				span.RecordError(err)
@@ -487,7 +475,6 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration
 	annotations := make([]*annotation.TimedAnnotation, 0)

 	for _, series := range resp.Series {
-		exemplars := make([]*exemplar.Exemplar, 0)
 		// We create separate data frames as the series may not have the same length
 		frame := data.NewFrame("series")
 		frameMeta := &data.FrameMeta{PreferredVisualization: "graph"}
@@ -529,20 +516,14 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration

 			// Apply rate calculation for cumulative profiles
 			value := point.Value
-			transformation := identityTransformation
 			if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
-				transformation = func(value float64) float64 {
-					return value / stepDurationSec
-				}
+				value = value / stepDurationSec

 				// Convert CPU nanoseconds to cores
 				if isCPUTimeProfile(profileTypeID) {
-					transformation = func(value float64) float64 {
-						return value / stepDurationSec / 1e9
-					}
+					value = value / 1e9
 				}
 			}
-			value = transformation(value)
 			valueField.Append(value)
 			if withAnnotations {
 				for _, a := range point.Annotations {
@@ -552,22 +533,10 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration
 					})
 				}
 			}
-			for _, e := range point.Exemplars {
-				exemplars = append(exemplars, &exemplar.Exemplar{
-					Id:        e.Id,
-					Value:     transformation(float64(e.Value)),
-					Timestamp: e.Timestamp,
-				})
-			}
 		}

 		frame.Fields = fields
 		frames = append(frames, frame)
-
-		if len(exemplars) > 0 {
-			frame := exemplar.CreateExemplarFrame(labels, exemplars)
-			frames = append(frames, frame)
-		}
 	}

 	if len(annotations) > 0 {
--- a/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go
@@ -9,7 +9,6 @@ import (

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"

 	"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
@@ -488,21 +487,10 @@ func Test_seriesToDataFrame(t *testing.T) {
 		require.Nil(t, frames[0].Meta.Custom)
 	})

-	t.Run("CPU time conversion to cores with exemplars", func(t *testing.T) {
+	t.Run("CPU time conversion to cores", func(t *testing.T) {
 		series := &SeriesResponse{
 			Series: []*Series{
-				{
-					Labels: []*LabelPair{}, Points: []*Point{
-						{
-							Timestamp: int64(1000), Value: 3000000000, // 3s in nanoseconds
-							Exemplars: []*Exemplar{{Value: 300000000, Timestamp: 1000}}, // 0.3s in nanoseconds
-						},
-						{
-							Timestamp: int64(2000), Value: 1500000000, // 1.5s in nanoseconds
-							Exemplars: []*Exemplar{{Value: 150000000, Timestamp: 1000}}, // 0.15s in nanoseconds
-						},
-					},
-				},
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 3000000000}, {Timestamp: int64(2000), Value: 1500000000}}}, // 3s and 1.5s in nanoseconds
 			},
 			Units: "ns",
 			Label: "cpu",
@@ -510,32 +498,19 @@ func Test_seriesToDataFrame(t *testing.T) {
 		// should convert nanoseconds to cores and set unit to "cores"
 		frames, err := seriesToDataFrames(series, false, 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
 		require.NoError(t, err)
-		require.Equal(t, 2, len(frames))
+		require.Equal(t, 1, len(frames))

 		require.Equal(t, "cores", frames[0].Fields[1].Config.Unit)

 		// Check values were converted: 3000000000/15/1e9 = 0.2 cores/sec, 1500000000/15/1e9 = 0.1 cores/sec
 		values := fieldValues[float64](frames[0].Fields[1])
 		require.Equal(t, []float64{0.2, 0.1}, values)
-		// Check exemplar values were converted: 300000000/15/1e9 = 0.02 cores/sec, 150000000/15/1e9 = 0.01 cores/sec
-		exemplarValues := fieldValues[float64](frames[1].Fields[1])
-		require.Equal(t, []float64{0.02, 0.01}, exemplarValues)
 	})

 	t.Run("Memory allocation unit conversion to bytes/sec", func(t *testing.T) {
 		series := &SeriesResponse{
 			Series: []*Series{
-				{
-					Labels: []*LabelPair{}, Points: []*Point{
-						{
-							Timestamp: int64(1000), Value: 150000000, // 150 MB
-							Exemplars: []*Exemplar{{Value: 15000000, Timestamp: 1000}}, // 15 MB
-						}, {
-							Timestamp: int64(2000), Value: 300000000, // 300 MB
-							Exemplars: []*Exemplar{{Value: 30000000, Timestamp: 1000}}, // 30 MB
-						},
-					},
-				},
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 150000000}, {Timestamp: int64(2000), Value: 300000000}}}, // 150 MB, 300 MB
 			},
 			Units: "bytes",
 			Label: "memory_alloc",
@@ -543,33 +518,19 @@ func Test_seriesToDataFrame(t *testing.T) {
 		// should convert bytes to binBps and apply rate calculation
 		frames, err := seriesToDataFrames(series, false, 15.0, "memory:alloc_space:bytes:space:bytes")
 		require.NoError(t, err)
-		require.Equal(t, 2, len(frames))
+		require.Equal(t, 1, len(frames))

 		require.Equal(t, "binBps", frames[0].Fields[1].Config.Unit)

 		// Check values were rate calculated: 150000000/15 = 10000000, 300000000/15 = 20000000
 		values := fieldValues[float64](frames[0].Fields[1])
 		require.Equal(t, []float64{10000000, 20000000}, values)
-		// Check exemplar values were rate calculated: 15000000/15 = 1000000, 30000000/15 = 2000000
-		exemplarValues := fieldValues[float64](frames[1].Fields[1])
-		require.Equal(t, []float64{1000000, 2000000}, exemplarValues)
 	})

 	t.Run("Count-based profile unit conversion to ops/sec", func(t *testing.T) {
 		series := &SeriesResponse{
 			Series: []*Series{
-				{
-					Labels: []*LabelPair{}, Points: []*Point{
-						{
-							Timestamp: int64(1000), Value: 1500, // 1500 contentions
-							Exemplars: []*Exemplar{{Value: 150, Timestamp: 1000}}, // 150 contentions
-
-						}, {
-							Timestamp: int64(2000), Value: 3000, // 3000 contentions
-							Exemplars: []*Exemplar{{Value: 300, Timestamp: 1000}}, // 300 contentions
-						},
-					},
-				},
+				{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 1500}, {Timestamp: int64(2000), Value: 3000}}}, // 1500, 3000 contentions
 			},
 			Units: "short",
 			Label: "contentions",
@@ -577,16 +538,13 @@ func Test_seriesToDataFrame(t *testing.T) {
 		// should convert short to ops and apply rate calculation
 		frames, err := seriesToDataFrames(series, false, 15.0, "mutex:contentions:count:contentions:count")
 		require.NoError(t, err)
-		require.Equal(t, 2, len(frames))
+		require.Equal(t, 1, len(frames))

 		require.Equal(t, "ops", frames[0].Fields[1].Config.Unit)

 		// Check values were rate calculated: 1500/15 = 100, 3000/15 = 200
 		values := fieldValues[float64](frames[0].Fields[1])
 		require.Equal(t, []float64{100, 200}, values)
-		// Check exemplar values were rate calculated: 150/15 = 10, 300/15 = 20
-		exemplarValues := fieldValues[float64](frames[1].Fields[1])
-		require.Equal(t, []float64{10, 20}, exemplarValues)
 	})
 }

@@ -647,7 +605,7 @@ func (f *FakeClient) GetSpanProfile(ctx context.Context, profileTypeID, labelSel
 	}, nil
 }

-func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error) {
+func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error) {
 	f.Args = []any{profileTypeID, labelSelector, start, end, groupBy, step}
 	return &SeriesResponse{
 		Series: []*Series{
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.test.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.test.tsx
@@ -3,8 +3,7 @@ import { render, screen, userEvent, waitFor } from 'test/test-utils';
 import { byLabelText, byRole, byText } from 'testing-library-selector';

 import { setPluginLinksHook } from '@grafana/runtime';
-import server from '@grafana/test-utils/server';
-import { mockAlertRuleApi, setupMswServer } from 'app/features/alerting/unified/mockApi';
+import { setupMswServer } from 'app/features/alerting/unified/mockApi';
 import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types/accessControl';
 import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
@@ -23,7 +22,6 @@ import {
  mockPluginLinkExtension,
  mockPromAlertingRule,
  mockRulerGrafanaRecordingRule,
-  mockRulerGrafanaRule,
 } from '../../mocks';
 import { grafanaRulerRule } from '../../mocks/grafanaRulerApi';
 import { grantPermissionsHelper } from '../../test/test-utils';
@@ -132,8 +130,6 @@ const dataSources = {
 };

 describe('RuleViewer', () => {
-  const api = mockAlertRuleApi(server);
-
  beforeEach(() => {
    setupDataSources(...Object.values(dataSources));
  });
@@ -253,22 +249,19 @@ describe('RuleViewer', () => {

        expect(screen.getAllByRole('row')).toHaveLength(7);
        expect(screen.getAllByRole('row')[1]).toHaveTextContent(/6Provisioning2025-01-18 04:35:17/i);
-        expect(screen.getAllByRole('row')[1]).toHaveTextContent('Updated by provisioning service');
-        expect(screen.getAllByRole('row')[1]).toHaveTextContent('+4-3Latest');
+        expect(screen.getAllByRole('row')[1]).toHaveTextContent('+3-3Latest');

        expect(screen.getAllByRole('row')[2]).toHaveTextContent(/5Alerting2025-01-17 04:35:17/i);
-        expect(screen.getAllByRole('row')[2]).toHaveTextContent('+5-6');
+        expect(screen.getAllByRole('row')[2]).toHaveTextContent('+5-5');

        expect(screen.getAllByRole('row')[3]).toHaveTextContent(/4different user2025-01-16 04:35:17/i);
-        expect(screen.getAllByRole('row')[3]).toHaveTextContent('Changed alert title and thresholds');
-        expect(screen.getAllByRole('row')[3]).toHaveTextContent('+6-5');
+        expect(screen.getAllByRole('row')[3]).toHaveTextContent('+5-5');

        expect(screen.getAllByRole('row')[4]).toHaveTextContent(/3user12025-01-15 04:35:17/i);
-        expect(screen.getAllByRole('row')[4]).toHaveTextContent('+5-10');
+        expect(screen.getAllByRole('row')[4]).toHaveTextContent('+5-9');

        expect(screen.getAllByRole('row')[5]).toHaveTextContent(/2User ID foo2025-01-14 04:35:17/i);
-        expect(screen.getAllByRole('row')[5]).toHaveTextContent('Updated evaluation interval and routing');
-        expect(screen.getAllByRole('row')[5]).toHaveTextContent('+12-7');
+        expect(screen.getAllByRole('row')[5]).toHaveTextContent('+11-7');

        expect(screen.getAllByRole('row')[6]).toHaveTextContent(/1Unknown 2025-01-13 04:35:17/i);

@@ -282,10 +275,9 @@ describe('RuleViewer', () => {
        await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
        expect(await screen.findByRole('button', { name: /Compare versions/i })).toBeDisabled();

-        // Check for special updated_by values - use getAllByRole since some text appears in multiple columns
-        expect(screen.getAllByRole('cell', { name: /provisioning/i }).length).toBeGreaterThan(0);
-        expect(screen.getByRole('cell', { name: /^alerting$/i })).toBeInTheDocument();
-        expect(screen.getByRole('cell', { name: /^Unknown$/i })).toBeInTheDocument();
+        expect(screen.getByRole('cell', { name: /provisioning/i })).toBeInTheDocument();
+        expect(screen.getByRole('cell', { name: /alerting/i })).toBeInTheDocument();
+        expect(screen.getByRole('cell', { name: /Unknown/i })).toBeInTheDocument();
        expect(screen.getByRole('cell', { name: /user id foo/i })).toBeInTheDocument();
      });

@@ -329,47 +321,6 @@ describe('RuleViewer', () => {
        await renderRuleViewer(rule, ruleIdentifier);
        expect(screen.queryByText('Labels')).not.toBeInTheDocument();
      });
-
-      it('shows Notes column when versions have messages', async () => {
-        await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
-
-        expect(await screen.findByRole('columnheader', { name: /Notes/i })).toBeInTheDocument();
-        expect(screen.getAllByRole('row')).toHaveLength(7); // 1 header + 6 data rows
-        expect(screen.getByRole('cell', { name: /Updated by provisioning service/i })).toBeInTheDocument();
-        expect(screen.getByRole('cell', { name: /Changed alert title and thresholds/i })).toBeInTheDocument();
-        expect(screen.getByRole('cell', { name: /Updated evaluation interval and routing/i })).toBeInTheDocument();
-      });
-
-      it('does not show Notes column when no versions have messages', async () => {
-        const versionsWithoutMessages = [
-          mockRulerGrafanaRule(
-            {},
-            {
-              uid: grafanaRulerRule.grafana_alert.uid,
-              version: 2,
-              updated: '2025-01-14T09:35:17.000Z',
-              updated_by: { uid: 'foo', name: '' },
-            }
-          ),
-          mockRulerGrafanaRule(
-            {},
-            {
-              uid: grafanaRulerRule.grafana_alert.uid,
-              version: 1,
-              updated: '2025-01-13T09:35:17.000Z',
-              updated_by: null,
-            }
-          ),
-        ];
-        api.getAlertRuleVersionHistory(grafanaRulerRule.grafana_alert.uid, versionsWithoutMessages);
-
-        await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
-
-        await screen.findByRole('button', { name: /Compare versions/i });
-
-        expect(screen.getAllByRole('row')).toHaveLength(3); // 1 header + 2 data rows
-        expect(screen.queryByRole('columnheader', { name: /Notes/i })).not.toBeInTheDocument();
-      });
    });
  });

--- a/public/app/features/alerting/unified/components/rule-viewer/tabs/version-history/VersionHistoryTable.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/version-history/VersionHistoryTable.tsx
@@ -1,9 +1,8 @@
-import { css } from '@emotion/css';
 import { useMemo, useState } from 'react';

 import { dateTimeFormat, dateTimeFormatTimeAgo } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { Badge, Button, Checkbox, Column, InteractiveTable, Stack, Text, useStyles2 } from '@grafana/ui';
+import { Badge, Button, Checkbox, Column, InteractiveTable, Stack, Text } from '@grafana/ui';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
 import { computeVersionDiff } from 'app/features/alerting/unified/utils/diff';
 import { RuleIdentifier } from 'app/types/unified-alerting';
@@ -34,7 +33,6 @@ export function VersionHistoryTable({
  onRestoreError,
  canRestore,
 }: VersionHistoryTableProps) {
-  const styles = useStyles2(getStyles);
  const [showConfirmModal, setShowConfirmModal] = useState(false);
  const [ruleToRestore, setRuleToRestore] = useState<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>();
  const ruleToRestoreUid = ruleToRestore?.grafana_alert?.uid ?? '';
@@ -43,8 +41,6 @@ export function VersionHistoryTable({
    [ruleToRestoreUid]
  );

-  const hasAnyNotes = useMemo(() => ruleVersions.some((v) => v.grafana_alert.message), [ruleVersions]);
-
  const showConfirmation = (ruleToRestore: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
    setShowConfirmModal(true);
    setRuleToRestore(ruleToRestore);
@@ -56,15 +52,6 @@ export function VersionHistoryTable({

  const unknown = t('alerting.alertVersionHistory.unknown', 'Unknown');

-  const notesColumn: Column<RulerGrafanaRuleDTO<GrafanaRuleDefinition>> = {
-    id: 'notes',
-    header: t('core.versionHistory.table.notes', 'Notes'),
-    cell: ({ row }) => {
-      const message = row.original.grafana_alert.message;
-      return message || null;
-    },
-  };
-
  const columns: Array<Column<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>> = [
    {
      disableGrow: true,
@@ -104,12 +91,9 @@ export function VersionHistoryTable({
        if (!value) {
          return unknown;
        }
-        return (
-          <span className={styles.nowrap}>{dateTimeFormat(value) + ' (' + dateTimeFormatTimeAgo(value) + ')'}</span>
-        );
+        return dateTimeFormat(value) + ' (' + dateTimeFormatTimeAgo(value) + ')';
      },
    },
-    ...(hasAnyNotes ? [notesColumn] : []),
    {
      id: 'diff',
      disableGrow: true,
@@ -195,9 +179,3 @@ export function VersionHistoryTable({
    </>
  );
 }
-
-const getStyles = () => ({
-  nowrap: css({
-    whiteSpace: 'nowrap',
-  }),
-});
--- a/public/app/features/alerting/unified/mocks/server/handlers/grafanaRuler.ts
+++ b/public/app/features/alerting/unified/mocks/server/handlers/grafanaRuler.ts
@@ -154,7 +154,6 @@ export const rulerRuleVersionHistoryHandler = () => {
        uid: 'service',
        name: '',
      };
-      draft.grafana_alert.message = 'Updated by provisioning service';
    }),
    produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
      draft.grafana_alert.version = 5;
@@ -172,7 +171,6 @@ export const rulerRuleVersionHistoryHandler = () => {
        uid: 'different',
        name: 'different user',
      };
-      draft.grafana_alert.message = 'Changed alert title and thresholds';
    }),
    produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
      draft.grafana_alert.version = 3;
@@ -195,7 +193,6 @@ export const rulerRuleVersionHistoryHandler = () => {
        uid: 'foo',
        name: '',
      };
-      draft.grafana_alert.message = 'Updated evaluation interval and routing';
    }),
    produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
      draft.grafana_alert.version = 1;
--- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
+++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
@@ -284,7 +284,6 @@ function variableValueOptionsToVariableOptions(varState: MultiValueVariable['sta
    value: String(o.value),
    text: o.label,
    selected: Array.isArray(varState.value) ? varState.value.includes(o.value) : varState.value === o.value,
-    ...(o.properties && { properties: o.properties }),
  }));
 }

--- a/public/app/features/dashboard/services/SnapshotSrv.ts
+++ b/public/app/features/dashboard/services/SnapshotSrv.ts
@@ -1,8 +1,8 @@
-import { lastValueFrom, map } from 'rxjs';
+import { lastValueFrom } from 'rxjs';

-import { config, getBackendSrv, FetchResponse } from '@grafana/runtime';
+import { config, getBackendSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
-import { DashboardDTO, SnapshotSpec } from 'app/types/dashboard';
+import { DashboardDataDTO, DashboardDTO } from 'app/types/dashboard';

 import { getAPINamespace } from '../../../api/utils';

@@ -82,11 +82,12 @@ interface DashboardSnapshotList {
  items: K8sSnapshotResource[];
 }

-interface K8sDashboardSnapshot {
+// Response from the /dashboard subresource - returns a Dashboard with raw dashboard data in spec
+interface K8sDashboardSubresource {
  apiVersion: string;
-  kind: 'Snapshot';
+  kind: 'Dashboard';
  metadata: K8sMetadata;
-  spec: SnapshotSpec;
+  spec: DashboardDataDTO;
 }

 class K8sAPI implements DashboardSnapshotSrv {
@@ -128,32 +129,45 @@ class K8sAPI implements DashboardSnapshotSrv {
      const token = `??? TODO, get anon token for snapshots (${contextSrv.user?.name}) ???`;
      headers['Authorization'] = `Bearer ${token}`;
    }
-    return lastValueFrom(
-      getBackendSrv()
-        .fetch<K8sDashboardSnapshot>({
+
+    // Fetch both snapshot metadata and dashboard content in parallel
+    const [snapshotResponse, dashboardResponse] = await Promise.all([
+      lastValueFrom(
+        getBackendSrv().fetch<K8sSnapshotResource>({
          url: this.url + '/' + uid,
          method: 'GET',
          headers: headers,
        })
-        .pipe(
-          map((response: FetchResponse<K8sDashboardSnapshot>) => {
-            return {
-              dashboard: response.data.spec.dashboard,
-              meta: {
-                isSnapshot: true,
-                canSave: false,
-                canEdit: false,
-                canAdmin: false,
-                canStar: false,
-                canShare: false,
-                canDelete: false,
-                isFolder: false,
-                provisioned: false,
-              },
-            };
-          })
-        )
-    );
+      ),
+      lastValueFrom(
+        getBackendSrv().fetch<K8sDashboardSubresource>({
+          url: this.url + '/' + uid + '/dashboard',
+          method: 'GET',
+          headers: headers,
+        })
+      ),
+    ]);
+
+    const snapshot = snapshotResponse.data;
+    const dashboard = dashboardResponse.data;
+
+    return {
+      dashboard: dashboard.spec,
+      meta: {
+        isSnapshot: true,
+        canSave: false,
+        canEdit: false,
+        canAdmin: false,
+        canStar: false,
+        canShare: false,
+        canDelete: false,
+        isFolder: false,
+        provisioned: false,
+        created: snapshot.metadata.creationTimestamp,
+        expires: snapshot.spec.expires?.toString(),
+        k8s: snapshot.metadata,
+      },
+    };
  }
 }

--- a/public/app/features/explore/Logs/LogsTable.tsx
+++ b/public/app/features/explore/Logs/LogsTable.tsx
@@ -33,7 +33,7 @@ import {
  useStyles2,
 } from '@grafana/ui';
 import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/internal';
-import { DATAPLANE_ID_NAME, LogsFrame } from 'app/features/logs/logsFrame';
+import { LogsFrame } from 'app/features/logs/logsFrame';

 import { getFieldLinksForExplore } from '../utils/links';

@@ -154,9 +154,9 @@ export function LogsTable(props: Props) {
        },
      });
      // `getLinks` and `applyFieldOverrides` are taken from TableContainer.tsx
-      for (const [fieldIdx, field] of frameWithOverrides.fields.entries()) {
+      for (const [index, field] of frameWithOverrides.fields.entries()) {
        // Hide ID field from visualization (it's only needed for row matching)
-        if (logsFrame?.idField && (field.name === logsFrame.idField.name || field.name === DATAPLANE_ID_NAME)) {
+        if (logsFrame?.idField && (field.name === logsFrame.idField.name || field.name === 'id')) {
          field.config = {
            ...field.config,
            custom: {
@@ -180,7 +180,7 @@ export function LogsTable(props: Props) {
        };

        // For the first field (time), wrap the cell to include action buttons
-        const isFirstField = fieldIdx === 0;
+        const isFirstField = index === 0;

        field.config = {
          ...field.config,
@@ -202,6 +202,7 @@ export function LogsTable(props: Props) {
                        panelState={props.panelState}
                        absoluteRange={props.absoluteRange}
                        logRows={props.logRows}
+                        rowIndex={cellProps.rowIndex}
                      />
                      <span className={styles.firstColumnCell}>
                        {cellProps.field.display?.(cellProps.value).text ?? String(cellProps.value)}
--- a/public/app/features/explore/Logs/LogsTableActionButtons.tsx
+++ b/public/app/features/explore/Logs/LogsTableActionButtons.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { useCallback, useState, memo } from 'react';
+import { useCallback, useState } from 'react';

 import {
  AbsoluteTimeRange,
@@ -13,7 +13,7 @@ import { t } from '@grafana/i18n';
 import { ClipboardButton, CustomCellRendererProps, IconButton, Modal, useTheme2 } from '@grafana/ui';
 import { getLogsPermalinkRange } from 'app/core/utils/shortLinks';
 import { getUrlStateFromPaneState } from 'app/features/explore/hooks/useStateSync';
-import { LogsFrame, DATAPLANE_ID_NAME } from 'app/features/logs/logsFrame';
+import { LogsFrame } from 'app/features/logs/logsFrame';
 import { getState } from 'app/store/store';

 import { getExploreBaseUrl } from './utils/url';
@@ -28,21 +28,26 @@ interface Props extends CustomCellRendererProps {
  index?: number;
 }

-export const LogsTableActionButtons = memo((props: Props) => {
+export function LogsTableActionButtons(props: Props) {
  const { exploreId, absoluteRange, logRows, rowIndex, panelState, displayedFields, logsFrame, frame } = props;
+
  const theme = useTheme2();
  const [isInspecting, setIsInspecting] = useState(false);
  // Get logId from the table frame (frame), not the original logsFrame, because
  // the table frame is sorted/transformed and rowIndex refers to the table frame
-  const idFieldName = logsFrame?.idField?.name ?? DATAPLANE_ID_NAME;
-  const idField = frame.fields.find((field) => field.name === idFieldName || field.name === DATAPLANE_ID_NAME);
+  const idFieldName = logsFrame?.idField?.name ?? 'id';
+  const idField = frame.fields.find((field) => field.name === idFieldName || field.name === 'id');
  const logId = idField?.values[rowIndex];
-
  const getLineValue = () => {
-    const logRowById = logRows?.find((row) => row.rowId === logId);
-    return logRowById?.raw ?? '';
+    const bodyFieldName = logsFrame?.bodyField?.name;
+    const bodyField = bodyFieldName
+      ? frame.fields.find((field) => field.name === bodyFieldName)
+      : frame.fields.find((field) => field.type === 'string');
+    return bodyField?.values[rowIndex];
  };

+  const lineValue = getLineValue();
+
  const styles = getStyles(theme);

  // Generate link to the log line
@@ -100,29 +105,33 @@ export const LogsTableActionButtons = memo((props: Props) => {
  return (
    <>
      <div className={styles.iconWrapper}>
-        <IconButton
-          className={styles.icon}
-          tooltip={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
-          variant="secondary"
-          aria-label={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
-          tooltipPlacement="top"
-          size="md"
-          name="eye"
-          onClick={handleViewClick}
-          tabIndex={0}
-        />
-        <ClipboardButton
-          className={styles.icon}
-          icon="share-alt"
-          variant="secondary"
-          fill="text"
-          size="md"
-          tooltip={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
-          tooltipPlacement="top"
-          tabIndex={0}
-          aria-label={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
-          getText={getText}
-        />
+        <div className={styles.inspect}>
+          <IconButton
+            className={styles.inspectButton}
+            tooltip={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
+            variant="secondary"
+            aria-label={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
+            tooltipPlacement="top"
+            size="md"
+            name="eye"
+            onClick={handleViewClick}
+            tabIndex={0}
+          />
+        </div>
+        <div className={styles.inspect}>
+          <ClipboardButton
+            className={styles.clipboardButton}
+            icon="share-alt"
+            variant="secondary"
+            fill="text"
+            size="md"
+            tooltip={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
+            tooltipPlacement="top"
+            tabIndex={0}
+            aria-label={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
+            getText={getText}
+          />
+        </div>
      </div>
      {isInspecting && (
        <Modal
@@ -130,9 +139,9 @@ export const LogsTableActionButtons = memo((props: Props) => {
          isOpen={true}
          title={t('explore.logs-table.action-buttons.inspect-value', 'Inspect value')}
        >
-          <pre>{getLineValue()}</pre>
+          <pre>{lineValue}</pre>
          <Modal.ButtonRow>
-            <ClipboardButton icon="copy" getText={() => getLineValue()}>
+            <ClipboardButton icon="copy" getText={() => lineValue}>
              {t('explore.logs-table.action-buttons.copy-to-clipboard', 'Copy to Clipboard')}
            </ClipboardButton>
          </Modal.ButtonRow>
@@ -140,11 +149,15 @@ export const LogsTableActionButtons = memo((props: Props) => {
      )}
    </>
  );
-});
+}

-LogsTableActionButtons.displayName = 'LogsTableActionButtons';
-
-const getStyles = (theme: GrafanaTheme2) => ({
+export const getStyles = (theme: GrafanaTheme2) => ({
+  clipboardButton: css({
+    height: '100%',
+    lineHeight: '1',
+    padding: 0,
+    width: '20px',
+  }),
  iconWrapper: css({
    background: theme.colors.background.secondary,
    boxShadow: theme.shadows.z2,
@@ -153,50 +166,25 @@ const getStyles = (theme: GrafanaTheme2) => ({
    height: '35px',
    left: 0,
    top: 0,
-    padding: 0,
+    padding: `0 ${theme.spacing(0.5)}`,
    position: 'absolute',
    zIndex: 1,
-    alignItems: 'center',
-    // Fix switching icon direction when cell is numeric (rtl)
-    direction: 'ltr',
  }),
-  icon: css({
-    gap: 0,
-    margin: 0,
-    padding: 0,
-    borderRadius: theme.shape.radius.default,
-    width: '28px',
-    height: '32px',
-    display: 'inline-flex',
-    justifyContent: 'center',
-
-    '&:before': {
-      content: '""',
-      position: 'absolute',
-      width: 24,
-      height: 24,
-      top: 0,
-      bottom: 0,
-      left: 0,
-      right: 0,
-      margin: 'auto',
-      borderRadius: theme.shape.radius.default,
-      backgroundColor: theme.colors.background.primary,
-      zIndex: -1,
-      opacity: 0,
-      [theme.transitions.handleMotion('no-preference', 'reduce')]: {
-        transitionDuration: '0.2s',
-        transitionTimingFunction: 'cubic-bezier(0.4, 0, 0.2, 1)',
-        transitionProperty: 'opacity',
-      },
+  inspect: css({
+    '& button svg': {
+      marginRight: 'auto',
    },
    '&:hover': {
      color: theme.colors.text.link,
      cursor: 'pointer',
-      background: 'none',
-      '&:before': {
-        opacity: 1,
-      },
    },
+    padding: '5px 3px',
+  }),
+  inspectButton: css({
+    borderRadius: theme.shape.radius.default,
+    display: 'inline-flex',
+    margin: 0,
+    overflow: 'hidden',
+    verticalAlign: 'middle',
  }),
 });
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx
@@ -132,7 +132,6 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
              type: profilesDataSourceSettings.type,
              uid: profilesDataSourceSettings.uid,
            },
-            includeExemplars: false,
          },
        ],
      };
--- a/public/app/features/logs/logsFrame.ts
+++ b/public/app/features/logs/logsFrame.ts
@@ -32,7 +32,7 @@ function getField(cache: FieldCache, name: string, fieldType: FieldType): FieldW
 const DATAPLANE_TIMESTAMP_NAME = 'timestamp';
 const DATAPLANE_BODY_NAME = 'body';
 const DATAPLANE_SEVERITY_NAME = 'severity';
-export const DATAPLANE_ID_NAME = 'id';
+const DATAPLANE_ID_NAME = 'id';
 const DATAPLANE_LABELS_NAME = 'labels';

 // NOTE: this is a hot fn, we need to avoid allocating new objects here
--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -80,18 +80,18 @@ const buildLabelPath = (label: string) => {
  return label.includes('.') || label.trim().includes(' ') ? `["${label}"]` : `.${label}`;
 };

-const isRecord = (value: unknown): value is Record<string, unknown> => {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-};
-
 const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
-  function collectFieldPaths(option: Record<string, unknown>, currentPath: string): string[] {
+  if (!('valuesFormat' in variable) || variable.valuesFormat !== 'json') {
+    return [];
+  }
+
+  function collectFieldPaths(option: Record<string, string>, currentPath: string) {
    let paths: string[] = [];
    for (const field in option) {
      if (option.hasOwnProperty(field)) {
        const newPath = `${currentPath}.${field}`;
        const value = option[field];
-        if (isRecord(value)) {
+        if (typeof value === 'object' && value !== null) {
          paths = [...paths, ...collectFieldPaths(value, newPath)];
        }
        paths.push(newPath);
@@ -100,23 +100,11 @@ const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
    return paths;
  }

-  if ('valuesFormat' in variable && variable.valuesFormat === 'json') {
-    try {
-      return collectFieldPaths(JSON.parse(variable.query)[0], variable.name);
-    } catch {
-      return [];
-    }
+  try {
+    return collectFieldPaths(JSON.parse(variable.query)[0], variable.name);
+  } catch {
+    return [];
  }
-
-  if ('options' in variable && Array.isArray(variable.options) && variable.options.length > 0) {
-    for (const opt of variable.options) {
-      if ('properties' in opt && isRecord(opt.properties) && Object.keys(opt.properties).length > 0) {
-        return collectFieldPaths(opt.properties, variable.name);
-      }
-    }
-  }
-
-  return [];
 };

 export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/datasource.ts
@@ -11,7 +11,6 @@ import {
  SQLQuery,
  SQLSelectableValue,
  SqlDatasource,
-  SQLVariableSupport,
  formatSQL,
 } from '@grafana/sql';

@@ -26,7 +25,6 @@ export class PostgresDatasource extends SqlDatasource {

  constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
    super(instanceSettings);
-    this.variables = new SQLVariableSupport(this);
  }

  getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): PostgresQueryModel {
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx
@@ -33,7 +33,6 @@ describe('QueryEditor', () => {
          refId: 'A',
          maxNodes: 1000,
          groupBy: [],
-          includeExemplars: false,
        },
      },
    });
@@ -126,7 +125,6 @@ function setup(options: { props: Partial<Props> } = { props: {} }) {
        maxNodes: 1000,
        groupBy: [],
        limit: 42,
-        includeExemplars: false,
      }}
      datasource={setupDs()}
      onChange={onChange}
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx
@@ -2,7 +2,6 @@ import { css } from '@emotion/css';
 import * as React from 'react';

 import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { useStyles2, RadioButtonGroup, MultiSelect, Input, InlineSwitch } from '@grafana/ui';

 import { Query } from '../types';
@@ -57,9 +56,6 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
  if (query.maxNodes) {
    collapsedInfo.push(`Max nodes: ${query.maxNodes}`);
  }
-  if (query.includeExemplars) {
-    collapsedInfo.push(`With exemplars`);
-  }

  return (
    <Stack gap={0} direction="column">
@@ -146,16 +142,6 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
              }}
            />
          </EditorField>
-          {config.featureToggles.profilesExemplars && (
-            <EditorField label={'Exemplars'} tooltip={<>Include profile exemplars in the time series.</>}>
-              <InlineSwitch
-                value={query.includeExemplars || false}
-                onChange={(event: React.SyntheticEvent<HTMLInputElement>) => {
-                  onQueryChange({ ...query, includeExemplars: event.currentTarget.checked });
-                }}
-              />
-            </EditorField>
-          )}
        </div>
      </QueryOptionGroup>
    </Stack>
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue
@@ -42,10 +42,8 @@ composableKinds: DataQuery: {
 				// Sets the maximum number of nodes in the flamegraph.
 				maxNodes?:           int64
 				#PyroscopeQueryType: "metrics" | "profile" | *"both" @cuetsy(kind="type")
-				// If set to true, the response will contain annotations
-				annotations?: bool
-				// If set to true, exemplars will be requested
-				includeExemplars: bool | *false
+        // If set to true, the response will contain annotations
+        annotations?: bool
 			}
 		}]
 		lenses: []
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts
@@ -23,10 +23,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
   * Allows to group the results.
   */
  groupBy: Array<string>;
-  /**
-   * If set to true, exemplars will be requested
-   */
-  includeExemplars: boolean;
  /**
   * Specifies the query label selectors.
   */
@@ -51,7 +47,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {

 export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
  groupBy: [],
-  includeExemplars: false,
  labelSelector: '{}',
  spanSelector: [],
 };
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts
@@ -43,7 +43,6 @@ describe('Pyroscope data source', () => {
          queryType: 'both',
          profileTypeId: '',
          groupBy: [''],
-          includeExemplars: false,
        },
      ]);
      expect(queries).toMatchObject([
@@ -119,7 +118,6 @@ describe('normalizeQuery', () => {
      queryType: 'metrics',
      profileTypeId: 'cpu',
      refId: '',
-      includeExemplars: false,
    });
    expect(normalized).toMatchObject({
      labelSelector: '{app="myapp"}',
@@ -147,7 +145,6 @@ const defaultQuery = (query: Partial<Query>): Query => {
    labelSelector: '',
    profileTypeId: '',
    queryType: defaultPyroscopeQueryType,
-    includeExemplars: false,
    ...query,
  };
 };
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts
@@ -129,7 +129,6 @@ export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeD
      queryType: 'both',
      profileTypeId: '',
      groupBy: [],
-      includeExemplars: false,
    };
  }

--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -762,19 +762,6 @@ describe('Tempo service graph view', () => {
    ]);
  });

-  it('should escape span with multi line content correctly', () => {
-    const spanContent = [
-      `
-      SELECT * from "my_table"
-      WHERE "data_enabled" = 1
-      ORDER BY "name" ASC`,
-    ];
-    let escaped = getEscapedRegexValues(getEscapedValues(spanContent));
-    expect(escaped).toEqual([
-      '\\n      SELECT \\\\* from \\"my_table\\"\\n      WHERE \\"data_enabled\\" = 1\\n      ORDER BY \\"name\\" ASC',
-    ]);
-  });
-
  it('should get field config correctly', () => {
    let datasourceUid = 's4Jvz8Qnk';
    let tempoDatasourceUid = 'EbPO1fYnz';
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -1168,7 +1168,7 @@ export function getEscapedRegexValues(values: string[]) {
 }

 export function getEscapedValues(values: string[]) {
-  return values.map((value: string) => value.replace(/["\\]/g, '\\$&').replace(/[\n]/g, '\\n'));
+  return values.map((value: string) => value.replace(/["\\]/g, '\\$&'));
 }

 export function getFieldConfig(
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -293,7 +293,6 @@ export interface GrafanaRuleDefinition extends PostableGrafanaRuleDefinition {
  updated?: string;
  updated_by?: UpdatedBy | null;
  version?: number;
-  message?: string;
 }

 // types for Grafana-managed recording and alerting rules
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -4416,7 +4416,6 @@
      },
      "no-properties-changed": "No relevant properties changed",
      "table": {
-        "notes": "Notes",
        "updated": "Date",
        "updatedBy": "Updated By",
        "version": "Version"
Author	SHA1	Message	Date
Ezequiel Victorero	3d4325c9dd	Merge branch 'evictorero/snapshtos-mt-cleanup-expired' into evictorero/snapshots-dual-write-support	2026-01-09 08:09:21 -03:00
Ezequiel Victorero	ba79a2bbd6	fix lint	2026-01-09 08:06:55 -03:00
Ezequiel Victorero	3175275c25	Merge branch 'main' into evictorero/snapshtos-mt-cleanup-expired	2026-01-09 08:04:48 -03:00
Ezequiel Victorero	30c87fef95	Snapshots: Add support for dual write	2026-01-08 17:47:54 -03:00
Ezequiel Victorero	86d8b3ada8	Merge branch 'main' into evictorero/snapshots-dual-write-support	2026-01-07 15:28:18 -03:00
Ezequiel Victorero	4a3cf7abaf	Merge branch 'main' into evictorero/snapshtos-mt-cleanup-expired	2026-01-06 11:12:19 -03:00
Ezequiel Victorero	1cbbce160d	add test	2026-01-06 11:11:39 -03:00
Ezequiel Victorero	47fbff6136	fix error and update comments	2026-01-05 17:18:48 -03:00
Ezequiel Victorero	d98dd3e952	Snapshots: Cleanup using k8s api	2025-12-19 17:21:22 -03:00