deps(go): bump gocloud.dev from 0.43.0 to 0.44.0

Bumps [gocloud.dev](https://github.com/google/go-cloud) from 0.43.0 to 0.44.0. - [Release notes](https://github.com/google/go-cloud/releases) - [Commits](https://github.com/google/go-cloud/compare/v0.43.0...v0.44.0) --- updated-dependencies: - dependency-name: gocloud.dev dependency-version: 0.44.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2026-01-07 12:27:52 +00:00
36 changed files with 140 additions and 452 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/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
@@ -6,7 +6,7 @@ require (
 	buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling
 	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
+	cloud.google.com/go/storage v1.56.0 // @grafana/grafana-backend-group
 	connectrpc.com/connect v1.19.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
@@ -202,7 +202,7 @@ require (
 	go.uber.org/mock v0.6.0 // @grafana/grafana-operator-experience-squad
 	go.uber.org/zap v1.27.1 // @grafana/identity-access-team
 	go.yaml.in/yaml/v3 v3.0.4 // @grafana/alerting-backend
-	gocloud.dev v0.43.0 // @grafana/grafana-app-platform-squad
+	gocloud.dev v0.44.0 // @grafana/grafana-app-platform-squad
 	gocloud.dev/secrets/hashivault v0.43.0 // @grafana/grafana-operator-experience-squad
 	golang.org/x/crypto v0.46.0 // @grafana/grafana-backend-group
 	golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // @grafana/alerting-backend
@@ -214,7 +214,7 @@ require (
 	golang.org/x/time v0.14.0 // @grafana/grafana-backend-group
 	golang.org/x/tools v0.40.0 // indirect; @grafana/grafana-as-code
 	gonum.org/v1/gonum v0.16.0 // @grafana/oss-big-tent
-	google.golang.org/api v0.242.0 // @grafana/grafana-backend-group
+	google.golang.org/api v0.247.0 // @grafana/grafana-backend-group
 	google.golang.org/grpc v1.77.0 // @grafana/plugins-platform-backend
 	google.golang.org/protobuf v1.36.11 // @grafana/plugins-platform-backend
 	gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-backend
@@ -300,8 +300,8 @@ replace (

 require (
 	cel.dev/expr v0.25.1 // indirect
-	cloud.google.com/go v0.121.4 // indirect
-	cloud.google.com/go/auth v0.16.3 // indirect
+	cloud.google.com/go v0.121.6 // indirect
+	cloud.google.com/go/auth v0.16.4 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	cloud.google.com/go/iam v1.5.2 // indirect
@@ -341,21 +341,21 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/at-wat/mqtt-go v0.19.6 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.31.17 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.3 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.13 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.13 // indirect
 	github.com/aws/aws-sdk-go-v2/service/kms v1.41.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.89.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -46,8 +46,8 @@ cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFO
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
 cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw=
-cloud.google.com/go v0.121.4 h1:cVvUiY0sX0xwyxPwdSU2KsF9knOVmtRyAMt8xou0iTs=
-cloud.google.com/go v0.121.4/go.mod h1:XEBchUiHFJbz4lKBZwYBDHV/rSyfFktk737TLDU089s=
+cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=
+cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -109,8 +109,8 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo
 cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
 cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
 cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc=
-cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA=
+cloud.google.com/go/auth v0.16.4 h1:fXOAIQmkApVvcIn7Pc2+5J8QTMVbUGLscnSVNl11su8=
+cloud.google.com/go/auth v0.16.4/go.mod h1:j10ncYwjX/g3cdX7GpEzsdM+d+ZNsXAbb6qXA7p1Y5M=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
@@ -558,8 +558,8 @@ cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeL
 cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
 cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
-cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2znf0=
-cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
+cloud.google.com/go/storage v1.56.0 h1:iixmq2Fse2tqxMbWhLWC9HfBj1qdxqAmiK8/eqtsLxI=
+cloud.google.com/go/storage v1.56.0/go.mod h1:Tpuj6t4NweCLzlNbw9Z9iwxEkrSem20AetIeH/shgVU=
 cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
 cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
 cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
@@ -852,24 +852,24 @@ github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE
 github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
 github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 h1:12SpdwU8Djs+YGklkinSSlcrPyj3H4VifVsKf78KbwA=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11/go.mod h1:dd+Lkp6YmMryke+qxW/VnKyhMBDTYP41Q2Bb+6gNZgY=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3/go.mod h1:xdCzcZEtnSTKVDOmUZs4l/j3pSV6rpo1WXl5ugNsL8Y=
 github.com/aws/aws-sdk-go-v2/config v1.31.17 h1:QFl8lL6RgakNK86vusim14P2k8BFSxjvUkcWLDjgz9Y=
 github.com/aws/aws-sdk-go-v2/config v1.31.17/go.mod h1:V8P7ILjp/Uef/aX8TjGk6OHZN6IKPM5YW6S78QnRD5c=
 github.com/aws/aws-sdk-go-v2/credentials v1.18.21 h1:56HGpsgnmD+2/KpG0ikvvR8+3v3COCwaF4r+oWwOeNA=
 github.com/aws/aws-sdk-go-v2/credentials v1.18.21/go.mod h1:3YELwedmQbw7cXNaII2Wywd+YY58AmLPwX4LzARgmmA=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13/go.mod h1:Peg/GBAQ6JDt+RoBf4meB1wylmAipb7Kg2ZFakZTlwk=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 h1:cTXRdLkpBanlDwISl+5chq5ui1d1YWg4PWMR9c3kXyw=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84/go.mod h1:kwSy5X7tfIHN39uucmjQVs2LvDdXEjQucgQQEqCggEo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.3 h1:4GNV1lhyELGjMz5ILMRxDvxvOaeo3Ux9Z69S1EgVMMQ=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.3/go.mod h1:br7KA6edAAqDGUYJ+zVVPAyMrPhnN+zdt17yTUT6FPw=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 h1:GMYy2EOWfzdP3wfVAGXBNKY5vK4K8vMET4sYOYltmqs=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36/go.mod h1:gDhdAV6wL3PmPqBhiPbnlS447GoWs8HTTOYef9/9Inw=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.13 h1:eg/WYAa12vqTphzIdWMzqYRVKKnCboVPRlvaybNCqPA=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.13/go.mod h1:/FDdxWhz1486obGrKKC1HONd7krpk38LBt+dutLcN9k=
 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3 h1:Nn3qce+OHZuMj/edx4its32uxedAmquCDxtZkrdeiD4=
 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3/go.mod h1:aqsLGsPs+rJfwDBwWHLcIV8F7AFcikFTPLwUD4RwORQ=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0 h1:e5cbPZYTIY2nUEFieZUfVdINOiCTvChOMPfdLnmiLzs=
@@ -878,20 +878,20 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2 h1:IfMb3Ar8xEaWjgH/zeVHYD8izwJ
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2/go.mod h1:35jGWx7ECvCwTsApqicFYzZ7JFEnBc6oHUuOQ3xIS54=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 h1:nAP2GYbfh8dd2zGZqFRSMlq+/F6cMPBUuCsGAMkN074=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4/go.mod h1:LT10DsiGjLWh4GbjInf9LQejkYEhBgBCjLG5+lvk4EE=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.4 h1:NvMjwvv8hpGUILarKw7Z4Q0w1H9anXKsesMxtw++MA4=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.4/go.mod h1:455WPHSwaGj2waRSpQp7TsnpOnBfw8iDfPfbwl7KPJE=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 h1:kDqdFvMY4AtKoACfzIGD8A0+hbT41KTKF//gq7jITfM=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13/go.mod h1:lmKuogqSU3HzQCwZ9ZtcqOc5XGMqtDK7OIc2+DxiUEg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 h1:qcLWgdhq45sDM9na4cvXax9dyLitn8EYBRl8Ak4XtG4=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17/go.mod h1:M+jkjBFZ2J6DJrjMv2+vkBbuht6kxJYtJiwoVgX4p4U=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.13 h1:zhBJXdhWIFZ1acfDYIhu4+LCzdUS2Vbcum7D01dXlHQ=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.13/go.mod h1:JaaOeCE368qn2Hzi3sEzY6FgAZVCIYcC2nwbro2QCh8=
 github.com/aws/aws-sdk-go-v2/service/kms v1.41.2 h1:zJeUxFP7+XP52u23vrp4zMcVhShTWbNO8dHV6xCSvFo=
 github.com/aws/aws-sdk-go-v2/service/kms v1.41.2/go.mod h1:Pqd9k4TuespkireN206cK2QBsaBTL6X+VPAez5Qcijk=
 github.com/aws/aws-sdk-go-v2/service/oam v1.18.3 h1:teOWtElLARLOhpYWwupjLbY9j5I/yZ/H1I8jg41An78=
 github.com/aws/aws-sdk-go-v2/service/oam v1.18.3/go.mod h1:wGhpdyftHX6/1U4egowHkYdypwBMjpb+KjAAprv6z20=
 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6 h1:PwbxovpcJvb25k019bkibvJfCpCmIANOFrXZIFPmRzk=
 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6/go.mod h1:Z4xLt5mXspLKjBV92i165wAJ/3T6TIv4n7RtIS8pWV0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 h1:0reDqfEN+tB+sozj2r92Bep8MEwBZgtAXTND1Kk9OXg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0/go.mod h1:kUklwasNoCn5YpyAqC/97r6dzTA1SRKJfKq16SXeoDU=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.2 h1:xgBWsgaeUESl8A8k80p6yBdexMWDVeiDmJ/pkjohJ7c=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.2/go.mod h1:+wArOOrcHUevqdto9k1tKOF5++YTe9JEcPSc9Tx2ZSw=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 h1:w6a0H79HrHf3lr+zrw+pSzR5B+caiQFAKiNHlrUcnoc=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1/go.mod h1:c6Vg0BRiU7v0MVhHupw90RyL120QBwAMLbDCzptGeMk=
 github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 h1:0JPwLz1J+5lEOfy/g0SURC9cxhbQ1lIMHMa+AHZSzz0=
@@ -2757,8 +2757,8 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc=
-gocloud.dev v0.43.0 h1:aW3eq4RMyehbJ54PMsh4hsp7iX8cO/98ZRzJJOzN/5M=
-gocloud.dev v0.43.0/go.mod h1:eD8rkg7LhKUHrzkEdLTZ+Ty/vgPHPCd+yMQdfelQVu4=
+gocloud.dev v0.44.0 h1:iVyMAqFl2r6xUy7M4mfqwlN+21UpJoEtgHEcfiLMUXs=
+gocloud.dev v0.44.0/go.mod h1:ZmjROXGdC/eKZLF1N+RujDlFRx3D+4Av2thREKDMVxY=
 gocloud.dev/secrets/hashivault v0.43.0 h1:A966rEMpCRUE9209/+k+A2HP2v2qDnrxGpQn+nIH5uY=
 gocloud.dev/secrets/hashivault v0.43.0/go.mod h1:KdWKL+TXDi0cXgEd/MTeaidKlotvyJtnTDi71B3rR9U=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -3377,8 +3377,8 @@ google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjY
 google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms=
 google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4=
 google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
-google.golang.org/api v0.242.0 h1:7Lnb1nfnpvbkCiZek6IXKdJ0MFuAZNAJKQfA1ws62xg=
-google.golang.org/api v0.242.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
+google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=
+google.golang.org/api v0.247.0/go.mod h1:r1qZOPmxXffXg6xS5uhx16Fa/UFY8QU/K4bfKrnvovM=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
--- 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;
--- 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/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",
--- 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
--- 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",
--- 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/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/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/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"