fix field selectors, implement update

.github/CODEOWNERS

@@ -501,6 +501,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/filter-annotations.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
+/e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/grafana-datasource-random-walk.spec.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
@@ -519,7 +520,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
 /e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/visualization-suggestions*.spec.ts @grafana/dataviz-squad
+/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform
 
 # Packages

apps/advisor/go.mod

@@ -157,7 +157,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect

apps/advisor/go.sum

@@ -619,8 +619,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=

apps/alerting/historian/go.mod

@@ -4,7 +4,7 @@ go 1.25.5
 
 require (
 	github.com/go-kit/log v0.2.1
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f
+	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4
 	github.com/grafana/grafana-app-sdk v0.48.7
 	github.com/grafana/grafana-app-sdk/logging v0.48.7

apps/alerting/historian/go.sum

@@ -243,8 +243,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 h1:jSojuc7njleS3UOz223WDlXOinmuLAIPI0z2vtq8EgI=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4/go.mod h1:VahT+GtfQIM+o8ht2StR6J9g+Ef+C2Vokh5uuSmOD/4=
 github.com/grafana/grafana-app-sdk v0.48.7 h1:9mF7nqkqP0QUYYDlznoOt+GIyjzj45wGfUHB32u2ZMo=

apps/alerting/historian/pkg/app/notification/lokireader.go

@@ -31,10 +31,6 @@ const (
 	maxLimit           = 1000
 	Namespace          = "grafana"
 	Subsystem          = "alerting"
-
-	// LogQL field path for alert rule UID after JSON parsing.
-	// Loki flattens nested JSON fields with underscores: alert.labels.__alert_rule_uid__ -> alert_labels___alert_rule_uid__
-	lokiAlertRuleUIDField = "alert_labels___alert_rule_uid__"
 )
 
 var (
@@ -115,13 +111,13 @@ func buildQuery(query Query) (string, error) {
 		fmt.Sprintf(`%s=%q`, historian.LabelFrom, historian.LabelFromValue),
 	}
 
-	logql := fmt.Sprintf(`{%s} | json`, strings.Join(selectors, `,`))
-
-	// Add ruleUID filter as JSON line filter if specified.
-	if query.RuleUID != nil && *query.RuleUID != "" {
-		logql += fmt.Sprintf(` | %s = %q`, lokiAlertRuleUIDField, *query.RuleUID)
+	if query.RuleUID != nil {
+		selectors = append(selectors,
+			fmt.Sprintf(`%s=%q`, historian.LabelRuleUID, *query.RuleUID))
 	}
 
+	logql := fmt.Sprintf(`{%s} | json`, strings.Join(selectors, `,`))
+
 	// Add receiver filter if specified.
 	if query.Receiver != nil && *query.Receiver != "" {
 		logql += fmt.Sprintf(` | receiver = %q`, *query.Receiver)
@@ -215,13 +211,16 @@ func parseLokiEntry(s lokiclient.Sample) (Entry, error) {
 		groupLabels = make(map[string]string)
 	}
 
-	alerts := []EntryAlert{{
-		Status:      lokiEntry.Alert.Status,
-		Labels:      lokiEntry.Alert.Labels,
-		Annotations: lokiEntry.Alert.Annotations,
-		StartsAt:    lokiEntry.Alert.StartsAt,
-		EndsAt:      lokiEntry.Alert.EndsAt,
-	}}
+	alerts := make([]EntryAlert, len(lokiEntry.Alerts))
+	for i, a := range lokiEntry.Alerts {
+		alerts[i] = EntryAlert{
+			Status:      a.Status,
+			Labels:      a.Labels,
+			Annotations: a.Annotations,
+			StartsAt:    a.StartsAt,
+			EndsAt:      a.EndsAt,
+		}
+	}
 
 	return Entry{
 		Timestamp:    s.T,

apps/alerting/historian/pkg/app/notification/lokireader_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/alerting/models"
 	"github.com/grafana/alerting/notify/historian"
 	"github.com/grafana/alerting/notify/historian/lokiclient"
 	"github.com/grafana/grafana-app-sdk/logging"
@@ -134,8 +133,9 @@ func TestBuildQuery(t *testing.T) {
 			query: Query{
 				RuleUID: stringPtr("test-rule-uid"),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid"`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with receiver filter",
@@ -143,8 +143,9 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID:  stringPtr("test-rule-uid"),
 				Receiver: stringPtr("email-receiver"),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | receiver = "email-receiver"`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | receiver = "email-receiver"`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with status filter",
@@ -152,8 +153,9 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Status:  createStatusPtr(v0alpha1.CreateNotificationqueryRequestNotificationStatusFiring),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | status = "firing"`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | status = "firing"`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with success outcome filter",
@@ -161,8 +163,9 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Outcome: outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeSuccess),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | error = ""`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | error = ""`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with error outcome filter",
@@ -170,8 +173,9 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Outcome: outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeError),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | error != ""`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | error != ""`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with many filters",
@@ -181,8 +185,9 @@ func TestBuildQuery(t *testing.T) {
 				Status:   createStatusPtr(v0alpha1.CreateNotificationqueryRequestNotificationStatusResolved),
 				Outcome:  outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeSuccess),
 			},
-			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | receiver = "email-receiver" | status = "resolved" | error = ""`,
-				historian.LabelFrom, historian.LabelFromValue),
+			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | receiver = "email-receiver" | status = "resolved" | error = ""`,
+				historian.LabelFrom, historian.LabelFromValue,
+				historian.LabelRuleUID, "test-rule-uid"),
 		},
 		{
 			name: "query with group label matcher",
@@ -272,19 +277,19 @@ func TestParseLokiEntry(t *testing.T) {
 					GroupLabels: map[string]string{
 						"alertname": "test-alert",
 					},
-					Alert: historian.NotificationHistoryLokiEntryAlert{
-						Status: "firing",
-						Labels: map[string]string{
-							"severity": "critical",
+					Alerts: []historian.NotificationHistoryLokiEntryAlert{
+						{
+							Status: "firing",
+							Labels: map[string]string{
+								"severity": "critical",
+							},
+							Annotations: map[string]string{
+								"summary": "Test alert",
+							},
+							StartsAt: now,
+							EndsAt:   now.Add(1 * time.Hour),
 						},
-						Annotations: map[string]string{
-							"summary": "Test alert",
-						},
-						StartsAt: now,
-						EndsAt:   now.Add(1 * time.Hour),
 					},
-					AlertIndex:   0,
-					AlertCount:   1,
 					Retry:        false,
 					Duration:     100,
 					PipelineTime: now,
@@ -330,9 +335,7 @@ func TestParseLokiEntry(t *testing.T) {
 					Error:         "notification failed",
 					GroupKey:      "key:thing",
 					GroupLabels:   map[string]string{},
-					Alert:         historian.NotificationHistoryLokiEntryAlert{},
-					AlertIndex:    0,
-					AlertCount:    1,
+					Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
 					PipelineTime:  now,
 				}),
 			},
@@ -344,7 +347,7 @@ func TestParseLokiEntry(t *testing.T) {
 				Outcome:      OutcomeError,
 				GroupKey:     "key:thing",
 				GroupLabels:  map[string]string{},
-				Alerts:       []EntryAlert{{}},
+				Alerts:       []EntryAlert{},
 				Error:        stringPtr("notification failed"),
 				PipelineTime: now,
 			},
@@ -362,7 +365,7 @@ func TestParseLokiEntry(t *testing.T) {
 				Status:       Status("firing"),
 				Outcome:      OutcomeSuccess,
 				GroupLabels:  map[string]string{},
-				Alerts:       []EntryAlert{{}},
+				Alerts:       []EntryAlert{},
 				PipelineTime: now,
 			},
 		},
@@ -445,9 +448,7 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-1",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alert:         historian.NotificationHistoryLokiEntryAlert{},
-								AlertIndex:    0,
-								AlertCount:    1,
+								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
 								PipelineTime:  now,
 							}),
 						},
@@ -458,9 +459,7 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-3",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alert:         historian.NotificationHistoryLokiEntryAlert{},
-								AlertIndex:    0,
-								AlertCount:    1,
+								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
 								PipelineTime:  now,
 							}),
 						},
@@ -475,9 +474,7 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-2",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alert:         historian.NotificationHistoryLokiEntryAlert{},
-								AlertIndex:    0,
-								AlertCount:    1,
+								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
 								PipelineTime:  now,
 							}),
 						},
@@ -549,19 +546,19 @@ func createMockLokiResponse(timestamp time.Time) lokiclient.QueryRes {
 								GroupLabels: map[string]string{
 									"alertname": "test-alert",
 								},
-								Alert: historian.NotificationHistoryLokiEntryAlert{
-									Status: "firing",
-									Labels: map[string]string{
-										"severity": "critical",
+								Alerts: []historian.NotificationHistoryLokiEntryAlert{
+									{
+										Status: "firing",
+										Labels: map[string]string{
+											"severity": "critical",
+										},
+										Annotations: map[string]string{
+											"summary": "Test alert",
+										},
+										StartsAt: timestamp,
+										EndsAt:   timestamp.Add(1 * time.Hour),
 									},
-									Annotations: map[string]string{
-										"summary": "Test alert",
-									},
-									StartsAt: timestamp,
-									EndsAt:   timestamp.Add(1 * time.Hour),
 								},
-								AlertIndex:   0,
-								AlertCount:   1,
 								Retry:        false,
 								Duration:     100,
 								PipelineTime: timestamp,
@@ -590,19 +587,10 @@ func createLokiEntryJSONWithNilLabels(t *testing.T, timestamp time.Time) string
 		"status": "firing",
 		"error": "",
 		"groupLabels": null,
-		"alert": {},
-		"alertIndex": 0,
-		"alertCount": 1,
+		"alerts": [],
 		"retry": false,
 		"duration": 0,
 		"pipelineTime": "%s"
 	}`, timestamp.Format(time.RFC3339Nano))
 	return jsonStr
 }
-
-func TestRuleUIDLabelConstant(t *testing.T) {
-	// Verify that models.RuleUIDLabel has the expected value.
-	// If this changes in the alerting module, our LogQL field path constant will be incorrect
-	// and filtering for a single alert rule by its UID will break.
-	assert.Equal(t, "__alert_rule_uid__", models.RuleUIDLabel)
-}

apps/annotation/go.mod

@@ -6,6 +6,8 @@ require (
 	github.com/grafana/grafana-app-sdk v0.48.7
 	github.com/grafana/grafana-app-sdk/logging v0.48.7
 	k8s.io/apimachinery v0.34.3
+	k8s.io/apiserver v0.34.2
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 	k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e
 )
 

apps/annotation/go.sum

@@ -248,6 +248,8 @@ k8s.io/apimachinery v0.34.3 h1:/TB+SFEiQvN9HPldtlWOTp0hWbJ+fjU+wkxysf/aQnE=
 k8s.io/apimachinery v0.34.3/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
 k8s.io/client-go v0.34.3 h1:wtYtpzy/OPNYf7WyNBTj3iUA0XaBHVqhv4Iv3tbrF5A=
 k8s.io/client-go v0.34.3/go.mod h1:OxxeYagaP9Kdf78UrKLa3YZixMCfP6bgPwPwNBQBzpM=
+k8s.io/apiserver v0.34.2 h1:2/yu8suwkmES7IzwlehAovo8dDE07cFRC7KMDb1+MAE=
+k8s.io/apiserver v0.34.2/go.mod h1:gqJQy2yDOB50R3JUReHSFr+cwJnL8G1dzTA0YLEqAPI=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e h1:iW9ChlU0cU16w8MpVYjXk12dqQ4BPFBEgif+ap7/hqQ=

apps/annotation/kinds/annotation.cue

@@ -1,17 +1,22 @@
 package kinds
 
 annotationv0alpha1: {
-	kind:       "Annotation"
+  kind:       "Annotation"
   pluralName: "Annotations"
-	schema: {
-		spec: {
-			text: string
+  schema: {
+    spec: {
+      text: string
       time: int64
       timeEnd?: int64
       dashboardUID?: string
       panelID?: int64
       tags?: [...string]
-		}
-	}
-}
-
+    }
+  }
+  selectableFields: [
+    "spec.time",
+    "spec.timeEnd",
+    "spec.dashboardUID",
+    "spec.panelID",
+  ]
+}

apps/annotation/pkg/apis/annotation/v0alpha1/annotation_object_gen.go

@@ -25,6 +25,13 @@ type Annotation struct {
 	Status AnnotationStatus `json:"status" yaml:"status"`
 }
 
+func NewAnnotation() *Annotation {
+	return &Annotation{
+		Spec:   *NewAnnotationSpec(),
+		Status: *NewAnnotationStatus(),
+	}
+}
+
 func (o *Annotation) GetSpec() any {
 	return o.Spec
 }

apps/annotation/pkg/apis/annotation/v0alpha1/annotation_schema_gen.go

@@ -5,13 +5,69 @@
 package v0alpha1
 
 import (
+	"errors"
+	"fmt"
+
 	"github.com/grafana/grafana-app-sdk/resource"
 )
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaAnnotation = resource.NewSimpleSchema("annotation.grafana.app", "v0alpha1", &Annotation{}, &AnnotationList{}, resource.WithKind("Annotation"),
-		resource.WithPlural("annotations"), resource.WithScope(resource.NamespacedScope))
+	schemaAnnotation = resource.NewSimpleSchema("annotation.grafana.app", "v0alpha1", NewAnnotation(), &AnnotationList{}, resource.WithKind("Annotation"),
+		resource.WithPlural("annotations"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{
+			FieldSelector: "spec.time",
+			FieldValueFunc: func(o resource.Object) (string, error) {
+				cast, ok := o.(*Annotation)
+				if !ok {
+					return "", errors.New("provided object must be of type *Annotation")
+				}
+
+				return fmt.Sprintf("%d", cast.Spec.Time), nil
+			},
+		},
+			resource.SelectableField{
+				FieldSelector: "spec.timeEnd",
+				FieldValueFunc: func(o resource.Object) (string, error) {
+					cast, ok := o.(*Annotation)
+					if !ok {
+						return "", errors.New("provided object must be of type *Annotation")
+					}
+					if cast.Spec.TimeEnd == nil {
+						return "", nil
+					}
+
+					return fmt.Sprintf("%d", *cast.Spec.TimeEnd), nil
+				},
+			},
+			resource.SelectableField{
+				FieldSelector: "spec.dashboardUID",
+				FieldValueFunc: func(o resource.Object) (string, error) {
+					cast, ok := o.(*Annotation)
+					if !ok {
+						return "", errors.New("provided object must be of type *Annotation")
+					}
+					if cast.Spec.DashboardUID == nil {
+						return "", nil
+					}
+
+					return *cast.Spec.DashboardUID, nil
+				},
+			},
+			resource.SelectableField{
+				FieldSelector: "spec.panelID",
+				FieldValueFunc: func(o resource.Object) (string, error) {
+					cast, ok := o.(*Annotation)
+					if !ok {
+						return "", errors.New("provided object must be of type *Annotation")
+					}
+					if cast.Spec.PanelID == nil {
+						return "", nil
+					}
+
+					return fmt.Sprintf("%d", *cast.Spec.PanelID), nil
+				},
+			},
+		}))
 	kindAnnotation = resource.Kind{
 		Schema: schemaAnnotation,
 		Codecs: map[resource.KindEncoding]resource.Codec{

apps/annotation/pkg/apis/annotation_manifest.go

@@ -40,6 +40,12 @@ var appManifestData = app.ManifestData{
 					Scope:      "Namespaced",
 					Conversion: false,
 					Schema:     &versionSchemaAnnotationv0alpha1,
+					SelectableFields: []string{
+						"spec.time",
+						"spec.timeEnd",
+						"spec.dashboardUID",
+						"spec.panelID",
+					},
 				},
 			},
 			Routes: app.ManifestVersionRoutes{
@@ -77,6 +83,28 @@ var appManifestData = app.ManifestData{
 																		"tags": {
 																			SchemaProps: spec.SchemaProps{
 																				Type: []string{"array"},
+																				Items: &spec.SchemaOrArray{
+																					Schema: &spec.Schema{
+																						SchemaProps: spec.SchemaProps{
+																							Type: []string{"object"},
+																							Properties: map[string]spec.Schema{
+																								"count": {
+																									SchemaProps: spec.SchemaProps{
+																										Type: []string{"number"},
+																									},
+																								},
+																								"tag": {
+																									SchemaProps: spec.SchemaProps{
+																										Type: []string{"string"},
+																									},
+																								},
+																							},
+																							Required: []string{
+																								"tag",
+																								"count",
+																							},
+																						}},
+																				},
 																			},
 																		},
 																	},

apps/annotation/pkg/app/authorizer.go

@@ -0,0 +1,20 @@
+package app
+
+import (
+	"context"
+
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+)
+
+func GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(func(
+		ctx context.Context, attr authorizer.Attributes,
+	) (authorized authorizer.Decision, reason string, err error) {
+		if !attr.IsResourceRequest() {
+			return authorizer.DecisionNoOpinion, "", nil
+		}
+
+		// Any authenticated user can access the API
+		return authorizer.DecisionAllow, "", nil
+	})
+}

apps/dashboard/pkg/migration/conversion/conversion_data_loss_detection.go

@@ -180,15 +180,12 @@ func countAnnotationsV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if annotationList, ok := annotations["list"].([]interface{}); ok {
-		return len(annotationList)
-	}
-	if annotationList, ok := annotations["list"].([]map[string]interface{}); ok {
-		return len(annotationList)
+	annotationList, ok := annotations["list"].([]interface{})
+	if !ok {
+		return 0
 	}
 
-	return 0
+	return len(annotationList)
 }
 
 // countLinksV0V1 counts dashboard links in v0alpha1 or v1beta1 dashboard spec
@@ -197,15 +194,12 @@ func countLinksV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if links, ok := spec["links"].([]interface{}); ok {
-		return len(links)
-	}
-	if links, ok := spec["links"].([]map[string]interface{}); ok {
-		return len(links)
+	links, ok := spec["links"].([]interface{})
+	if !ok {
+		return 0
 	}
 
-	return 0
+	return len(links)
 }
 
 // countVariablesV0V1 counts template variables in v0alpha1 or v1beta1 dashboard spec
@@ -219,15 +213,12 @@ func countVariablesV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if variableList, ok := templating["list"].([]interface{}); ok {
-		return len(variableList)
-	}
-	if variableList, ok := templating["list"].([]map[string]interface{}); ok {
-		return len(variableList)
+	variableList, ok := templating["list"].([]interface{})
+	if !ok {
+		return 0
 	}
 
-	return 0
+	return len(variableList)
 }
 
 // collectStatsV0V1 collects statistics from v0alpha1 or v1beta1 dashboard

apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.bom-in-links.json

@@ -1,142 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "title": "BOM Stripping Test Dashboard",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "schemaVersion": 42,
-    "tags": ["test", "bom"],
-    "editable": true,
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "url": "http://example.com?var=${datasource}&other=value",
-        "targetBlank": true,
-        "icon": "external link"
-      }
-    ],
-    "panels": [
-      {
-        "id": 1,
-        "type": "table",
-        "title": "Panel with BOM in field config override links",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {"color": "green"},
-                {"color": "red", "value": 80}
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "server"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "Override link with BOM",
-                      "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "links": [
-          {
-            "title": "Panel data link with BOM",
-            "url": "http://example.com/${__data.fields.cluster}&var=value",
-            "targetBlank": true
-          }
-        ],
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      },
-      {
-        "id": 2,
-        "type": "timeseries",
-        "title": "Panel with BOM in options dataLinks",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "options": {
-          "legend": {
-            "showLegend": true,
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "dataLinks": [
-            {
-              "title": "Options data link with BOM",
-              "url": "http://example.com?series=${__series.name}&time=${__value.time}",
-              "targetBlank": true
-            }
-          ]
-        },
-        "fieldConfig": {
-          "defaults": {
-            "links": [
-              {
-                "title": "Field config default link with BOM",
-                "url": "http://example.com?field=${__field.name}&value=${__value.raw}",
-                "targetBlank": false
-              }
-            ]
-          },
-          "overrides": []
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      }
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": ["5s", "10s", "30s", "1m", "5m"]
-    }
-  }
-}
-

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2alpha1.json

@@ -120,7 +120,7 @@
                         "value": [
                           {
                             "title": "filter",
-                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
+                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
                           }
                         ]
                       }

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2beta1.json

@@ -124,7 +124,7 @@
                         "value": [
                           {
                             "title": "filter",
-                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
+                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
                           }
                         ]
                       }

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_new.v42.v1beta1.json

@@ -2051,4 +2051,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_new.v42.v2alpha1.json

@@ -2691,4 +2691,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_new.v42.v2beta1.json

@@ -2764,4 +2764,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_old_to_new.v42.v1beta1.json

@@ -1173,4 +1173,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_old_to_new.v42.v2alpha1.json

@@ -1618,4 +1618,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_old_to_new.v42.v2beta1.json

@@ -1670,4 +1670,4 @@
       "storedVersion": "v0alpha1"
     }
   }
-}
+}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.bom-in-links.v0alpha1.json

@@ -1,161 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "links": [
-      {
-        "icon": "external link",
-        "targetBlank": true,
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "url": "http://example.com?var=${datasource}\u0026other=value"
-      }
-    ],
-    "panels": [
-      {
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "server"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "Override link with BOM",
-                      "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "links": [
-          {
-            "targetBlank": true,
-            "title": "Panel data link with BOM",
-            "url": "http://example.com/${__data.fields.cluster}\u0026var=value"
-          }
-        ],
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            },
-            "refId": "A"
-          }
-        ],
-        "title": "Panel with BOM in field config override links",
-        "type": "table"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": false,
-                "title": "Field config default link with BOM",
-                "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-              }
-            ]
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "dataLinks": [
-            {
-              "targetBlank": true,
-              "title": "Options data link with BOM",
-              "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-            }
-          ],
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          }
-        },
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            },
-            "refId": "A"
-          }
-        ],
-        "title": "Panel with BOM in options dataLinks",
-        "type": "timeseries"
-      }
-    ],
-    "schemaVersion": 42,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ]
-    },
-    "title": "BOM Stripping Test Dashboard"
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.bom-in-links.v2alpha1.json

@@ -1,242 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "annotations": [],
-    "cursorSync": "Off",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Panel with BOM in field config override links",
-          "description": "",
-          "links": [
-            {
-              "title": "Panel data link with BOM",
-              "url": "http://example.com/${__data.fields.cluster}\u0026var=value",
-              "targetBlank": true
-            }
-          ],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {}
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "test-ds"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "table",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": null,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  }
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "server"
-                    },
-                    "properties": [
-                      {
-                        "id": "links",
-                        "value": [
-                          {
-                            "title": "Override link with BOM",
-                            "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "Panel with BOM in options dataLinks",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {}
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "test-ds"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "timeseries",
-            "spec": {
-              "pluginVersion": "",
-              "options": {
-                "dataLinks": [
-                  {
-                    "targetBlank": true,
-                    "title": "Options data link with BOM",
-                    "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-                  }
-                ],
-                "legend": {
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "links": [
-                    {
-                      "targetBlank": false,
-                      "title": "Field config default link with BOM",
-                      "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-                    }
-                  ]
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-2"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "icon": "external link",
-        "tooltip": "",
-        "url": "http://example.com?var=${datasource}\u0026other=value",
-        "tags": [],
-        "asDropdown": false,
-        "targetBlank": true,
-        "includeVars": false,
-        "keepTime": false
-      }
-    ],
-    "liveNow": false,
-    "preload": false,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "BOM Stripping Test Dashboard",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.bom-in-links.v2beta1.json

@@ -1,246 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "annotations": [],
-    "cursorSync": "Off",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Panel with BOM in field config override links",
-          "description": "",
-          "links": [
-            {
-              "title": "Panel data link with BOM",
-              "url": "http://example.com/${__data.fields.cluster}\u0026var=value",
-              "targetBlank": true
-            }
-          ],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "test-ds"
-                      },
-                      "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "table",
-            "version": "",
-            "spec": {
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": null,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  }
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "server"
-                    },
-                    "properties": [
-                      {
-                        "id": "links",
-                        "value": [
-                          {
-                            "title": "Override link with BOM",
-                            "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "Panel with BOM in options dataLinks",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "test-ds"
-                      },
-                      "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "",
-            "spec": {
-              "options": {
-                "dataLinks": [
-                  {
-                    "targetBlank": true,
-                    "title": "Options data link with BOM",
-                    "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-                  }
-                ],
-                "legend": {
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "links": [
-                    {
-                      "targetBlank": false,
-                      "title": "Field config default link with BOM",
-                      "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-                    }
-                  ]
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-2"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "icon": "external link",
-        "tooltip": "",
-        "url": "http://example.com?var=${datasource}\u0026other=value",
-        "tags": [],
-        "asDropdown": false,
-        "targetBlank": true,
-        "includeVars": false,
-        "keepTime": false
-      }
-    ],
-    "liveNow": false,
-    "preload": false,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "BOM Stripping Test Dashboard",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/v1beta1_to_v2alpha1.go

@@ -229,36 +229,6 @@ func getBoolField(m map[string]interface{}, key string, defaultValue bool) bool
 	return defaultValue
 }
 
-// stripBOM removes Byte Order Mark (BOM) characters from a string.
-// BOMs (U+FEFF) can be introduced through copy/paste from certain editors
-// and cause CUE validation errors ("illegal byte order mark").
-func stripBOM(s string) string {
-	return strings.ReplaceAll(s, "\ufeff", "")
-}
-
-// stripBOMFromInterface recursively strips BOM characters from all strings
-// in an interface{} value (map, slice, or string).
-func stripBOMFromInterface(v interface{}) interface{} {
-	switch val := v.(type) {
-	case string:
-		return stripBOM(val)
-	case map[string]interface{}:
-		result := make(map[string]interface{}, len(val))
-		for k, v := range val {
-			result[k] = stripBOMFromInterface(v)
-		}
-		return result
-	case []interface{}:
-		result := make([]interface{}, len(val))
-		for i, item := range val {
-			result[i] = stripBOMFromInterface(item)
-		}
-		return result
-	default:
-		return v
-	}
-}
-
 func getUnionField[T ~string](m map[string]interface{}, key string) *T {
 	if val, ok := m[key]; ok {
 		if str, ok := val.(string); ok && str != "" {
@@ -423,8 +393,7 @@ func transformLinks(dashboard map[string]interface{}) []dashv2alpha1.DashboardDa
 				// Optional field - only set if present
 				if url, exists := linkMap["url"]; exists {
 					if urlStr, ok := url.(string); ok {
-						cleanUrl := stripBOM(urlStr)
-						dashLink.Url = &cleanUrl
+						dashLink.Url = &urlStr
 					}
 				}
 
@@ -2270,7 +2239,7 @@ func transformDataLinks(panelMap map[string]interface{}) []dashv2alpha1.Dashboar
 		if linkMap, ok := link.(map[string]interface{}); ok {
 			dataLink := dashv2alpha1.DashboardDataLink{
 				Title: schemaversion.GetStringValue(linkMap, "title"),
-				Url:   stripBOM(schemaversion.GetStringValue(linkMap, "url")),
+				Url:   schemaversion.GetStringValue(linkMap, "url"),
 			}
 			if _, exists := linkMap["targetBlank"]; exists {
 				targetBlank := getBoolField(linkMap, "targetBlank", false)
@@ -2362,12 +2331,6 @@ func buildVizConfig(panelMap map[string]interface{}) dashv2alpha1.DashboardVizCo
 		}
 	}
 
-	// Strip BOMs from options (may contain dataLinks with URLs that have BOMs)
-	cleanedOptions := stripBOMFromInterface(options)
-	if cleanedMap, ok := cleanedOptions.(map[string]interface{}); ok {
-		options = cleanedMap
-	}
-
 	// Build field config by mapping each field individually
 	fieldConfigSource := extractFieldConfigSource(fieldConfig)
 
@@ -2511,14 +2474,9 @@ func extractFieldConfigDefaults(defaults map[string]interface{}) dashv2alpha1.Da
 		hasDefaults = true
 	}
 
-	// Extract array field - strip BOMs from link URLs
+	// Extract array field
 	if linksArray, ok := extractArrayField(defaults, "links"); ok {
-		cleanedLinks := stripBOMFromInterface(linksArray)
-		if cleanedArray, ok := cleanedLinks.([]interface{}); ok {
-			fieldConfigDefaults.Links = cleanedArray
-		} else {
-			fieldConfigDefaults.Links = linksArray
-		}
+		fieldConfigDefaults.Links = linksArray
 		hasDefaults = true
 	}
 
@@ -2804,11 +2762,9 @@ func extractFieldConfigOverrides(fieldConfig map[string]interface{}) []dashv2alp
 				fieldOverride.Properties = make([]dashv2alpha1.DashboardDynamicConfigValue, 0, len(propertiesArray))
 				for _, property := range propertiesArray {
 					if propertyMap, ok := property.(map[string]interface{}); ok {
-						// Strip BOMs from property values (may contain links with URLs)
-						cleanedValue := stripBOMFromInterface(propertyMap["value"])
 						fieldOverride.Properties = append(fieldOverride.Properties, dashv2alpha1.DashboardDynamicConfigValue{
 							Id:    schemaversion.GetStringValue(propertyMap, "id"),
-							Value: cleanedValue,
+							Value: propertyMap["value"],
 						})
 					}
 				}

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-gauge/gauge_tests.v42.json

@@ -628,20 +628,6 @@
         }
       ],
       "title": "Only nulls and no user set min \u0026 max",
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options":  {
-            "conversions": [
-              {
-                "destinationType": "number",
-                "targetField": "A-series"
-              }
-            ],
-            "fields": {}
-          }
-        }
-      ],
       "type": "gauge"
     },
     {
@@ -1193,4 +1179,4 @@
   "title": "Panel Tests - Gauge",
   "uid": "_5rDmaQiz",
   "weekStart": ""
-}
+}

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-gauge/gauge_tests_new.v42.json

@@ -1760,22 +1760,6 @@
           "startValue": 0
         }
       ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
       "title": "Active gateways",
       "type": "radialbar"
     },
@@ -1859,22 +1843,6 @@
           "startValue": 0
         }
       ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
       "title": "Active pods",
       "type": "radialbar"
     },

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-gauge/gauge_tests_old_to_new.v42.json

@@ -485,7 +485,6 @@
       },
       "id": 12,
       "options": {
-        "displayName": "My gauge",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",

apps/iam/go.mod

@@ -223,7 +223,7 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect

apps/iam/go.sum

@@ -827,8 +827,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=

apps/plugins/README.md

@@ -1,20 +0,0 @@
-# Plugins App
-
-API documentation is available at http://localhost:3000/swagger?api=plugins.grafana.app-v0alpha1
-
-## Codegen
-
-- Go: `make generate`
-- Frontend: Follow instructions in this [README](../..//packages/grafana-api-clients/README.md)
-
-## Plugin sync
-
-The plugin sync pushes the plugins loaded from disk to the plugins API.
-
-To enable, add these feature toggles in your `custom.ini`:
-
-```ini
-[feature_toggles]
-pluginInstallAPISync = true
-pluginStoreServiceLoading = true
-```

apps/plugins/go.mod

@@ -90,7 +90,7 @@ require (
 	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect

apps/plugins/go.sum

@@ -213,8 +213,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=

devenv/dev-dashboards/panel-gauge/gauge_tests.json

@@ -600,20 +600,6 @@
           "stringInput": "null,null"
         }
       ],
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options": {
-            "fields": {},
-            "conversions": [
-              {
-                "targetField": "A-series",
-                "destinationType": "number"
-              }
-            ]
-          }
-        }
-      ],
       "title": "Only nulls and no user set min & max",
       "type": "gauge"
     },

devenv/dev-dashboards/panel-gauge/gauge_tests_new.json

@@ -1718,22 +1718,6 @@
           "startValue": 0
         }
       ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
       "title": "Active gateways",
       "type": "radialbar"
     },
@@ -1815,22 +1799,6 @@
           "startValue": 0
         }
       ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
       "title": "Active pods",
       "type": "radialbar"
     },

devenv/dev-dashboards/panel-gauge/gauge_tests_old_to_new.json

@@ -474,7 +474,6 @@
       },
       "id": 12,
       "options": {
-        "displayName": "My gauge",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",

docs/sources/alerting/alerting-rules/alerting-migration.md

@@ -134,7 +134,7 @@ To convert data source-managed alert rules to Grafana managed alerts:
 
    Pausing stops alert rule evaluation behavior for the newly created Grafana-managed alert rules.
 
-9. (Optional) In the **Target data source** of the **Recording rules** section, you can select the data source to which the imported recording rules will write metrics. By default, it is the data source selected in the **Data source** dropdown.
+9. (Optional) In the **Target data source** of the **Recording rules** section, you can select the data source that the imported recording rules will query. By default, it is the data source selected in the **Data source** dropdown.
 
 10. Click **Import**.
 

docs/sources/visualizations/dashboards/share-dashboards-panels/_index.md

@@ -98,7 +98,7 @@ You can share dashboards in the following ways:
 - [As a report](#schedule-a-report)
 - [As a snapshot](#share-a-snapshot)
 - [As a PDF export](#export-a-dashboard-as-pdf)
-- [As a JSON file export](#export-a-dashboard-as-code)
+- [As a JSON file export](#export-a-dashboard-as-json)
 - [As an image export](#export-a-dashboard-as-an-image)
 
 When you share a dashboard externally as a link or by email, those dashboards are included in a list of your shared dashboards. To view the list and manage these dashboards, navigate to **Dashboards > Shared dashboards**.

e2e-playwright/dashboards-suite/dashboard-browse-nested.spec.ts

@@ -10,7 +10,7 @@ const NUM_NESTED_DASHBOARDS = 60;
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-browse.spec.ts

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/TestDashboard.json';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-export-image.spec.ts

@@ -7,7 +7,7 @@ test.use({
     scenes: true,
     sharingDashboardImage: true, // Enable the export image feature
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-export-json.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-keybindings.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-links-without-slug.spec.ts

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/DataLinkWithoutSlugTest.json';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-live-streaming.spec.ts

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/DashboardLiveTest.json';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-public-create.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
     dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
   },
 });

e2e-playwright/dashboards-suite/dashboard-public-templating.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
     dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
   },
 });

e2e-playwright/dashboards-suite/dashboard-share-externally-create.spec.ts

@@ -4,7 +4,7 @@ test.use({
   featureToggles: {
     scenes: true,
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-share-internally.spec.ts

@@ -4,7 +4,7 @@ test.use({
   featureToggles: {
     scenes: true,
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-share-snapshot-create.spec.ts

@@ -6,7 +6,7 @@ test.use({
   featureToggles: {
     scenes: true,
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-templating.spec.ts

@@ -6,7 +6,7 @@ test.use({
   timezoneId: 'Pacific/Easter',
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts

@@ -8,7 +8,7 @@ const TIMEZONE_DASHBOARD_UID = 'd41dbaa2-a39e-4536-ab2b-caca52f1a9c8';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/dashboard-timepicker.spec.ts

@@ -17,7 +17,7 @@ test.use({
   },
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/embedded-dashboard.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/general-dashboards.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'edediimbjhdz4b/a-tall-dashboard';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/import-dashboard.spec.ts

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/TestDashboard.json';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/load-options-from-url.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-constant-variable.spec.ts

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-custom-variable.spec.ts

@@ -53,7 +53,7 @@ async function assertPreviewValues(
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-datasource-variable.spec.ts

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-interval-variable.spec.ts

@@ -19,7 +19,7 @@ async function assertPreviewValues(
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-query-variable.spec.ts

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Templating - Nested Template Variables';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/new-text-box-variable.spec.ts

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/repeating-a-panel-horizontally.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/repeating-a-panel-vertically.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/repeating-an-empty-row.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/set-options-from-ui.spec.ts

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/snapshot-create.spec.ts

@@ -5,7 +5,7 @@ const DASHBOARD_UID = 'ZqZnVvFZz';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
     dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
   },
 });

e2e-playwright/dashboards-suite/templating-dashboard-links-and-variables.spec.ts

@@ -5,7 +5,7 @@ const DASHBOARD_UID = 'yBCC3aKGk';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/dashboards-suite/textbox-variables.spec.ts

@@ -7,7 +7,7 @@ const PAGE_UNDER_TEST = 'AejrN1AMz';
 test.use({
   featureToggles: {
     kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
   },
 });
 

e2e-playwright/panels-suite/canvas-scene.spec.ts

@@ -2,16 +2,18 @@ import { Locator } from '@playwright/test';
 
 import { test, expect } from '@grafana/plugin-e2e';
 
+import { setVisualization } from './vizpicker-utils';
+
 test.use({
   featureToggles: {
     canvasPanelPanZoom: true,
   },
 });
 test.describe('Canvas Panel - Scene Tests', () => {
-  test.beforeEach(async ({ page, gotoDashboardPage }) => {
+  test.beforeEach(async ({ page, gotoDashboardPage, selectors }) => {
     const dashboardPage = await gotoDashboardPage({});
     const panelEditPage = await dashboardPage.addPanel();
-    await panelEditPage.setVisualization('Canvas');
+    await setVisualization(panelEditPage, 'Canvas', selectors);
 
     // Wait for canvas panel to load
     await page.waitForSelector('[data-testid="canvas-scene-pan-zoom"]', { timeout: 10000 });

e2e-playwright/panels-suite/gauge.spec.ts

@@ -1,101 +0,0 @@
-import { test, expect } from '@grafana/plugin-e2e';
-
-// this test requires a larger viewport so all gauge panels load properly
-test.use({
-  featureToggles: { newGauge: true },
-  viewport: { width: 1280, height: 3000 },
-});
-
-const OLD_GAUGES_DASHBOARD_UID = '_5rDmaQiz';
-const NEW_GAUGES_DASHBOARD_UID = 'panel-tests-gauge-new';
-
-test.describe(
-  'Gauge Panel',
-  {
-    tag: ['@panels', '@gauge'],
-  },
-  () => {
-    test('successfully migrates all gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({ uid: OLD_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(16);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders new gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      // open Panel Tests - Gauge
-      const dashboardPage = await gotoDashboardPage({ uid: NEW_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(32);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders sparklines in gauge panels', async ({ gotoDashboardPage, page }) => {
-      await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '11' }),
-      });
-
-      await expect(page.locator('.uplot')).toHaveCount(5);
-    });
-
-    test('"no data"', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '36' }),
-      });
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('No data');
-
-      // update the "No value" option and see if the panel updates
-      const noValueOption = dashboardPage
-        .getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Standard options No value'))
-        .locator('input');
-
-      await noValueOption.fill('My empty value');
-      await noValueOption.blur();
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the empty text shows up in an empty gauge'
-      ).toHaveText('My empty value');
-
-      // test the "no numeric fields" message on the next panel
-      const dashboardPage2 = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '37' }),
-      });
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('Data is missing a number field');
-    });
-  }
-);

e2e-playwright/panels-suite/vizpicker-utils.ts

@@ -0,0 +1,24 @@
+import { expect, E2ESelectorGroups, PanelEditPage } from '@grafana/plugin-e2e';
+
+// this replaces the panelEditPage.setVisualization method used previously in tests, since it
+// does not know how to use the updated 12.4 viz picker UI to set the visualization
+export const setVisualization = async (panelEditPage: PanelEditPage, vizName: string, selectors: E2ESelectorGroups) => {
+  const vizPicker = panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker);
+  await expect(vizPicker, '"Change" button should be visible').toBeVisible();
+  await vizPicker.click();
+
+  const allVizTabBtn = panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('All visualizations'));
+  await expect(allVizTabBtn, '"All visualiations" button should be visible').toBeVisible();
+  await allVizTabBtn.click();
+
+  const vizItem = panelEditPage.getByGrafanaSelector(selectors.components.PluginVisualization.item(vizName));
+  await expect(vizItem, `"${vizName}" item should be visible`).toBeVisible();
+  await vizItem.scrollIntoViewIfNeeded();
+  await vizItem.click();
+
+  await expect(vizPicker, '"Change" button should be visible again').toBeVisible();
+  await expect(
+    panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
+    'Panel header should have the new viz type name'
+  ).toHaveText(vizName);
+};

e2e-playwright/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts

@@ -1,5 +1,6 @@
 import { expect, test } from '@grafana/plugin-e2e';
 
+import { setVisualization } from '../../../panels-suite/vizpicker-utils';
 import { formatExpectError } from '../errors';
 import { successfulDataQuery } from '../mocks/queries';
 
@@ -24,10 +25,10 @@ test.describe(
         ).toContainText(['Field', 'Max', 'Mean', 'Last']);
       });
 
-      test('table panel data assertions', async ({ panelEditPage }) => {
+      test('table panel data assertions', async ({ panelEditPage, selectors }) => {
         await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
         await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization('Table');
+        await setVisualization(panelEditPage, 'Table', selectors);
         await panelEditPage.refreshPanel();
         await expect(
           panelEditPage.panel.locator,
@@ -43,10 +44,10 @@ test.describe(
         ).toContainText(['val1', 'val2', 'val3', 'val4']);
       });
 
-      test('timeseries panel - table view assertions', async ({ panelEditPage }) => {
+      test('timeseries panel - table view assertions', async ({ panelEditPage, selectors }) => {
         await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
         await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization('Time series');
+        await setVisualization(panelEditPage, 'Time series', selectors);
         await panelEditPage.refreshPanel();
         await panelEditPage.toggleTableView();
         await expect(

e2e-playwright/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelEditPage.spec.ts

@@ -1,5 +1,6 @@
 import { expect, test } from '@grafana/plugin-e2e';
 
+import { setVisualization } from '../../../panels-suite/vizpicker-utils';
 import { formatExpectError } from '../errors';
 import { successfulDataQuery } from '../mocks/queries';
 import { scenarios } from '../mocks/resources';
@@ -53,10 +54,10 @@ test.describe(
         ).toHaveText(scenarios.map((s) => s.name));
       });
 
-      test('mocked query data response', async ({ panelEditPage, page }) => {
+      test('mocked query data response', async ({ panelEditPage, page, selectors }) => {
         await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
         await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+        await setVisualization(panelEditPage, TABLE_VIZ_NAME, selectors);
         await panelEditPage.refreshPanel();
         await expect(
           panelEditPage.panel.getErrorIcon(),
@@ -75,7 +76,7 @@ test.describe(
         selectors,
         page,
       }) => {
-        await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+        await setVisualization(panelEditPage, TABLE_VIZ_NAME, selectors);
         await expect(
           panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
           formatExpectError('Expected panel visualization to be set to table')
@@ -92,8 +93,8 @@ test.describe(
         ).toBeVisible();
       });
 
-      test('Select time zone in timezone picker', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('Select time zone in timezone picker', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = await panelEditPage.getCustomOptions('Axis');
         const timeZonePicker = axisOptions.getSelect('Time zone');
 
@@ -101,8 +102,8 @@ test.describe(
         await expect(timeZonePicker).toHaveSelected('Europe/Stockholm');
       });
 
-      test('select unit in unit picker', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('select unit in unit picker', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const standardOptions = panelEditPage.getStandardOptions();
         const unitPicker = standardOptions.getUnitPicker('Unit');
 
@@ -111,8 +112,8 @@ test.describe(
         await expect(unitPicker).toHaveSelected('Pixels');
       });
 
-      test('enter value in number input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in number input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = panelEditPage.getCustomOptions('Axis');
         const lineWith = axisOptions.getNumberInput('Soft min');
 
@@ -121,8 +122,8 @@ test.describe(
         await expect(lineWith).toHaveValue('10');
       });
 
-      test('enter value in slider', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in slider', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const graphOptions = panelEditPage.getCustomOptions('Graph styles');
         const lineWidth = graphOptions.getSliderInput('Line width');
 
@@ -131,8 +132,8 @@ test.describe(
         await expect(lineWidth).toHaveValue('10');
       });
 
-      test('select value in single value select', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('select value in single value select', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const standardOptions = panelEditPage.getStandardOptions();
         const colorSchemeSelect = standardOptions.getSelect('Color scheme');
 
@@ -140,8 +141,8 @@ test.describe(
         await expect(colorSchemeSelect).toHaveSelected('Classic palette');
       });
 
-      test('clear input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('clear input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const panelOptions = panelEditPage.getPanelOptions();
         const title = panelOptions.getTextInput('Title');
 
@@ -150,8 +151,8 @@ test.describe(
         await expect(title).toHaveValue('');
       });
 
-      test('enter value in input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const panelOptions = panelEditPage.getPanelOptions();
         const description = panelOptions.getTextInput('Description');
 
@@ -160,8 +161,8 @@ test.describe(
         await expect(description).toHaveValue('This is a panel');
       });
 
-      test('unchecking switch', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('unchecking switch', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = panelEditPage.getCustomOptions('Axis');
         const showBorder = axisOptions.getSwitch('Show border');
 
@@ -173,8 +174,8 @@ test.describe(
         await expect(showBorder).toBeChecked({ checked: false });
       });
 
-      test('checking switch', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('checking switch', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = panelEditPage.getCustomOptions('Axis');
         const showBorder = axisOptions.getSwitch('Show border');
 
@@ -183,8 +184,8 @@ test.describe(
         await expect(showBorder).toBeChecked();
       });
 
-      test('re-selecting value in radio button group', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('re-selecting value in radio button group', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = panelEditPage.getCustomOptions('Axis');
         const placement = axisOptions.getRadioGroup('Placement');
 
@@ -195,8 +196,8 @@ test.describe(
         await expect(placement).toHaveChecked('Auto');
       });
 
-      test('selecting value in radio button group', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('selecting value in radio button group', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
         const axisOptions = panelEditPage.getCustomOptions('Axis');
         const placement = axisOptions.getRadioGroup('Placement');
 

e2e-playwright/smoke-tests-suite/panels.spec.ts

@@ -1,4 +1,4 @@
-import { BootData, PanelPluginMeta } from '@grafana/data';
+import { BootData } from '@grafana/data';
 import { test, expect } from '@grafana/plugin-e2e';
 
 test.describe(
@@ -22,7 +22,7 @@ test.describe(
       await dashboardPage.addPanel();
 
       // Get panel types from window object
-      const panelTypes: PanelPluginMeta[] = await page.evaluate(() => {
+      const panelTypes = await page.evaluate(() => {
         // @grafana/plugin-e2e doesn't export the full bootdata config
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const win = window as typeof window & { grafanaBootData: BootData };

e2e-playwright/various-suite/gauge.spec.ts

@@ -0,0 +1,27 @@
+import { test, expect } from '@grafana/plugin-e2e';
+
+// this test requires a larger viewport so all gauge panels load properly
+test.use({
+  viewport: { width: 1280, height: 1080 },
+});
+
+test.describe(
+  'Gauge Panel',
+  {
+    tag: ['@various'],
+  },
+  () => {
+    test('Gauge rendering e2e tests', async ({ gotoDashboardPage, selectors, page }) => {
+      // open Panel Tests - Gauge
+      const dashboardPage = await gotoDashboardPage({ uid: '_5rDmaQiz' });
+
+      // check that gauges are rendered
+      const gaugeElements = page.locator('.flot-base');
+      await expect(gaugeElements).toHaveCount(16);
+
+      // check that no panel errors exist
+      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
+      await expect(errorInfo).toBeHidden();
+    });
+  }
+);

e2e-playwright/various-suite/visualization-suggestions-v2.spec.ts

@@ -1,178 +0,0 @@
-import { test, expect } from '@grafana/plugin-e2e';
-
-test.use({
-  featureToggles: {
-    newVizSuggestions: true,
-    externalVizSuggestions: false,
-  },
-  viewport: {
-    width: 800,
-    height: 1500,
-  },
-});
-
-test.describe(
-  'Visualization suggestions v2',
-  {
-    tag: ['@various', '@suggestions'],
-  },
-  () => {
-    test('Should be shown and clickable', async ({ selectors, gotoPanelEditPage }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel'
-      ).toBeVisible();
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // TODO: in this part of the test, we will change the query and the transforms and observe suggestions being updated.
-
-      // Select a visualization and verify table header is visible from preview
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button disabled since panel has not yet changed'
-      ).toBeDisabled();
-
-      // apply the suggestion and verify panel options are visible
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.confirm('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
-        'options pane to be rendered'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button enabled now that panel is dirty'
-      ).toBeEnabled();
-    });
-
-    test('should not apply suggestion if you navigate toggle the viz picker back off', async ({
-      selectors,
-      gotoPanelEditPage,
-    }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel;'
-      ).toBeVisible();
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // Select a visualization
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton)
-      ).toBeDisabled();
-
-      // Verify that toggling the viz picker back cancels the suggestion, restores the line chart, shows panel options
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
-        'options pane to be rendered'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button is still disabled since no changes were applied'
-      ).toBeDisabled();
-    });
-
-    test('should not apply suggestion if you navigate back to the dashboard', async ({
-      page,
-      selectors,
-      gotoPanelEditPage,
-    }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // Select a visualization
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(page.getByRole('grid').getByRole('row').first(), 'table row to be rendered').toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton)
-      ).toBeDisabled();
-
-      // Verify that navigating back to the dashboard cancels the suggestion and restores the line chart.
-      await panelEditPage
-        .getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.backToDashboardButton)
-        .click();
-      await expect(
-        page.locator('[data-viz-panel-key="panel-9"]').locator('.uplot'),
-        'time series to be rendered inside the panel'
-      ).toBeVisible();
-    });
-  }
-);

e2e-playwright/various-suite/visualization-suggestions.spec.ts

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.describe(
   'Visualization suggestions',
   {
-    tag: ['@various', '@suggestions'],
+    tag: ['@various'],
   },
   () => {
     test('Should be shown and clickable', async ({ page, selectors, gotoPanelEditPage }) => {

go.mod

@@ -87,7 +87,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.15.0 // @grafana/grafana-backend-group
 	github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // @grafana/alerting-backend
+	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 // @grafana/alerting-backend
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // @grafana/identity-access-team
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // @grafana/identity-access-team
 	github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
@@ -181,7 +181,6 @@ require (
 	github.com/xlab/treeprint v1.2.0 // @grafana/observability-traces-and-profiling
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // @grafana/grafana-operator-experience-squad
 	github.com/yudai/gojsondiff v1.0.0 // @grafana/grafana-backend-group
-	go.etcd.io/bbolt v1.4.2 // @grafana/grafana-search-and-storage
 	go.opentelemetry.io/collector/pdata v1.44.0 // @grafana/grafana-backend-group
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // @grafana/plugins-platform-backend
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // @grafana/grafana-operator-experience-squad
@@ -604,6 +603,7 @@ require (
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	github.com/zclconf/go-cty v1.16.3 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.etcd.io/bbolt v1.4.2 // indirect
 	go.etcd.io/etcd/api/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.6 // indirect

go.sum

@@ -1622,8 +1622,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
+github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=

go.work.sum

@@ -793,15 +793,7 @@ github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5
 github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
 github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
-github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs=
-github.com/go-openapi/swag/fileutils v0.25.1/go.mod h1:+NXtt5xNZZqmpIpjqcujqojGFek9/w55b3ecmOdtg8M=
-github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo=
-github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc=
-github.com/go-openapi/swag/mangling v0.25.1/go.mod h1:CdiMQ6pnfAgyQGSOIYnZkXvqhnnwOn997uXZMAd/7mQ=
-github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg=
-github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8=
-github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
 github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
@@ -990,6 +982,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9K
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
@@ -1411,6 +1404,7 @@ github.com/richardartoul/molecule v1.0.0/go.mod h1:uvX/8buq8uVeiZiFht+0lqSLBHF+u
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
@@ -1629,6 +1623,7 @@ go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5queth
 go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/collector v0.121.0/go.mod h1:M4TlnmkjIgishm2DNCk9K3hMKTmAsY9w8cNFsp9EchM=
 go.opentelemetry.io/collector v0.124.0/go.mod h1:QzERYfmHUedawjr8Ph/CBEEkVqWS8IlxRLAZt+KHlCg=
 go.opentelemetry.io/collector/client v1.29.0/go.mod h1:LCUoEV2KCTKA1i+/txZaGsSPVWUcqeOV6wCfNsAippE=
@@ -1844,7 +1839,6 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
 go.opentelemetry.io/contrib/otelconf v0.15.0 h1:BLNiIUsrNcqhSKpsa6CnhE6LdrpY1A8X0szMVsu99eo=
 go.opentelemetry.io/contrib/otelconf v0.15.0/go.mod h1:OPH1seO5z9dp1P26gnLtoM9ht7JDvh3Ws6XRHuXqImY=
 go.opentelemetry.io/contrib/propagators/aws v1.37.0 h1:cp8AFiM/qjBm10C/ATIRnEDXpD5MBknrA0ANw4T2/ss=
@@ -1916,6 +1910,7 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
 go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
+go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
@@ -2123,8 +2118,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0/go.
 google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=
 google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA=
 google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090/go.mod h1:U8EXRNSd8sUYyDfs/It7KVWodQr+Hf9xtxyxWudSwEw=
 google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk=
-google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:G5IanEx8/PgI9w6CFcYQf7jMtHQhZruvfM1i3qOqk5U=
 google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822 h1:zWFRixYR5QlotL+Uv3YfsPRENIrQFXiGs+iwqel6fOQ=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y=
@@ -2155,9 +2150,10 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -2181,6 +2177,7 @@ google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7E
 google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
 google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
+google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
 google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7GzIx+cBiwfYPwtmZ41U3Mn/cotLJciaArI=
 google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0=
@@ -2302,6 +2299,7 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
 sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
 sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/structured-merge-diff/v6 v6.2.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

packages/grafana-api-clients/src/clients/rtkq/dashboard/v0alpha1/endpoints.gen.ts

@@ -243,7 +243,6 @@ const injectedRtkApi = api
             type: queryArg['type'],
             folder: queryArg.folder,
             facet: queryArg.facet,
-            facetLimit: queryArg.facetLimit,
             tags: queryArg.tags,
             libraryPanel: queryArg.libraryPanel,
             permission: queryArg.permission,
@@ -285,10 +284,6 @@ const injectedRtkApi = api
         query: (queryArg) => ({ url: `/snapshots/delete/${queryArg.deleteKey}`, method: 'DELETE' }),
         invalidatesTags: ['Snapshot'],
       }),
-      getSnapshotSettings: build.query<GetSnapshotSettingsApiResponse, GetSnapshotSettingsApiArg>({
-        query: () => ({ url: `/snapshots/settings` }),
-        providesTags: ['Snapshot'],
-      }),
       getSnapshot: build.query<GetSnapshotApiResponse, GetSnapshotApiArg>({
         query: (queryArg) => ({
           url: `/snapshots/${queryArg.name}`,
@@ -668,8 +663,6 @@ export type SearchDashboardsAndFoldersApiArg = {
   folder?: string;
   /** count distinct terms for selected fields */
   facet?: string[];
-  /** maximum number of terms to return per facet (default 50, max 1000) */
-  facetLimit?: number;
   /** tag query filter */
   tags?: string[];
   /** find dashboards that reference a given libraryPanel */
@@ -746,8 +739,6 @@ export type DeleteWithKeyApiArg = {
   /** unique key returned in create */
   deleteKey: string;
 };
-export type GetSnapshotSettingsApiResponse = /** status 200 undefined */ any;
-export type GetSnapshotSettingsApiArg = void;
 export type GetSnapshotApiResponse = /** status 200 OK */ Snapshot;
 export type GetSnapshotApiArg = {
   /** name of the Snapshot */
@@ -1279,8 +1270,6 @@ export const {
   useLazyListSnapshotQuery,
   useCreateSnapshotMutation,
   useDeleteWithKeyMutation,
-  useGetSnapshotSettingsQuery,
-  useLazyGetSnapshotSettingsQuery,
   useGetSnapshotQuery,
   useLazyGetSnapshotQuery,
   useDeleteSnapshotMutation,

packages/grafana-data/src/field/fieldDisplay.test.ts

@@ -3,18 +3,11 @@ import { merge } from 'lodash';
 import { toDataFrame } from '../dataframe/processDataFrame';
 import { createTheme } from '../themes/createTheme';
 import { ReducerID } from '../transformations/fieldReducer';
-import { FieldType } from '../types/dataFrame';
 import { FieldConfigPropertyItem } from '../types/fieldOverrides';
 import { MappingType, SpecialValueMatch, ValueMapping } from '../types/valueMapping';
 
 import { getDisplayProcessor } from './displayProcessor';
-import {
-  FieldSparkline,
-  fixCellTemplateExpressions,
-  getFieldDisplayValues,
-  GetFieldDisplayValuesOptions,
-  getSparklineHighlight,
-} from './fieldDisplay';
+import { fixCellTemplateExpressions, getFieldDisplayValues, GetFieldDisplayValuesOptions } from './fieldDisplay';
 import { standardFieldConfigEditorRegistry } from './standardFieldConfigEditorRegistry';
 
 describe('FieldDisplay', () => {
@@ -563,71 +556,3 @@ describe('fixCellTemplateExpressions', () => {
     );
   });
 });
-
-describe('getSparklineHighlight', () => {
-  const sparkline: FieldSparkline = {
-    y: { name: 'A', type: FieldType.number, values: [null, 2, 3, 4, 10, 8, 8, 8, 9, null], config: {} },
-  };
-
-  it.each([
-    {
-      calc: ReducerID.last,
-      expected: {
-        type: 'point',
-        xIdx: 9,
-      },
-    },
-    {
-      calc: ReducerID.max,
-      expected: {
-        type: 'point',
-        xIdx: 4,
-      },
-    },
-    {
-      calc: ReducerID.min,
-      expected: {
-        type: 'point',
-        xIdx: 1,
-      },
-    },
-    {
-      calc: ReducerID.first,
-      expected: {
-        type: 'point',
-        xIdx: 0,
-      },
-    },
-    {
-      calc: ReducerID.firstNotNull,
-      expected: {
-        type: 'point',
-        xIdx: 1,
-      },
-    },
-    {
-      calc: ReducerID.lastNotNull,
-      expected: {
-        type: 'point',
-        xIdx: 8,
-      },
-    },
-    {
-      calc: ReducerID.mean,
-      expected: {
-        type: 'line',
-        y: 6.5,
-      },
-    },
-    {
-      calc: ReducerID.median,
-      expected: {
-        type: 'line',
-        y: 8,
-      },
-    },
-  ])('it calculates the correct highlight for the $calc', ({ calc, expected }) => {
-    const result = getSparklineHighlight(sparkline, calc);
-    expect(result).toEqual(expected);
-  });
-});

packages/grafana-data/src/field/fieldDisplay.ts

@@ -3,7 +3,7 @@ import { isEmpty } from 'lodash';
 import { DataFrameView } from '../dataframe/DataFrameView';
 import { getTimeField } from '../dataframe/processDataFrame';
 import { GrafanaTheme2 } from '../themes/types';
-import { isReducerID, reduceField, ReducerID } from '../transformations/fieldReducer';
+import { reduceField, ReducerID } from '../transformations/fieldReducer';
 import { getFieldMatcher } from '../transformations/matchers';
 import { FieldMatcherID } from '../transformations/matchers/ids';
 import { ScopedVars } from '../types/ScopedVars';
@@ -43,7 +43,6 @@ export interface FieldSparkline {
   x?: Field; // if this does not exist, use the index
   timeRange?: TimeRange; // Optionally force an absolute time
   highlightIndex?: number;
-  highlightLine?: number;
 }
 
 export interface FieldDisplay {
@@ -73,76 +72,6 @@ export interface GetFieldDisplayValuesOptions {
 
 export const DEFAULT_FIELD_DISPLAY_VALUES_LIMIT = 25;
 
-interface SparklineHighlightPoint {
-  type: 'point';
-  xIdx: number;
-}
-
-interface SparklineHighlightLine {
-  type: 'line';
-  y: number;
-}
-
-export function getSparklineHighlight(
-  sparkline: FieldSparkline,
-  calc: ReducerID
-): SparklineHighlightPoint | SparklineHighlightLine | void {
-  switch (calc) {
-    case ReducerID.last:
-      return { type: 'point', xIdx: sparkline.y.values.length - 1 };
-    case ReducerID.first:
-      return { type: 'point', xIdx: 0 };
-    case ReducerID.lastNotNull: {
-      for (let k = sparkline.y.values.length - 1; k >= 0; k--) {
-        const v = sparkline.y.values[k];
-        if (v !== null && v !== undefined && !Number.isNaN(v)) {
-          return { type: 'point', xIdx: k };
-        }
-      }
-      return;
-    }
-    case ReducerID.firstNotNull: {
-      for (let k = 0; k < sparkline.y.values.length; k++) {
-        const v = sparkline.y.values[k];
-        if (v !== null && v !== undefined && !Number.isNaN(v)) {
-          return { type: 'point', xIdx: k };
-        }
-      }
-      return;
-    }
-    case ReducerID.min: {
-      let minIdx = -1;
-      let prevMin = Infinity;
-      for (let k = 0; k < sparkline.y.values.length; k++) {
-        const v = sparkline.y.values[k];
-        if (v !== null && v !== undefined && !Number.isNaN(v) && v < prevMin) {
-          prevMin = v;
-          minIdx = k;
-        }
-      }
-      return minIdx >= 0 ? { type: 'point', xIdx: minIdx } : undefined;
-    }
-    case ReducerID.max: {
-      let maxIdx = -1;
-      let prevMax = -Infinity;
-      for (let k = 0; k < sparkline.y.values.length; k++) {
-        const v = sparkline.y.values[k];
-        if (v !== null && v !== undefined && !Number.isNaN(v) && v > prevMax) {
-          prevMax = v;
-          maxIdx = k;
-        }
-      }
-      return maxIdx >= 0 ? { type: 'point', xIdx: maxIdx } : undefined;
-    }
-    case ReducerID.mean:
-      return { type: 'line', y: reduceField({ field: sparkline.y, reducers: [ReducerID.mean] }).mean };
-    case ReducerID.median:
-      return { type: 'line', y: reduceField({ field: sparkline.y, reducers: [ReducerID.median] }).median };
-    default:
-      return;
-  }
-}
-
 export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): FieldDisplay[] => {
   const { replaceVariables, reduceOptions, timeZone, theme } = options;
   const calcs = reduceOptions.calcs.length ? reduceOptions.calcs : [ReducerID.last];
@@ -261,16 +190,62 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
               y: dataFrame.fields[i],
               x: timeField,
             };
-            if (isReducerID(calc)) {
-              const sparklineHighlight = getSparklineHighlight(sparkline, calc);
-              switch (sparklineHighlight?.type) {
-                case 'point':
-                  sparkline.highlightIndex = sparklineHighlight.xIdx;
-                  break;
-                case 'line':
-                  sparkline.highlightLine = sparklineHighlight.y;
-                  break;
+            let highlightIdx: number | undefined = (() => {
+              switch (calc) {
+                case ReducerID.last:
+                  return sparkline.y.values.length - 1;
+                case ReducerID.first:
+                  return 0;
+                // TODO: #112977 enable more reducers for highlight index
+                // case ReducerID.lastNotNull: {
+                //   for (let k = sparkline.y.values.length - 1; k >= 0; k--) {
+                //     const v = sparkline.y.values[k];
+                //     if (v !== null && v !== undefined && !Number.isNaN(v)) {
+                //       return k;
+                //     }
+                //   }
+                //   return;
+                // }
+                // case ReducerID.firstNotNull: {
+                //   for (let k = 0; k < sparkline.y.values.length; k++) {
+                //     const v = sparkline.y.values[k];
+                //     if (v !== null && v !== undefined && !Number.isNaN(v)) {
+                //       return k;
+                //     }
+                //   }
+                //   return;
+                // }
+                // case ReducerID.min: {
+                //   let minIdx = -1;
+                //   let prevMin = Infinity;
+                //   for (let k = 0; k < sparkline.y.values.length; k++) {
+                //     const v = sparkline.y.values[k];
+                //     if (v !== null && v !== undefined && !Number.isNaN(v) && v < prevMin) {
+                //       prevMin = v;
+                //       minIdx = k;
+                //     }
+                //   }
+                //   return minIdx >= 0 ? minIdx : undefined;
+                // }
+                // case ReducerID.max: {
+                //   let maxIdx = -1;
+                //   let prevMax = -Infinity;
+                //   for (let k = 0; k < sparkline.y.values.length; k++) {
+                //     const v = sparkline.y.values[k];
+                //     if (v !== null && v !== undefined && !Number.isNaN(v) && v > prevMax) {
+                //       prevMax = v;
+                //       maxIdx = k;
+                //     }
+                //   }
+                //   return maxIdx >= 0 ? maxIdx : undefined;
+                // }
+                default:
+                  return;
               }
+            })();
+
+            if (typeof highlightIdx === 'number') {
+              sparkline.highlightIndex = highlightIdx;
             }
           }
 

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -356,6 +356,10 @@ export interface FeatureToggles {
   */
   dashboardNewLayouts?: boolean;
   /**
+  * Use the v2 kubernetes API in the frontend for dashboards
+  */
+  kubernetesDashboardsV2?: boolean;
+  /**
   * Enables undo/redo in dynamic dashboards
   */
   dashboardUndoRedo?: boolean;
@@ -417,10 +421,6 @@ export interface FeatureToggles {
   */
   jitterAlertRulesWithinGroups?: boolean;
   /**
-  * Enable audit logging with Kubernetes under app platform
-  */
-  auditLoggingAppPlatform?: boolean;
-  /**
   * Enable the secrets management API and services under app platform
   */
   secretsManagementAppPlatform?: boolean;

packages/grafana-e2e-selectors/src/selectors/components.ts

@@ -535,11 +535,6 @@ export const versionedComponents = {
           '12.3.0': 'data-testid viz-tooltip-wrapper',
         },
       },
-      Gauge: {
-        Container: {
-          '12.4.0': 'data-testid gauge container',
-        },
-      },
     },
   },
   VizLegend: {
@@ -1293,9 +1288,6 @@ export const versionedComponents = {
     card: {
       [MIN_GRAFANA_VERSION]: (name: string) => `data-testid suggestion-${name}`,
     },
-    confirm: {
-      '12.4.0': (name: string) => `data-testid suggestion-${name} confirm button`,
-    },
   },
   ColorSwatch: {
     name: {

packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx

@@ -48,7 +48,7 @@ describe('MetricsModal', () => {
       operations: [],
     };
 
-    setup(query, ['with-labels']);
+    setup(query, ['with-labels'], true);
     await waitFor(() => {
       expect(screen.getByText('with-labels')).toBeInTheDocument();
     });
@@ -220,10 +220,6 @@ function createDatasource(withLabels?: boolean) {
   // display different results if their labels are selected in the PromVisualQuery
   if (withLabels) {
     languageProvider.queryMetricsMetadata = jest.fn().mockResolvedValue({
-      ALERTS: {
-        type: 'gauge',
-        help: 'alerts help text',
-      },
       'with-labels': {
         type: 'with-labels-type',
         help: 'with-labels-help',
@@ -301,7 +297,7 @@ function createProps(query: PromVisualQuery, datasource: PrometheusDatasource, m
   };
 }
 
-function setup(query: PromVisualQuery, metrics: string[]) {
+function setup(query: PromVisualQuery, metrics: string[], withlabels?: boolean) {
   const withLabels: boolean = query.labels.length > 0;
   const datasource = createDatasource(withLabels);
   const props = createProps(query, datasource, metrics);

packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.tsx

@@ -138,7 +138,7 @@ const MetricsModalContent = (props: MetricsModalProps) => {
 
 export const MetricsModal = (props: MetricsModalProps) => {
   return (
-    <MetricsModalContextProvider languageProvider={props.datasource.languageProvider} timeRange={props.timeRange}>
+    <MetricsModalContextProvider languageProvider={props.datasource.languageProvider}>
       <MetricsModalContent {...props} />
     </MetricsModalContextProvider>
   );

packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModalContext.test.tsx

@@ -4,7 +4,6 @@ import { ReactNode } from 'react';
 import { TimeRange } from '@grafana/data';
 
 import { PrometheusLanguageProviderInterface } from '../../../language_provider';
-import { getMockTimeRange } from '../../../test/mocks/datasource';
 
 import { DEFAULT_RESULTS_PER_PAGE, MetricsModalContextProvider, useMetricsModal } from './MetricsModalContext';
 import { generateMetricData } from './helpers';
@@ -26,9 +25,7 @@ const mockLanguageProvider: PrometheusLanguageProviderInterface = {
 // Helper to create wrapper component
 const createWrapper = (languageProvider = mockLanguageProvider) => {
   return ({ children }: { children: ReactNode }) => (
-    <MetricsModalContextProvider languageProvider={languageProvider} timeRange={getMockTimeRange()}>
-      {children}
-    </MetricsModalContextProvider>
+    <MetricsModalContextProvider languageProvider={languageProvider}>{children}</MetricsModalContextProvider>
   );
 };
 
@@ -170,7 +167,6 @@ describe('MetricsModalContext', () => {
 
     it('should handle empty metadata response', async () => {
       (mockLanguageProvider.queryMetricsMetadata as jest.Mock).mockResolvedValue({});
-      (mockLanguageProvider.queryLabelValues as jest.Mock).mockResolvedValue(['metric1', 'metric2']);
 
       const { result } = renderHook(() => useMetricsModal(), {
         wrapper: createWrapper(),
@@ -180,18 +176,7 @@ describe('MetricsModalContext', () => {
         expect(result.current.isLoading).toBe(false);
       });
 
-      expect(result.current.filteredMetricsData).toEqual([
-        {
-          value: 'metric1',
-          type: 'counter',
-          description: 'Test metric',
-        },
-        {
-          value: 'metric2',
-          type: 'counter',
-          description: 'Test metric',
-        },
-      ]);
+      expect(result.current.filteredMetricsData).toEqual([]);
     });
 
     it('should handle metadata fetch error', async () => {
@@ -254,7 +239,6 @@ describe('MetricsModalContext', () => {
       }));
 
       (mockLanguageProvider.queryMetricsMetadata as jest.Mock).mockResolvedValue({
-        ALERTS: { type: 'gauge', help: 'Test alerts help' },
         test_metric: { type: 'counter', help: 'Test metric' },
       });
 
@@ -266,7 +250,7 @@ describe('MetricsModalContext', () => {
         expect(result.current.isLoading).toBe(false);
       });
 
-      expect(result.current.filteredMetricsData).toHaveLength(2);
+      expect(result.current.filteredMetricsData).toHaveLength(1);
       expect(result.current.selectedTypes).toEqual([]);
     });
 
@@ -334,7 +318,7 @@ describe('MetricsModalContext', () => {
       };
 
       const { getByTestId } = render(
-        <MetricsModalContextProvider languageProvider={mockLanguageProvider} timeRange={getMockTimeRange()}>
+        <MetricsModalContextProvider languageProvider={mockLanguageProvider}>
           <TestComponent />
         </MetricsModalContextProvider>
       );

packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModalContext.tsx

@@ -52,13 +52,11 @@ const MetricsModalContext = createContext<MetricsModalContextValue | undefined>(
 
 type MetricsModalContextProviderProps = {
   languageProvider: PrometheusLanguageProviderInterface;
-  timeRange: TimeRange;
 };
 
 export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalContextProviderProps>> = ({
   children,
   languageProvider,
-  timeRange,
 }) => {
   const [isLoading, setIsLoading] = useState(true);
   const [metricsData, setMetricsData] = useState<MetricsData>([]);
@@ -113,16 +111,8 @@ export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalConte
       setIsLoading(true);
       const metadata = await languageProvider.queryMetricsMetadata(PROMETHEUS_QUERY_BUILDER_MAX_RESULTS);
 
-      // We receive ALERTS metadata in any case
-      if (Object.keys(metadata).length <= 1) {
-        const fetchedMetrics = await languageProvider.queryLabelValues(
-          timeRange,
-          METRIC_LABEL,
-          undefined,
-          PROMETHEUS_QUERY_BUILDER_MAX_RESULTS
-        );
-        const processedData = fetchedMetrics.map((m) => generateMetricData(m, languageProvider));
-        setMetricsData(processedData);
+      if (Object.keys(metadata).length === 0) {
+        setMetricsData([]);
       } else {
         const processedData = Object.keys(metadata).map((m) => generateMetricData(m, languageProvider));
         setMetricsData(processedData);
@@ -132,7 +122,7 @@ export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalConte
     } finally {
       setIsLoading(false);
     }
-  }, [languageProvider, timeRange]);
+  }, [languageProvider]);
 
   const debouncedBackendSearch = useMemo(
     () =>

packages/grafana-schema/src/raw/composable/newgauge/panelcfg/x/NewGaugePanelCfg_types.gen.ts

@@ -35,7 +35,6 @@ export interface Options extends common.SingleStatBaseOptions {
   showThresholdLabels: boolean;
   showThresholdMarkers: boolean;
   sparkline?: boolean;
-  textMode?: ('auto' | 'value_and_name' | 'value' | 'name' | 'none');
 }
 
 export const defaultOptions: Partial<Options> = {
@@ -49,5 +48,4 @@ export const defaultOptions: Partial<Options> = {
   showThresholdLabels: false,
   showThresholdMarkers: true,
   sparkline: true,
-  textMode: 'auto',
 };

packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx

@@ -248,17 +248,15 @@ export function PanelChrome({
 
   const onContentPointerDown = React.useCallback(
     (evt: React.PointerEvent) => {
-      // When selected, ignore clicks inside buttons, links, canvas and svg elments
+      // Ignore clicks inside buttons, links, canvas and svg elments
       // This does prevent a clicks inside a graphs from selecting panel as there is normal div above the canvas element that intercepts the click
-      if (isSelected && evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
-        // Stop propagation otherwise row config editor will get selected
-        evt.stopPropagation();
+      if (evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
         return;
       }
 
       onSelect?.(evt);
     },
-    [isSelected, onSelect]
+    [onSelect]
   );
 
   const headerContent = (

packages/grafana-ui/src/components/RadialGauge/RadialGauge.story.tsx

@@ -32,6 +32,24 @@ const meta: Meta<StoryProps> = {
     controls: {
       exclude: ['theme', 'values', 'vizCount'],
     },
+    a11y: {
+      config: {
+        rules: [
+          {
+            id: 'scrollable-region-focusable',
+            selector: 'body',
+            enabled: false,
+          },
+          // NOTE: this is necessary due to a false positive with the filered svg glow in one of the examples.
+          // The color-contrast in this component should be accessible!
+          {
+            id: 'color-contrast',
+            selector: 'text',
+            enabled: false,
+          },
+        ],
+      },
+    },
   },
   args: {
     barWidthFactor: 0.2,

packages/grafana-ui/src/components/RadialGauge/RadialGauge.tsx

@@ -2,7 +2,6 @@ import { css, cx } from '@emotion/css';
 import { useId } from 'react';
 
 import { DisplayValueAlignmentFactors, FALLBACK_COLOR, FieldDisplay, GrafanaTheme2, TimeRange } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 
 import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
@@ -276,11 +275,7 @@ export function RadialGauge(props: RadialGaugeProps) {
   }
 
   return (
-    <div
-      data-testid={selectors.components.Panels.Visualization.Gauge.Container}
-      className={styles.vizWrapper}
-      style={{ width, height }}
-    >
+    <div className={styles.vizWrapper} style={{ width, height }}>
       {body}
     </div>
   );

packages/grafana-ui/src/components/RadialGauge/RadialSparkline.tsx

@@ -67,7 +67,7 @@ export const RadialSparkline = memo(
 
     return (
       <div style={{ position: 'absolute', top: topPos }}>
-        <Sparkline height={height} width={width} sparkline={sparkline} theme={theme} config={config} showHighlights />
+        <Sparkline height={height} width={width} sparkline={sparkline} theme={theme} config={config} />
       </div>
     );
   }

packages/grafana-ui/src/components/RadialGauge/effects.tsx

@@ -1,4 +1,4 @@
-import { colorManipulator, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
 
 import { RadialGaugeDimensions } from './types';
 
@@ -25,14 +25,13 @@ export function GlowGradient({ id, barWidth }: GlowGradientProps) {
   );
 }
 
-const CENTER_GLOW_OPACITY = 0.25;
+const CENTER_GLOW_OPACITY = 0.15;
 
 export function CenterGlowGradient({ gaugeId, color }: { gaugeId: string; color: string }) {
-  const transparentColor = colorManipulator.alpha(color, CENTER_GLOW_OPACITY);
   return (
     <radialGradient id={`circle-glow-${gaugeId}`} r="50%" fr="0%">
-      <stop offset="0%" stopColor={transparentColor} />
-      <stop offset="90%" stopColor={'#ffffff00'} />
+      <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+      <stop offset="90%" stopColor={color} stopOpacity={0} />
     </radialGradient>
   );
 }
@@ -45,14 +44,13 @@ export interface CenterGlowProps {
 
 export function MiddleCircleGlow({ dimensions, gaugeId, color }: CenterGlowProps) {
   const gradientId = `circle-glow-${gaugeId}`;
-  const transparentColor = color ? colorManipulator.alpha(color, CENTER_GLOW_OPACITY) : color;
 
   return (
     <>
       <defs>
         <radialGradient id={gradientId} r="50%" fr="0%">
-          <stop offset="0%" stopColor={transparentColor} />
-          <stop offset="90%" stopColor="#ffffff00" />
+          <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+          <stop offset="90%" stopColor={color} stopOpacity={0} />
         </radialGradient>
       </defs>
       <g>
@@ -88,9 +86,9 @@ export function SpotlightGradient({
 
   return (
     <linearGradient x1={x1} y1={y1} x2={x2} y2={y2} id={id} gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stopColor="#ffffff00" />
-      <stop offset="95%" stopColor="#ffffff88" />
-      {roundedBars && <stop offset="100%" stopColor={roundedBars ? '#ffffffbb' : 'white'} />}
+      <stop offset="0%" stopColor={'white'} stopOpacity={0.0} />
+      <stop offset="95%" stopColor={'white'} stopOpacity={0.5} />
+      {roundedBars && <stop offset="100%" stopColor={'white'} stopOpacity={roundedBars ? 0.7 : 1} />}
     </linearGradient>
   );
 }