always return a value

.github/CODEOWNERS

@@ -24,6 +24,7 @@
 /NOTICE.md @torkelo
 /README.md @grafana/docs-grafana
 /ROADMAP.md @torkelo
+/SECURITY.md @grafana/security-team
 /SUPPORT.md @torkelo
 /WORKFLOW.md @torkelo
 /contribute/ @grafana/grafana-community-support
@@ -425,7 +426,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /public/locales/enterprise/i18next.config.ts @grafana/grafana-frontend-platform
 /public/app/core/internationalization/ @grafana/grafana-frontend-platform
 /e2e/ @grafana/grafana-frontend-platform
-/e2e-playwright/alerting-suite/ @grafana/alerting-frontend
 /e2e-playwright/cloud-plugins-suite/ @grafana/partner-datasources
 /e2e-playwright/dashboard-new-layouts/ @grafana/dashboards-squad
 /e2e-playwright/dashboard-cujs/ @grafana/dashboards-squad
@@ -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

.github/actions/build-package/action.yml

@@ -82,6 +82,14 @@ inputs:
     description: Docker registry of produced images
     default: docker.io
     required: false
+  ubuntu-base:
+    type: string
+    default: 'ubuntu:22.04'
+    required: false
+  alpine-base:
+    type: string
+    default: 'alpine:3.22'
+    required: false
 outputs:
   dist-dir:
     description: Directory where artifacts are placed
@@ -126,11 +134,13 @@ runs:
         UBUNTU_TAG_FORMAT: ${{ inputs.docker-tag-format-ubuntu }}
         CHECKSUM: ${{ inputs.checksum }}
         VERIFY: ${{ inputs.verify }}
+        ALPINE_BASE: ${{ inputs.alpine-base }}
+        UBUNTU_BASE: ${{ inputs.ubuntu-base }}
       with:
         verb: run
         dagger-flags: --verbose=0
         version: 0.18.8
-        args: go run -C ${GRAFANA_PATH} ./pkg/build/cmd artifacts --artifacts ${ARTIFACTS} --grafana-dir=${GRAFANA_PATH} --enterprise-dir=${ENTERPRISE_PATH} --version=${VERSION} --patches-repo=${PATCHES_REPO} --patches-ref=${PATCHES_REF} --patches-path=${PATCHES_PATH} --build-id=${BUILD_ID} --tag-format="${TAG_FORMAT}" --ubuntu-tag-format="${UBUNTU_TAG_FORMAT}" --org=${DOCKER_ORG} --registry=${DOCKER_REGISTRY} --checksum=${CHECKSUM} --verify=${VERIFY} > $OUTFILE
+        args: go run -C ${GRAFANA_PATH} ./pkg/build/cmd artifacts --artifacts ${ARTIFACTS} --grafana-dir=${GRAFANA_PATH} --alpine-base=${ALPINE_BASE} --ubuntu-base=${UBUNTU_BASE} --enterprise-dir=${ENTERPRISE_PATH} --version=${VERSION} --patches-repo=${PATCHES_REPO} --patches-ref=${PATCHES_REF} --patches-path=${PATCHES_PATH} --build-id=${BUILD_ID} --tag-format="${TAG_FORMAT}" --ubuntu-tag-format="${UBUNTU_TAG_FORMAT}" --org=${DOCKER_ORG} --registry=${DOCKER_REGISTRY} --checksum=${CHECKSUM} --verify=${VERIFY} > $OUTFILE
     - id: output
       shell: bash
       env:

.github/actions/change-detection/action.yml

@@ -95,11 +95,9 @@ runs:
             - 'nx.json'
             - 'tsconfig.json'
             - '.yarn/**'
-            - 'apps/dashboard/pkg/migration/**'
             - '${{ inputs.self }}'
           e2e:
             - 'e2e/**'
-            - 'e2e-playwright/**'
             - '.github/actions/setup-enterprise/**'
             - '.github/actions/checkout/**'
             - 'emails/**'

.yarn/patches/@storybook-core-npm-8.6.2-8c752112c0.patch

@@ -1,13 +0,0 @@
-diff --git a/dist/builder-manager/index.js b/dist/builder-manager/index.js
-index 3d7f9b213dae1801bda62b31db31b9113e382ccd..212501c63d20146c29db63fb0f6300c6779eecb5 100644
---- a/dist/builder-manager/index.js
-+++ b/dist/builder-manager/index.js
-@@ -1970,7 +1970,7 @@ var pa = /^\/($|\?)/, G, C, xt = /* @__PURE__ */ o(async (e) => {
-     bundle: !0,
-     minify: !0,
-     sourcemap: !1,
--    conditions: ["browser", "module", "default"],
-+    conditions: ["@grafana-app/source", "browser", "module", "default"],
-     jsxFactory: "React.createElement",
-     jsxFragment: "React.Fragment",
-     jsx: "transform",

SECURITY.md

@@ -0,0 +1,29 @@
+# Reporting security issues
+
+If you think you have found a security vulnerability, we have two routes for reporting security issues.
+
+Important: Whichever route you choose, we ask you to not disclose the vulnerability before it has been fixed and announced, unless you received a response from the Grafana Labs security team that you can do so.
+
+[Full guidance on reporting a security issue can be found here](https://grafana.com/legal/report-a-security-issue/).
+
+This product is in scope for our Bug Bounty Program. To submit a vulnerability report, please visit [Grafana Labs Bug Bounty page](https://app.intigriti.com/programs/grafanalabs/grafanaossbbp/detail) and follow the instructions provided. Our security team will review your submission and get back to you as soon as possible.
+
+---
+
+For products and services outside the scope of our bug bounty program, or if you do not wish to receive a bounty, you can report issues directly to us via email at security@grafana.com. This address can be used for all of Grafana Labs’ open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com).
+
+Please encrypt your message to us; please use our PGP key. The key fingerprint is:
+
+225E 6A9B BB15 A37E 95EB 6312 C66A 51CC B44C 27E0
+
+The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0x225E6A9BBB15A37E95EB6312C66A51CCB44C27E0&fingerprint=on&op=index).
+
+Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
+
+**Important:** We ask you to not disclose the vulnerability before it have been fixed and announced, unless you received a response from the Grafana Labs security team that you can do so.
+
+## Security announcements
+
+We will post a summary, remediation, and mitigation details for any patch containing security fixes on the Grafana blog. The security announcement blog posts will be tagged with the [security tag](https://grafana.com/tags/security/).
+
+You can also track security announcements via the [RSS feed](https://grafana.com/tags/security/index.xml).

apps/advisor/go.mod

@@ -54,7 +54,6 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -158,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

@@ -115,8 +115,6 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapp
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
 github.com/IBM/pgxpoolprometheus v1.1.2 h1:sHJwxoL5Lw4R79Zt+H4Uj1zZ4iqXJLdk7XDE7TPs97U=
 github.com/IBM/pgxpoolprometheus v1.1.2/go.mod h1:+vWzISN6S9ssgurhUNmm6AlXL9XLah3TdWJktquKTR8=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -621,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/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/metrics.go

@@ -85,20 +85,20 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
 		// Only track schema versions for v0/v1 dashboards (v2+ info is redundant with API version)
 		switch source := a.(type) {
 		case *dashv0.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv2alpha1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		case *dashv2beta1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		}
 

apps/dashboard/pkg/migration/conversion/testdata/input/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.json

@@ -300,9 +300,15 @@
         "y": 0
       },
       "id": 6,
-      "options": {},
-      "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

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

@@ -71,11 +71,12 @@
       "id": 1,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": true,
+          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -149,11 +150,12 @@
       "id": 4,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -227,11 +229,12 @@
       "id": 3,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -268,6 +271,85 @@
       "title": "Center and bar glow",
       "type": "radialbar"
     },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 4,
+        "x": 12,
+        "y": 1
+      },
+      "id": 5,
+      "maxDataPoints": 20,
+      "options": {
+        "barWidthFactor": 0.4,
+        "effects": {
+          "barGlow": true,
+          "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
+          "gradient": false
+        },
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "circle",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sparkline": false
+      },
+      "pluginVersion": "13.0.0-pre",
+      "targets": [
+        {
+          "alias": "1",
+          "datasource": {
+            "type": "grafana-testdata-datasource"
+          },
+          "max": 100,
+          "min": 1,
+          "noise": 22,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "spread": 22,
+          "startValue": 1
+        }
+      ],
+      "title": "Spotlight",
+      "type": "radialbar"
+    },
     {
       "datasource": {
         "type": "grafana-testdata-datasource"
@@ -309,9 +391,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -387,9 +470,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": false,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -465,9 +549,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": false,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -556,9 +641,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -634,9 +720,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -712,9 +799,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -790,9 +878,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -885,9 +974,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -963,9 +1053,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1041,9 +1132,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1119,9 +1211,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1197,9 +1290,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1292,9 +1386,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1374,9 +1469,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1456,9 +1552,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1544,13 +1641,13 @@
       "options": {
         "barWidth": 12,
         "barWidthFactor": 0.4,
-        "barShape": "rounded",
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": true
         },
-        "endpointMarker": "glow",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1565,7 +1662,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1632,9 +1730,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1649,7 +1748,8 @@
         "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": true
+        "sparkline": true,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1730,9 +1830,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1747,7 +1848,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1815,6 +1917,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "sparkline": false,
+          "spotlight": true,
           "gradient": true
         },
         "glow": "both",
@@ -1829,10 +1934,10 @@
         "segmentCount": 12,
         "segmentSpacing": 0.3,
         "shape": "circle",
-        "barShape": "rounded",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1899,9 +2004,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1916,7 +2022,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1983,9 +2090,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
+          "rounded": true,
+          "spotlight": true,
           "gradient": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2000,7 +2108,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [

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

@@ -955,6 +955,8 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",

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/input/v1beta1.groupby.json

@@ -1,166 +0,0 @@
-{
-    "kind": "DashboardWithAccessInfo",
-    "apiVersion": "dashboard.grafana.app/v1beta1",
-    "metadata": {
-      "name": "groupby-test"
-    },
-    "spec": {
-      "annotations": {
-        "list": [
-          {
-            "builtIn": 1,
-            "datasource": {
-              "type": "grafana",
-              "uid": "-- Grafana --"
-            },
-            "enable": true,
-            "hide": true,
-            "iconColor": "rgba(0, 211, 255, 1)",
-            "name": "Annotations \u0026 Alerts",
-            "type": "dashboard"
-          }
-        ]
-      },
-      "editable": true,
-      "fiscalYearStartMonth": 0,
-      "graphTooltip": 0,
-      "links": [],
-      "panels": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "test-uid"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 0
-          },
-          "id": 2,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "12.4.0-pre",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "test-uid"
-              },
-              "editorMode": "code",
-              "expr": "sum(counters_requests)",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "works with group by var",
-          "type": "timeseries"
-        }
-      ],
-      "preload": false,
-      "schemaVersion": 42,
-      "tags": [],
-      "templating": {
-        "list": [
-          {
-            "current": {
-              "text": [
-                "a_legacy_label",
-                "app",
-                "exported_instance",
-                "exported_job"
-              ],
-              "value": [
-                "a_legacy_label",
-                "app",
-                "exported_instance",
-                "exported_job"
-              ]
-            },
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-uid"
-            },
-            "name": "Group by",
-            "type": "groupby"
-          }
-        ]
-      },
-      "time": {
-        "from": "now-6h",
-        "to": "now"
-      },
-      "timepicker": {},
-      "timezone": "browser",
-      "title": "groupby test",
-      "weekStart": ""
-    }
-  }

apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.panel-target-missing-refid.json

@@ -1,156 +0,0 @@
-{
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 288,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "gdev-testdata"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "barWidthFactor": 0.6,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "showValues": false,
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "hideZeros": false,
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "pluginVersion": "12.4.0-pre",
-        "targets": [
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          },
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          }
-        ],
-        "title": "New panel",
-        "type": "timeseries"
-      }
-    ],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "Panel ds inheritance ",
-    "uid": "ad5vfcn",
-    "version": 2
-  },
-  "status": {}
-}

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v0alpha1.json

@@ -743,9 +743,7 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": {
-            "uid": "$datasource"
-          },
+          "datasource": "$datasource",
           "hide": 0,
           "includeAll": true,
           "label": "cluster",
@@ -766,9 +764,7 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": {
-            "uid": "$datasource"
-          },
+          "datasource": "$datasource",
           "hide": 0,
           "includeAll": false,
           "label": "namespace",

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2alpha1.json

@@ -961,12 +961,8 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
-          "datasource": {
-            "type": "",
-            "uid": "$datasource"
-          },
           "query": {
-            "kind": "",
+            "kind": "prometheus",
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -992,12 +988,8 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
-          "datasource": {
-            "type": "",
-            "uid": "$datasource"
-          },
           "query": {
-            "kind": "",
+            "kind": "prometheus",
             "spec": {
               "__legacyStringValue": "label_values(up{job=~\"$cluster\"}, instance)"
             }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2beta1.json

@@ -978,11 +978,8 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "",
+            "group": "prometheus",
             "version": "v0",
-            "datasource": {
-              "name": "$datasource"
-            },
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -1010,11 +1007,8 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "",
+            "group": "prometheus",
             "version": "v0",
-            "datasource": {
-              "name": "$datasource"
-            },
             "spec": {
               "__legacyStringValue": "label_values(up{job=~\"$cluster\"}, instance)"
             }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json

@@ -115,14 +115,7 @@
             "kind": "logs",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "logs",
-                  "originalOptions": {
-                    "height": 100
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json

@@ -120,14 +120,7 @@
             "group": "logs",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "logs",
-                  "originalOptions": {
-                    "height": 100
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json

@@ -182,20 +182,7 @@
             "kind": "table",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "bytes",
-                    "y_format": "short"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json

@@ -189,20 +189,7 @@
             "group": "table",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "bytes",
-                    "y_format": "short"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json

@@ -435,29 +435,7 @@
             "kind": "table",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20"
-                        ],
-                        "unit": "short"
-                      }
-                    ],
-                    "table": "table2"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json

@@ -449,29 +449,7 @@
             "group": "table",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20"
-                        ],
-                        "unit": "short"
-                      }
-                    ],
-                    "table": "table2"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2alpha1.json

@@ -110,15 +110,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Angular Text Panel\n# $constant\n\nFor markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)\n\n## $text\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2beta1.json

@@ -115,15 +115,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Angular Text Panel\n# $constant\n\nFor markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)\n\n## $text\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -361,15 +361,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$seriesName\u003c/span\u003e\n2. **label.datacenter:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenter\u003c/span\u003e\n3. **label.datacenter.region:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenterRegion\u003c/span\u003e\n\n#### Field variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$fieldName\u003c/span\u003e\n\n#### Value variables\n1. **Time:** \u003cspan style=\"color: orange;\"\u003e$valueTime\u003c/span\u003e\n2. **Numeric:** \u003cspan style=\"color: orange;\"\u003e$valueNumeric\u003c/span\u003e\n3. **Text:** \u003cspan style=\"color: orange;\"\u003e$valueText\u003c/span\u003e\n4. **Calc:** \u003cspan style=\"color: orange;\"\u003e$valueCalc\u003c/span\u003e\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -372,15 +372,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$seriesName\u003c/span\u003e\n2. **label.datacenter:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenter\u003c/span\u003e\n3. **label.datacenter.region:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenterRegion\u003c/span\u003e\n\n#### Field variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$fieldName\u003c/span\u003e\n\n#### Value variables\n1. **Time:** \u003cspan style=\"color: orange;\"\u003e$valueTime\u003c/span\u003e\n2. **Numeric:** \u003cspan style=\"color: orange;\"\u003e$valueNumeric\u003c/span\u003e\n3. **Text:** \u003cspan style=\"color: orange;\"\u003e$valueText\u003c/span\u003e\n4. **Calc:** \u003cspan style=\"color: orange;\"\u003e$valueCalc\u003c/span\u003e\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -167,15 +167,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -174,15 +174,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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}"
                           }
                         ]
                       }
@@ -273,15 +273,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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}"
                           }
                         ]
                       }
@@ -282,15 +282,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v1beta1.json

@@ -296,7 +296,6 @@
         }
       },
       {
-        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
         "datasource": {
           "type": "grafana-testdata-datasource"
         },
@@ -307,7 +306,15 @@
           "y": 0
         },
         "id": 6,
-        "mode": "markdown",
+        "options": {
+          "code": {
+            "language": "plaintext",
+            "showLineNumbers": false,
+            "showMiniMap": false
+          },
+          "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+          "mode": "markdown"
+        },
         "pluginVersion": "11.0.0-pre",
         "targets": [
           {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v2alpha1.json

@@ -1256,13 +1256,13 @@
             "spec": {
               "pluginVersion": "11.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-                    "mode": "markdown"
-                  }
-                }
+                "code": {
+                  "language": "plaintext",
+                  "showLineNumbers": false,
+                  "showMiniMap": false
+                },
+                "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+                "mode": "markdown"
               },
               "fieldConfig": {
                 "defaults": {},

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v2beta1.json

@@ -1301,13 +1301,13 @@
             "version": "11.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-                    "mode": "markdown"
-                  }
-                }
+                "code": {
+                  "language": "plaintext",
+                  "showLineNumbers": false,
+                  "showMiniMap": false
+                },
+                "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+                "mode": "markdown"
               },
               "fieldConfig": {
                 "defaults": {},

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

@@ -62,12 +62,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -157,12 +151,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -253,12 +241,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -338,12 +320,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -425,12 +401,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -510,12 +480,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -595,12 +559,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -681,12 +639,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -778,12 +730,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -981,12 +927,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1066,12 +1006,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1151,12 +1085,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [

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

@@ -67,12 +67,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -165,12 +159,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -264,12 +252,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -352,12 +334,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -442,12 +418,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -530,12 +500,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -618,12 +582,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -707,12 +665,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -807,12 +759,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1015,12 +961,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1103,12 +1043,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1191,12 +1125,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [

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

@@ -77,12 +77,13 @@
         "id": 1,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -155,12 +156,13 @@
         "id": 4,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": false,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -233,12 +235,13 @@
         "id": 3,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -274,6 +277,85 @@
         "title": "Center and bar glow",
         "type": "radialbar"
       },
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 4,
+          "x": 12,
+          "y": 1
+        },
+        "id": 5,
+        "maxDataPoints": 20,
+        "options": {
+          "barWidthFactor": 0.4,
+          "effects": {
+            "barGlow": true,
+            "centerGlow": true,
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
+          },
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "segmentCount": 1,
+          "segmentSpacing": 0.3,
+          "shape": "circle",
+          "showThresholdLabels": false,
+          "showThresholdMarkers": false,
+          "sparkline": false
+        },
+        "pluginVersion": "13.0.0-pre",
+        "targets": [
+          {
+            "alias": "1",
+            "datasource": {
+              "type": "grafana-testdata-datasource"
+            },
+            "max": 100,
+            "min": 1,
+            "noise": 22,
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "spread": 22,
+            "startValue": 1
+          }
+        ],
+        "title": "Spotlight",
+        "type": "radialbar"
+      },
       {
         "datasource": {
           "type": "grafana-testdata-datasource"
@@ -311,12 +393,13 @@
         "id": 8,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -389,12 +472,13 @@
         "id": 22,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -467,12 +551,13 @@
         "id": 23,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -558,12 +643,13 @@
         "id": 18,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.1,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -636,12 +722,13 @@
         "id": 19,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.32,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -714,12 +801,13 @@
         "id": 20,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.57,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -792,12 +880,13 @@
         "id": 21,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidthFactor": 0.8,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false
+            "gradient": false,
+            "rounded": true,
+            "spotlight": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -887,12 +976,13 @@
         "id": 25,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -965,12 +1055,13 @@
         "id": 26,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1043,12 +1134,13 @@
         "id": 29,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true
+            "gradient": true,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1121,12 +1213,13 @@
         "id": 30,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1199,12 +1292,13 @@
         "id": 28,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1294,12 +1388,13 @@
         "id": 32,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true
+            "gradient": true,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1376,12 +1471,13 @@
         "id": 34,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true
+            "gradient": true,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1458,12 +1554,13 @@
         "id": 33,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true
+            "gradient": true,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1548,15 +1645,15 @@
         "id": 9,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "spotlight": true
           },
-          "endpointMarker": "glow",
           "glow": "both",
           "orientation": "auto",
           "reduceOptions": {
@@ -1571,7 +1668,8 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false
+          "sparkline": false,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1633,13 +1731,14 @@
         "id": 11,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "spotlight": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1655,7 +1754,8 @@
           "shape": "gauge",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": true
+          "sparkline": true,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1731,13 +1831,14 @@
         "id": 13,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.49,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "spotlight": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1753,7 +1854,8 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false
+          "sparkline": false,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1816,13 +1918,15 @@
         "id": 14,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.49,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "sparkline": false,
+            "spotlight": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1838,7 +1942,8 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false
+          "sparkline": false,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1900,13 +2005,14 @@
         "id": 15,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.84,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "spotlight": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1922,7 +2028,8 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false
+          "sparkline": false,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1984,13 +2091,14 @@
         "id": 16,
         "maxDataPoints": 20,
         "options": {
-          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.66,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true
+            "gradient": true,
+            "rounded": true,
+            "spotlight": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -2006,7 +2114,8 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false
+          "sparkline": false,
+          "spotlight": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [

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

@@ -73,12 +73,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -164,13 +165,14 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -186,7 +188,8 @@
                 "shape": "gauge",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": true
+                "sparkline": true,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -259,13 +262,14 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -281,7 +285,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -355,13 +360,15 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "sparkline": false,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -377,7 +384,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -451,13 +459,14 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.84,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -473,7 +482,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -546,13 +556,14 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.66,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -568,7 +579,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -641,12 +653,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.1,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -732,12 +745,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.32,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -823,12 +837,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.57,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -914,12 +929,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.8,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1005,12 +1021,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1096,12 +1113,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1183,12 +1201,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1274,12 +1293,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1365,12 +1385,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1456,12 +1477,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1551,12 +1573,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1638,12 +1661,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1729,12 +1753,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1824,12 +1849,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1919,12 +1945,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2018,12 +2045,105 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
+                },
+                "orientation": "auto",
+                "reduceOptions": {
+                  "calcs": [
+                    "lastNotNull"
+                  ],
+                  "fields": "",
+                  "values": false
+                },
+                "segmentCount": 1,
+                "segmentSpacing": 0.3,
+                "shape": "circle",
+                "showThresholdLabels": false,
+                "showThresholdMarkers": false,
+                "sparkline": false
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "min": 0,
+                  "max": 100,
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "thresholds"
+                  }
+                },
+                "overrides": []
+              }
+            }
+          }
+        }
+      },
+      "panel-5": {
+        "kind": "Panel",
+        "spec": {
+          "id": 5,
+          "title": "Spotlight",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "grafana-testdata-datasource",
+                      "spec": {
+                        "alias": "1",
+                        "max": 100,
+                        "min": 1,
+                        "noise": 22,
+                        "scenarioId": "random_walk",
+                        "spread": 22,
+                        "startValue": 1
+                      }
+                    },
+                    "refId": "A",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {
+                "maxDataPoints": 20
+              }
+            }
+          },
+          "vizConfig": {
+            "kind": "radialbar",
+            "spec": {
+              "pluginVersion": "13.0.0-pre",
+              "options": {
+                "barWidthFactor": 0.4,
+                "effects": {
+                  "barGlow": true,
+                  "centerGlow": true,
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2109,12 +2229,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2200,15 +2321,15 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
-                "endpointMarker": "glow",
                 "glow": "both",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2223,7 +2344,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -2307,6 +2429,19 @@
                         }
                       }
                     },
+                    {
+                      "kind": "GridLayoutItem",
+                      "spec": {
+                        "x": 12,
+                        "y": 0,
+                        "width": 4,
+                        "height": 6,
+                        "element": {
+                          "kind": "ElementReference",
+                          "name": "panel-5"
+                        }
+                      }
+                    },
                     {
                       "kind": "GridLayoutItem",
                       "spec": {

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

@@ -77,12 +77,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -171,13 +172,14 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -193,7 +195,8 @@
                 "shape": "gauge",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": true
+                "sparkline": true,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -269,13 +272,14 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -291,7 +295,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -368,13 +373,15 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "sparkline": false,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -390,7 +397,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -467,13 +475,14 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.84,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -489,7 +498,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -565,13 +575,14 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.66,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -587,7 +598,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -663,12 +675,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.1,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -757,12 +770,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.32,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -851,12 +865,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.57,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -945,12 +960,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.8,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1039,12 +1055,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1133,12 +1150,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1223,12 +1241,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1317,12 +1336,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1411,12 +1431,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1505,12 +1526,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1603,12 +1625,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1693,12 +1716,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1787,12 +1811,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1885,12 +1910,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1983,12 +2009,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2085,12 +2112,108 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": false
+                },
+                "orientation": "auto",
+                "reduceOptions": {
+                  "calcs": [
+                    "lastNotNull"
+                  ],
+                  "fields": "",
+                  "values": false
+                },
+                "segmentCount": 1,
+                "segmentSpacing": 0.3,
+                "shape": "circle",
+                "showThresholdLabels": false,
+                "showThresholdMarkers": false,
+                "sparkline": false
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "min": 0,
+                  "max": 100,
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "thresholds"
+                  }
+                },
+                "overrides": []
+              }
+            }
+          }
+        }
+      },
+      "panel-5": {
+        "kind": "Panel",
+        "spec": {
+          "id": 5,
+          "title": "Spotlight",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "DataQuery",
+                      "group": "grafana-testdata-datasource",
+                      "version": "v0",
+                      "spec": {
+                        "alias": "1",
+                        "max": 100,
+                        "min": 1,
+                        "noise": 22,
+                        "scenarioId": "random_walk",
+                        "spread": 22,
+                        "startValue": 1
+                      }
+                    },
+                    "refId": "A",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {
+                "maxDataPoints": 20
+              }
+            }
+          },
+          "vizConfig": {
+            "kind": "VizConfig",
+            "group": "radialbar",
+            "version": "13.0.0-pre",
+            "spec": {
+              "options": {
+                "barWidthFactor": 0.4,
+                "effects": {
+                  "barGlow": true,
+                  "centerGlow": true,
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2179,12 +2302,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": true,
+                  "spotlight": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2273,15 +2397,15 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
-                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true
+                  "gradient": true,
+                  "rounded": true,
+                  "spotlight": true
                 },
-                "endpointMarker": "glow",
                 "glow": "both",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2296,7 +2420,8 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false
+                "sparkline": false,
+                "spotlight": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -2380,6 +2505,19 @@
                         }
                       }
                     },
+                    {
+                      "kind": "GridLayoutItem",
+                      "spec": {
+                        "x": 12,
+                        "y": 0,
+                        "width": 4,
+                        "height": 6,
+                        "element": {
+                          "kind": "ElementReference",
+                          "name": "panel-5"
+                        }
+                      }
+                    },
                     {
                       "kind": "GridLayoutItem",
                       "spec": {

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

@@ -961,7 +961,9 @@
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false
+            "gradient": false,
+            "rounded": false,
+            "spotlight": false
           },
           "orientation": "auto",
           "reduceOptions": {

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

@@ -864,7 +864,9 @@
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {

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

@@ -901,7 +901,9 @@
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false
+                  "gradient": false,
+                  "rounded": false,
+                  "spotlight": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {

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

@@ -412,17 +412,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Should be a long line connecting the null region in the `connected`  mode, and in zero it should just be a line with zero value at the null points. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -466,17 +456,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking values on top of nulls, should treat the null values as zero. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -520,17 +500,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking when all values are null should leave a gap in the graph",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1711,17 +1681,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2101,17 +2061,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Just verify that the tooltip time has millisecond resolution ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2155,17 +2105,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Verify that axis labels look ok",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -429,17 +429,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Should be a long line connecting the null region in the `connected`  mode, and in zero it should just be a line with zero value at the null points. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -485,17 +475,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking values on top of nulls, should treat the null values as zero. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -541,17 +521,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking when all values are null should leave a gap in the graph",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1809,17 +1779,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2212,17 +2172,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Just verify that the tooltip time has millisecond resolution ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2268,17 +2218,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Verify that axis labels look ok",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -74,44 +74,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -153,46 +116,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {
-                      "cardRound": 50
-                    },
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -234,44 +158,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": true,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -317,46 +204,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "max": "50",
-                      "min": "20",
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -398,44 +246,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 2,
-                      "show": true,
-                      "splitFactor": 2
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -477,44 +288,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 10,
-                      "show": true,
-                      "splitFactor": 5
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -78,44 +78,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -160,46 +123,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {
-                      "cardRound": 50
-                    },
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -244,44 +168,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": true,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -329,46 +216,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "max": "50",
-                      "min": "20",
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -413,44 +261,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 2,
-                      "show": true,
-                      "splitFactor": 2
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -495,44 +306,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 10,
-                      "show": true,
-                      "splitFactor": 5
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.all-panels.v42.v2alpha1.json

@@ -665,42 +665,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": false
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.all-panels.v42.v2beta1.json

@@ -691,42 +691,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": false
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.home.v42.v2alpha1.json

@@ -56,14 +56,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "panel-tests"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -102,15 +94,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -150,15 +133,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "templating",
-                      "gdev"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -198,15 +172,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "datasource-test"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -246,12 +211,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": []
-                  }
-                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -288,15 +247,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.home.v42.v2beta1.json

@@ -58,14 +58,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "panel-tests"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -105,15 +97,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -154,15 +137,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "templating",
-                      "gdev"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -203,15 +177,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "datasource-test"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -252,12 +217,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": []
-                  }
-                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -295,15 +254,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,

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/testdata/output/v1beta1.groupby.v0alpha1.json

@@ -1,172 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "groupby-test"
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "test-uid"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "barWidthFactor": 0.6,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "showValues": false,
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "hideZeros": false,
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "pluginVersion": "12.4.0-pre",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-uid"
-            },
-            "editorMode": "code",
-            "expr": "sum(counters_requests)",
-            "legendFormat": "__auto",
-            "range": true,
-            "refId": "A"
-          }
-        ],
-        "title": "works with group by var",
-        "type": "timeseries"
-      }
-    ],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": [
-        {
-          "current": {
-            "text": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ],
-            "value": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ]
-          },
-          "datasource": {
-            "type": "prometheus",
-            "uid": "test-uid"
-          },
-          "name": "Group by",
-          "type": "groupby"
-        }
-      ]
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "groupby test",
-    "weekStart": ""
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.groupby.v2alpha1.json

@@ -1,229 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "groupby-test"
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "query": {
-            "kind": "grafana",
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "works with group by var",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "editorMode": "code",
-                        "expr": "sum(counters_requests)",
-                        "legendFormat": "__auto",
-                        "range": true
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "test-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "timeseries",
-            "spec": {
-              "pluginVersion": "12.4.0-pre",
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-2"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "groupby test",
-    "variables": [
-      {
-        "kind": "GroupByVariable",
-        "spec": {
-          "name": "Group by",
-          "datasource": {
-            "type": "prometheus",
-            "uid": "test-uid"
-          },
-          "current": {
-            "text": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ],
-            "value": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ]
-          },
-          "options": [],
-          "multi": true,
-          "hide": "dontHide",
-          "skipUrlSync": false
-        }
-      }
-    ]
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.groupby.v2beta1.json

@@ -1,232 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "metadata": {
-    "name": "groupby-test"
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "query": {
-            "kind": "DataQuery",
-            "group": "grafana",
-            "version": "v0",
-            "datasource": {
-              "name": "-- Grafana --"
-            },
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "works with group by var",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "test-uid"
-                      },
-                      "spec": {
-                        "editorMode": "code",
-                        "expr": "sum(counters_requests)",
-                        "legendFormat": "__auto",
-                        "range": true
-                      }
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-2"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "groupby test",
-    "variables": [
-      {
-        "kind": "GroupByVariable",
-        "group": "prometheus",
-        "datasource": {
-          "name": "test-uid"
-        },
-        "spec": {
-          "name": "Group by",
-          "current": {
-            "text": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ],
-            "value": [
-              "a_legacy_label",
-              "app",
-              "exported_instance",
-              "exported_job"
-            ]
-          },
-          "options": [],
-          "multi": true,
-          "hide": "dontHide",
-          "skipUrlSync": false
-        }
-      }
-    ]
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v0alpha1.json

@@ -1,161 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 288,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "gdev-testdata"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "barWidthFactor": 0.6,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "showValues": false,
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "hideZeros": false,
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "pluginVersion": "12.4.0-pre",
-        "targets": [
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          },
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          }
-        ],
-        "title": "New panel",
-        "type": "timeseries"
-      }
-    ],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "Panel ds inheritance ",
-    "uid": "ad5vfcn",
-    "version": 2
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v2alpha1.json

@@ -1,227 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "query": {
-            "kind": "grafana",
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "New panel",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "testdata",
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "datasource": {
-                      "type": "testdata",
-                      "uid": "gdev-testdata"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                },
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "testdata",
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "datasource": {
-                      "type": "testdata",
-                      "uid": "gdev-testdata"
-                    },
-                    "refId": "B",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "timeseries",
-            "spec": {
-              "pluginVersion": "12.4.0-pre",
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "Panel ds inheritance ",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v2beta1.json

@@ -1,231 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "query": {
-            "kind": "DataQuery",
-            "group": "grafana",
-            "version": "v0",
-            "datasource": {
-              "name": "-- Grafana --"
-            },
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "New panel",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "testdata",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "gdev-testdata"
-                      },
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                },
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "testdata",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "gdev-testdata"
-                      },
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "refId": "B",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "Panel ds inheritance ",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

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

@@ -2,7 +2,6 @@ package conversion
 
 import (
 	"context"
-	"strings"
 
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apiserver/pkg/endpoints/request"
@@ -80,57 +79,5 @@ func ConvertDashboard_V0_to_V1beta1(in *dashv0.Dashboard, out *dashv1.Dashboard,
 		return schemaversion.NewMigrationError(err.Error(), schemaversion.GetSchemaVersion(in.Spec.Object), schemaversion.LATEST_VERSION, "Convert_V0_to_V1")
 	}
 
-	// Normalize template variable datasources from string to object format
-	// This handles legacy dashboards where query variables have datasource: "$datasource" (string)
-	// instead of datasource: { uid: "$datasource" } (object)
-	// our migration pipeline in v36 doesn't address because this was not addressed historically
-	// in DashboardMigrator - see public/app/features/dashboard/state/DashboardMigrator.ts#L607
-	// Which means that we have schemaVersion: 42 dashboards where datasource variable references are still strings
-	normalizeTemplateVariableDatasources(out.Spec.Object)
-
 	return nil
 }
-
-// normalizeTemplateVariableDatasources converts template variable string datasources to object format.
-// Legacy dashboards may have query variables with datasource: "$datasource" (string).
-// This normalizes them to datasource: { uid: "$datasource" } for consistent V1→V2 conversion.
-func normalizeTemplateVariableDatasources(dashboard map[string]interface{}) {
-	templating, ok := dashboard["templating"].(map[string]interface{})
-	if !ok {
-		return
-	}
-
-	list, ok := templating["list"].([]interface{})
-	if !ok {
-		return
-	}
-
-	for _, variable := range list {
-		varMap, ok := variable.(map[string]interface{})
-		if !ok {
-			continue
-		}
-
-		varType, _ := varMap["type"].(string)
-		if varType != "query" {
-			continue
-		}
-
-		ds := varMap["datasource"]
-		if dsStr, ok := ds.(string); ok && isTemplateVariableRef(dsStr) {
-			// Convert string template variable reference to object format
-			varMap["datasource"] = map[string]interface{}{
-				"uid": dsStr,
-			}
-		}
-	}
-}
-
-// isTemplateVariableRef checks if a string is a Grafana template variable reference.
-// Template variables can be in the form: $varname or ${varname}
-func isTemplateVariableRef(s string) bool {
-	if s == "" {
-		return false
-	}
-	return strings.HasPrefix(s, "$") || strings.HasPrefix(s, "${")
-}

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
 					}
 				}
 
@@ -1216,10 +1185,6 @@ func buildQueryVariable(ctx context.Context, varMap map[string]interface{}, comm
 			// If no UID and no type, use default
 			datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 		}
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -1567,10 +1532,6 @@ func buildAdhocVariable(ctx context.Context, varMap map[string]interface{}, comm
 			// If no UID and no type, use default
 			datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 		}
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -1748,10 +1709,6 @@ func buildGroupByVariable(ctx context.Context, varMap map[string]interface{}, co
 
 		// Resolve Grafana datasource UID when type is "datasource" and UID is empty
 		datasourceUID = resolveGrafanaDatasourceUID(datasourceType, datasourceUID)
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -1765,9 +1722,7 @@ func buildGroupByVariable(ctx context.Context, varMap map[string]interface{}, co
 			Hide:        commonProps.Hide,
 			SkipUrlSync: commonProps.SkipUrlSync,
 			Current:     buildVariableCurrent(varMap["current"]),
-			// We set it to true by default because GroupByVariable
-			// constructor defaults to multi: true
-			Multi: getBoolField(varMap, "multi", true),
+			Multi:       getBoolField(varMap, "multi", false),
 		},
 	}
 
@@ -2051,28 +2006,6 @@ func transformPanelQueries(ctx context.Context, panelMap map[string]interface{},
 		}
 	}
 
-	// Ensure each target has a non-empty refId. We only fill missing refIds;
-	existingRefIds := make(map[string]bool)
-	for _, target := range targets {
-		if targetMap, ok := target.(map[string]interface{}); ok {
-			if refId := schemaversion.GetStringValue(targetMap, "refId"); refId != "" {
-				existingRefIds[refId] = true
-			}
-		}
-	}
-	for _, target := range targets {
-		targetMap, ok := target.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		refId := schemaversion.GetStringValue(targetMap, "refId")
-		if refId == "" {
-			refId = nextAvailableRefId(existingRefIds)
-			targetMap["refId"] = refId
-			existingRefIds[refId] = true
-		}
-	}
-
 	queries := make([]dashv2alpha1.DashboardPanelQueryKind, 0, len(targets))
 
 	for _, target := range targets {
@@ -2085,27 +2018,6 @@ func transformPanelQueries(ctx context.Context, panelMap map[string]interface{},
 	return queries
 }
 
-// nextAvailableRefId returns the next unused refId using the same sequence as the
-// frontend helper (A, B, ..., Z, AA, AB, ...).
-func nextAvailableRefId(existing map[string]bool) string {
-	const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-	var refIdFromIndex func(num int) string
-	refIdFromIndex = func(num int) string {
-		if num < len(letters) {
-			return string(letters[num])
-		}
-		return refIdFromIndex(num/len(letters)-1) + string(letters[num%len(letters)])
-	}
-
-	for i := 0; ; i++ {
-		refId := refIdFromIndex(i)
-		if !existing[refId] {
-			return refId
-		}
-	}
-}
-
 func transformSingleQuery(ctx context.Context, targetMap map[string]interface{}, panelDatasource *dashv2alpha1.DashboardDataSourceRef, dsIndexProvider schemaversion.DataSourceIndexProvider) dashv2alpha1.DashboardPanelQueryKind {
 	refId := schemaversion.GetStringValue(targetMap, "refId", "A")
 	if refId == "" {
@@ -2270,7 +2182,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)
@@ -2341,33 +2253,23 @@ func buildVizConfig(panelMap map[string]interface{}) dashv2alpha1.DashboardVizCo
 	// We check two cases:
 	// 1. Panel already has autoMigrateFrom set (from v0→v1 migration) - panel type already converted
 	// 2. Panel type is a known Angular panel - need to convert type AND set autoMigrateFrom
-	// 3. Panel has original options - need to set autoMigrateFrom and originalOptions
 	autoMigrateFrom, hasAutoMigrateFrom := panelMap["autoMigrateFrom"].(string)
-	originalOptions := extractAngularOptions(panelMap)
 
 	if !hasAutoMigrateFrom || autoMigrateFrom == "" {
 		// Check if panel type is an Angular type that needs migration
 		if newType := getAngularPanelMigration(panelType, panelMap); newType != "" {
 			autoMigrateFrom = panelType // Original Angular type
 			panelType = newType         // New modern type
-		} else if len(originalOptions) > 0 {
-			autoMigrateFrom = panelType
 		}
 	}
 
 	if autoMigrateFrom != "" {
 		options["__angularMigration"] = map[string]interface{}{
 			"autoMigrateFrom": autoMigrateFrom,
-			"originalOptions": originalOptions,
+			"originalOptions": extractAngularOptions(panelMap),
 		}
 	}
 
-	// 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 +2413,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 +2701,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/conversion/v1beta1_to_v2alpha1_test.go

@@ -210,48 +210,6 @@ func TestV1beta1ToV2alpha1(t *testing.T) {
 				assert.Equal(t, "", query.Spec.Query.Kind, "Query kind should be empty when datasource is empty object {}")
 			},
 		},
-		{
-			name: "missing refIds are assigned while existing refIds are preserved",
-			createV1beta1: func() *dashv1.Dashboard {
-				return &dashv1.Dashboard{
-					Spec: dashv1.DashboardSpec{
-						Object: map[string]interface{}{
-							"title": "Test Dashboard",
-							"panels": []interface{}{
-								map[string]interface{}{
-									"id":   1,
-									"type": "bargauge",
-									"targets": []interface{}{
-										map[string]interface{}{
-											"refId":      "",
-											"scenarioId": "random_walk",
-										},
-										map[string]interface{}{
-											"refId":      "A",
-											"scenarioId": "random_walk",
-										},
-										map[string]interface{}{
-											"refId":      "",
-											"scenarioId": "random_walk",
-										},
-									},
-								},
-							},
-						},
-					},
-				}
-			},
-			validateV2alpha1: func(t *testing.T, v2alpha1 *dashv2alpha1.Dashboard) {
-				require.NotNil(t, v2alpha1.Spec.Elements["panel-1"])
-				panel := v2alpha1.Spec.Elements["panel-1"].PanelKind
-				require.NotNil(t, panel)
-
-				require.Len(t, panel.Spec.Data.Spec.Queries, 3)
-				assert.Equal(t, "B", panel.Spec.Data.Spec.Queries[0].Spec.RefId)
-				assert.Equal(t, "A", panel.Spec.Data.Spec.Queries[1].Spec.RefId)
-				assert.Equal(t, "C", panel.Spec.Data.Spec.Queries[2].Spec.RefId)
-			},
-		},
 	}
 
 	for _, tt := range testCases {

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/migrations/migrations.v42.json

@@ -290,7 +290,6 @@
       }
     },
     {
-      "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
       "datasource": {
         "type": "grafana-testdata-datasource"
       },
@@ -301,7 +300,15 @@
         "y": 0
       },
       "id": 6,
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

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

@@ -75,9 +75,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -153,9 +154,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -231,9 +233,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -302,6 +305,85 @@
         "x": 12,
         "y": 1
       },
+      "id": 5,
+      "maxDataPoints": 20,
+      "options": {
+        "barWidthFactor": 0.4,
+        "effects": {
+          "barGlow": true,
+          "centerGlow": true,
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
+        },
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "circle",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sparkline": false
+      },
+      "pluginVersion": "13.0.0-pre",
+      "targets": [
+        {
+          "alias": "1",
+          "datasource": {
+            "type": "grafana-testdata-datasource"
+          },
+          "max": 100,
+          "min": 1,
+          "noise": 22,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "spread": 22,
+          "startValue": 1
+        }
+      ],
+      "title": "Spotlight",
+      "type": "radialbar"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 4,
+        "x": 16,
+        "y": 1
+      },
       "id": 8,
       "maxDataPoints": 20,
       "options": {
@@ -309,9 +391,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -377,8 +460,8 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 16,
-        "y": 1
+        "x": 0,
+        "y": 7
       },
       "id": 22,
       "maxDataPoints": 20,
@@ -387,9 +470,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -455,8 +539,8 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 20,
-        "y": 1
+        "x": 4,
+        "y": 7
       },
       "id": 23,
       "maxDataPoints": 20,
@@ -465,9 +549,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": true
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -508,7 +593,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 7
+        "y": 13
       },
       "id": 17,
       "panels": [],
@@ -545,9 +630,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
+        "w": 5,
         "x": 0,
-        "y": 8
+        "y": 14
       },
       "id": 18,
       "maxDataPoints": 20,
@@ -556,9 +641,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -623,9 +709,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 4,
-        "y": 8
+        "w": 5,
+        "x": 5,
+        "y": 14
       },
       "id": 19,
       "maxDataPoints": 20,
@@ -634,9 +720,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -701,9 +788,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 8,
-        "y": 8
+        "w": 5,
+        "x": 10,
+        "y": 14
       },
       "id": 20,
       "maxDataPoints": 20,
@@ -712,9 +799,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -779,9 +867,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 12,
-        "y": 8
+        "w": 5,
+        "x": 15,
+        "y": 14
       },
       "id": 21,
       "maxDataPoints": 20,
@@ -790,9 +878,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -833,7 +922,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 14
+        "y": 20
       },
       "id": 24,
       "panels": [],
@@ -874,9 +963,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
+        "w": 6,
         "x": 0,
-        "y": 15
+        "y": 21
       },
       "id": 25,
       "maxDataPoints": 20,
@@ -885,9 +974,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -952,9 +1042,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 4,
-        "y": 15
+        "w": 6,
+        "x": 6,
+        "y": 21
       },
       "id": 26,
       "maxDataPoints": 20,
@@ -963,9 +1053,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1030,9 +1121,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 8,
-        "y": 15
+        "w": 5,
+        "x": 12,
+        "y": 21
       },
       "id": 29,
       "maxDataPoints": 20,
@@ -1041,9 +1132,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1107,10 +1199,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 4,
-        "x": 12,
-        "y": 15
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 27
       },
       "id": 30,
       "maxDataPoints": 20,
@@ -1119,9 +1211,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1185,10 +1278,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 4,
-        "x": 16,
-        "y": 15
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 27
       },
       "id": 28,
       "maxDataPoints": 20,
@@ -1197,9 +1290,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1236,7 +1330,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 21
+        "y": 34
       },
       "id": 31,
       "panels": [],
@@ -1283,7 +1377,7 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 22
+        "y": 35
       },
       "id": 32,
       "maxDataPoints": 20,
@@ -1292,9 +1386,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1365,7 +1460,7 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 22
+        "y": 35
       },
       "id": 34,
       "maxDataPoints": 20,
@@ -1374,9 +1469,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1447,7 +1543,7 @@
         "h": 10,
         "w": 6,
         "x": 14,
-        "y": 22
+        "y": 35
       },
       "id": 33,
       "maxDataPoints": 20,
@@ -1456,9 +1552,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1495,7 +1592,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 45
       },
       "id": 6,
       "panels": [],
@@ -1536,20 +1633,20 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 33
+        "y": 46
       },
       "id": 9,
       "maxDataPoints": 20,
       "options": {
         "barWidth": 12,
         "barWidthFactor": 0.4,
-        "barShape": "rounded",
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "endpointMarker": "glow",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1564,7 +1661,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1619,7 +1717,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 39
+        "y": 52
       },
       "id": 11,
       "maxDataPoints": 20,
@@ -1629,9 +1727,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1646,7 +1745,8 @@
         "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": true
+        "sparkline": true,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1673,7 +1773,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 45
+        "y": 58
       },
       "id": 12,
       "panels": [],
@@ -1715,7 +1815,7 @@
         "h": 7,
         "w": 4,
         "x": 0,
-        "y": 46
+        "y": 59
       },
       "id": 13,
       "maxDataPoints": 20,
@@ -1725,9 +1825,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1742,7 +1843,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1760,22 +1862,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"
     },
@@ -1814,7 +1900,7 @@
         "h": 7,
         "w": 5,
         "x": 4,
-        "y": 46
+        "y": 59
       },
       "id": 14,
       "maxDataPoints": 20,
@@ -1824,9 +1910,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1841,7 +1928,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1859,22 +1947,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"
     },
@@ -1912,7 +1984,7 @@
         "h": 7,
         "w": 5,
         "x": 9,
-        "y": 46
+        "y": 59
       },
       "id": 15,
       "maxDataPoints": 20,
@@ -1922,9 +1994,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1939,7 +2012,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1994,7 +2068,7 @@
         "h": 7,
         "w": 6,
         "x": 14,
-        "y": 46
+        "y": 59
       },
       "id": 16,
       "maxDataPoints": 20,
@@ -2004,9 +2078,10 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2021,7 +2096,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2048,7 +2124,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 53
+        "y": 66
       },
       "id": 35,
       "panels": [],
@@ -2079,10 +2155,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 12,
+        "h": 8,
+        "w": 6,
         "x": 0,
-        "y": 54
+        "y": 67
       },
       "id": 36,
       "options": {
@@ -2090,9 +2166,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -2146,10 +2223,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 54
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 67
       },
       "id": 37,
       "options": {
@@ -2157,9 +2234,10 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
-        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -2201,4 +2279,4 @@
   "title": "Panel tests - Gauge (new)",
   "uid": "panel-tests-gauge-new",
   "weekStart": ""
-}
+}

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",
@@ -956,7 +955,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1161,4 +1162,4 @@
   "title": "Panel tests - Old gauge to new",
   "uid": "panel-tests-old-gauge-to-new",
   "weekStart": ""
-}
+}

apps/dashboard/pkg/migration/testdata/input/v15.mimir_rollout_debugging.json

@@ -654,9 +654,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -679,9 +677,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

apps/dashboard/pkg/migration/testdata/output/latest_version/v15.mimir_rollout_debugging.v42.json

@@ -737,9 +737,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -760,9 +758,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

apps/dashboard/pkg/migration/testdata/output/single_version/v15.mimir_rollout_debugging.v15.json

@@ -717,9 +717,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -741,9 +739,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

apps/iam/go.mod

@@ -89,7 +89,6 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/IBM/pgxpoolprometheus v1.1.2 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
@@ -224,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

@@ -167,8 +167,6 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/IBM/pgxpoolprometheus v1.1.2 h1:sHJwxoL5Lw4R79Zt+H4Uj1zZ4iqXJLdk7XDE7TPs97U=
 github.com/IBM/pgxpoolprometheus v1.1.2/go.mod h1:+vWzISN6S9ssgurhUNmm6AlXL9XLah3TdWJktquKTR8=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -829,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

@@ -23,7 +23,6 @@ require (
 
 require (
 	cel.dev/expr v0.25.1 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -91,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
@@ -192,6 +191,7 @@ require (
 	go.opentelemetry.io/contrib/propagators/jaeger v1.38.0 // indirect
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.32.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect

apps/plugins/go.sum

@@ -7,8 +7,6 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
@@ -215,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=
@@ -543,6 +541,8 @@ go.opentelemetry.io/contrib/samplers/jaegerremote v0.32.0/go.mod h1:B9Oka5QVD0bn
 go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
 go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
 go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
+go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 h1:in9O8ESIOlwJAEGTkkf34DesGRAc/Pn8qJ7k3r/42LM=

apps/provisioning/pkg/auth/access_checker.go

@@ -1,22 +0,0 @@
-package auth
-
-import (
-	"context"
-
-	authlib "github.com/grafana/authlib/types"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-)
-
-//go:generate mockery --name AccessChecker --structname MockAccessChecker --inpackage --filename access_checker_mock.go --with-expecter
-
-// AccessChecker provides access control checks with optional role-based fallback.
-type AccessChecker interface {
-	// Check performs an access check and returns nil if allowed, or an appropriate
-	// API error if denied. If req.Namespace is empty, it will be filled from the
-	// identity's namespace.
-	Check(ctx context.Context, req authlib.CheckRequest, folder string) error
-
-	// WithFallbackRole returns an AccessChecker configured with the specified fallback role.
-	// Whether the fallback is actually applied depends on the implementation.
-	WithFallbackRole(role identity.RoleType) AccessChecker
-}

apps/provisioning/pkg/auth/access_checker_mock.go

@@ -1,135 +0,0 @@
-// Code generated by mockery v2.53.4. DO NOT EDIT.
-
-package auth
-
-import (
-	context "context"
-
-	identity "github.com/grafana/grafana/pkg/apimachinery/identity"
-	mock "github.com/stretchr/testify/mock"
-
-	types "github.com/grafana/authlib/types"
-)
-
-// MockAccessChecker is an autogenerated mock type for the AccessChecker type
-type MockAccessChecker struct {
-	mock.Mock
-}
-
-type MockAccessChecker_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockAccessChecker) EXPECT() *MockAccessChecker_Expecter {
-	return &MockAccessChecker_Expecter{mock: &_m.Mock}
-}
-
-// Check provides a mock function with given fields: ctx, req, folder
-func (_m *MockAccessChecker) Check(ctx context.Context, req types.CheckRequest, folder string) error {
-	ret := _m.Called(ctx, req, folder)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Check")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, types.CheckRequest, string) error); ok {
-		r0 = rf(ctx, req, folder)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// MockAccessChecker_Check_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Check'
-type MockAccessChecker_Check_Call struct {
-	*mock.Call
-}
-
-// Check is a helper method to define mock.On call
-//   - ctx context.Context
-//   - req types.CheckRequest
-//   - folder string
-func (_e *MockAccessChecker_Expecter) Check(ctx interface{}, req interface{}, folder interface{}) *MockAccessChecker_Check_Call {
-	return &MockAccessChecker_Check_Call{Call: _e.mock.On("Check", ctx, req, folder)}
-}
-
-func (_c *MockAccessChecker_Check_Call) Run(run func(ctx context.Context, req types.CheckRequest, folder string)) *MockAccessChecker_Check_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(types.CheckRequest), args[2].(string))
-	})
-	return _c
-}
-
-func (_c *MockAccessChecker_Check_Call) Return(_a0 error) *MockAccessChecker_Check_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockAccessChecker_Check_Call) RunAndReturn(run func(context.Context, types.CheckRequest, string) error) *MockAccessChecker_Check_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// WithFallbackRole provides a mock function with given fields: role
-func (_m *MockAccessChecker) WithFallbackRole(role identity.RoleType) AccessChecker {
-	ret := _m.Called(role)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WithFallbackRole")
-	}
-
-	var r0 AccessChecker
-	if rf, ok := ret.Get(0).(func(identity.RoleType) AccessChecker); ok {
-		r0 = rf(role)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(AccessChecker)
-		}
-	}
-
-	return r0
-}
-
-// MockAccessChecker_WithFallbackRole_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'WithFallbackRole'
-type MockAccessChecker_WithFallbackRole_Call struct {
-	*mock.Call
-}
-
-// WithFallbackRole is a helper method to define mock.On call
-//   - role identity.RoleType
-func (_e *MockAccessChecker_Expecter) WithFallbackRole(role interface{}) *MockAccessChecker_WithFallbackRole_Call {
-	return &MockAccessChecker_WithFallbackRole_Call{Call: _e.mock.On("WithFallbackRole", role)}
-}
-
-func (_c *MockAccessChecker_WithFallbackRole_Call) Run(run func(role identity.RoleType)) *MockAccessChecker_WithFallbackRole_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(identity.RoleType))
-	})
-	return _c
-}
-
-func (_c *MockAccessChecker_WithFallbackRole_Call) Return(_a0 AccessChecker) *MockAccessChecker_WithFallbackRole_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockAccessChecker_WithFallbackRole_Call) RunAndReturn(run func(identity.RoleType) AccessChecker) *MockAccessChecker_WithFallbackRole_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewMockAccessChecker creates a new instance of MockAccessChecker. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockAccessChecker(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockAccessChecker {
-	mock := &MockAccessChecker{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}

apps/provisioning/pkg/auth/round_tripper.go

@@ -1,4 +1,3 @@
-// Package auth provides authentication utilities for the provisioning API.
 package auth
 
 import (
@@ -7,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/grafana/authlib/authn"
+	"github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 )
 
@@ -15,61 +15,29 @@ type tokenExchanger interface {
 	Exchange(ctx context.Context, req authn.TokenExchangeRequest) (*authn.TokenExchangeResponse, error)
 }
 
-// RoundTripperOption configures optional behavior for the RoundTripper.
-type RoundTripperOption func(*RoundTripper)
-
-// ExtraAudience appends an additional audience to the token exchange request.
-//
-// This is primarily used by operators connecting to the multitenant aggregator,
-// where the token must include both the target API server's audience (e.g., dashboards,
-// folders) and the provisioning group audience. The provisioning group audience is
-// required so that the token passes the enforceManagerProperties check, which prevents
-// unauthorized updates to provisioned resources.
-//
-// Example:
-//
-//	authrt.NewRoundTripper(client, rt, "dashboards.grafana.app", authrt.ExtraAudience("provisioning.grafana.app"))
-func ExtraAudience(audience string) RoundTripperOption {
-	return func(rt *RoundTripper) {
-		rt.extraAudience = audience
-	}
-}
-
-// RoundTripper is an http.RoundTripper that performs token exchange before each request.
-// It exchanges the service's credentials for an access token scoped to the configured
-// audience(s), then injects that token into the outgoing request's X-Access-Token header.
+// RoundTripper injects an exchanged access token for the provisioning API into outgoing requests.
 type RoundTripper struct {
-	client        tokenExchanger
-	transport     http.RoundTripper
-	audience      string
-	extraAudience string
+	client    tokenExchanger
+	transport http.RoundTripper
+	audience  string
 }
 
-// NewRoundTripper creates a RoundTripper that exchanges tokens for each outgoing request.
-//
-// Parameters:
-//   - tokenExchangeClient: the client used to exchange credentials for access tokens
-//   - base: the underlying transport to delegate requests to after token injection
-//   - audience: the primary audience for the token (typically the target API server's group)
-//   - opts: optional configuration (e.g., ExtraAudience to include additional audiences)
-func NewRoundTripper(tokenExchangeClient tokenExchanger, base http.RoundTripper, audience string, opts ...RoundTripperOption) *RoundTripper {
-	rt := &RoundTripper{
+// NewRoundTripper constructs a RoundTripper that exchanges the provided token per request
+// and forwards the request to the provided base transport.
+func NewRoundTripper(tokenExchangeClient tokenExchanger, base http.RoundTripper, audience string) *RoundTripper {
+	return &RoundTripper{
 		client:    tokenExchangeClient,
 		transport: base,
 		audience:  audience,
 	}
-	for _, opt := range opts {
-		opt(rt)
-	}
-	return rt
 }
 
-// RoundTrip exchanges credentials for an access token and injects it into the request.
-// The token is scoped to all configured audiences and the wildcard namespace ("*").
 func (t *RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	// when we want to write resources with the provisioning API, the audience needs to include provisioning
+	// so that it passes the check in enforceManagerProperties, which prevents others from updating provisioned resources
 	audiences := []string{t.audience}
-	if t.extraAudience != "" && t.extraAudience != t.audience {
-		audiences = append(audiences, t.extraAudience)
+	if t.audience != v0alpha1.GROUP {
+		audiences = append(audiences, v0alpha1.GROUP)
 	}
 
 	tokenResponse, err := t.client.Exchange(req.Context(), authn.TokenExchangeRequest{

apps/provisioning/pkg/auth/round_tripper_test.go

@@ -71,29 +71,16 @@ func TestRoundTripper_AudiencesAndNamespace(t *testing.T) {
 	tests := []struct {
 		name          string
 		audience      string
-		extraAudience string
 		wantAudiences []string
 	}{
 		{
-			name:          "uses only provided audience by default",
+			name:          "adds group when custom audience",
 			audience:      "example-audience",
-			wantAudiences: []string{"example-audience"},
-		},
-		{
-			name:          "uses only group audience by default",
-			audience:      v0alpha1.GROUP,
-			wantAudiences: []string{v0alpha1.GROUP},
-		},
-		{
-			name:          "extra audience adds provisioning group",
-			audience:      "example-audience",
-			extraAudience: v0alpha1.GROUP,
 			wantAudiences: []string{"example-audience", v0alpha1.GROUP},
 		},
 		{
-			name:          "extra audience no duplicate when same as primary",
+			name:          "no duplicate when group audience",
 			audience:      v0alpha1.GROUP,
-			extraAudience: v0alpha1.GROUP,
 			wantAudiences: []string{v0alpha1.GROUP},
 		},
 	}
@@ -101,15 +88,11 @@ func TestRoundTripper_AudiencesAndNamespace(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			fx := &fakeExchanger{resp: &authn.TokenExchangeResponse{Token: "abc123"}}
-			var opts []RoundTripperOption
-			if tt.extraAudience != "" {
-				opts = append(opts, ExtraAudience(tt.extraAudience))
-			}
 			tr := NewRoundTripper(fx, roundTripperFunc(func(_ *http.Request) (*http.Response, error) {
 				rr := httptest.NewRecorder()
 				rr.WriteHeader(http.StatusOK)
 				return rr.Result(), nil
-			}), tt.audience, opts...)
+			}), tt.audience)
 
 			req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://example", nil)
 			resp, err := tr.RoundTrip(req)

apps/provisioning/pkg/auth/session_access_checker.go

@@ -1,153 +0,0 @@
-package auth
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	authlib "github.com/grafana/authlib/types"
-	"github.com/grafana/grafana-app-sdk/logging"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-)
-
-// sessionAccessChecker implements AccessChecker using Grafana session identity.
-type sessionAccessChecker struct {
-	inner        authlib.AccessChecker
-	fallbackRole identity.RoleType
-}
-
-// NewSessionAccessChecker creates an AccessChecker that gets identity from Grafana
-// sessions via GetRequester(ctx). Supports optional role-based fallback via
-// WithFallbackRole for backwards compatibility.
-func NewSessionAccessChecker(inner authlib.AccessChecker) AccessChecker {
-	return &sessionAccessChecker{
-		inner:        inner,
-		fallbackRole: "",
-	}
-}
-
-// WithFallbackRole returns a new AccessChecker with the specified fallback role.
-func (c *sessionAccessChecker) WithFallbackRole(role identity.RoleType) AccessChecker {
-	return &sessionAccessChecker{
-		inner:        c.inner,
-		fallbackRole: role,
-	}
-}
-
-// Check performs an access check with optional role-based fallback.
-// Returns nil if access is allowed, or an appropriate API error if denied.
-func (c *sessionAccessChecker) Check(ctx context.Context, req authlib.CheckRequest, folder string) error {
-	logger := logging.FromContext(ctx).With("logger", "sessionAccessChecker")
-
-	// Get identity from Grafana session
-	requester, err := identity.GetRequester(ctx)
-	if err != nil {
-		logger.Debug("failed to get requester",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"error", err.Error(),
-		)
-		return apierrors.NewUnauthorized(fmt.Sprintf("failed to get requester: %v", err))
-	}
-
-	logger.Debug("checking access",
-		"identityType", requester.GetIdentityType(),
-		"orgRole", requester.GetOrgRole(),
-		"namespace", requester.GetNamespace(),
-		"resource", req.Resource,
-		"verb", req.Verb,
-		"group", req.Group,
-		"name", req.Name,
-		"folder", folder,
-		"fallbackRole", c.fallbackRole,
-	)
-
-	// Fill in namespace from identity if not provided
-	if req.Namespace == "" {
-		req.Namespace = requester.GetNamespace()
-	}
-
-	// Perform the access check
-	rsp, err := c.inner.Check(ctx, requester, req, folder)
-
-	// Build the GroupResource for error messages
-	gr := schema.GroupResource{Group: req.Group, Resource: req.Resource}
-
-	// No fallback configured, return result directly
-	if c.fallbackRole == "" {
-		if err != nil {
-			logger.Debug("access check error (no fallback)",
-				"resource", req.Resource,
-				"verb", req.Verb,
-				"error", err.Error(),
-			)
-			return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("%s.%s is forbidden: %w", req.Resource, req.Group, err))
-		}
-		if !rsp.Allowed {
-			logger.Debug("access check denied (no fallback)",
-				"resource", req.Resource,
-				"verb", req.Verb,
-				"group", req.Group,
-				"allowed", rsp.Allowed,
-			)
-			return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("permission denied"))
-		}
-		logger.Debug("access allowed",
-			"resource", req.Resource,
-			"verb", req.Verb,
-		)
-		return nil
-	}
-
-	// Fallback is configured - apply fallback logic
-	if err != nil {
-		if requester.GetOrgRole().Includes(c.fallbackRole) {
-			logger.Debug("access allowed via role fallback (after error)",
-				"resource", req.Resource,
-				"verb", req.Verb,
-				"fallbackRole", c.fallbackRole,
-				"orgRole", requester.GetOrgRole(),
-			)
-			return nil // Fallback succeeded
-		}
-		logger.Debug("access check error (fallback failed)",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"error", err.Error(),
-			"fallbackRole", c.fallbackRole,
-			"orgRole", requester.GetOrgRole(),
-		)
-		return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("%s.%s is forbidden: %w", req.Resource, req.Group, err))
-	}
-
-	if rsp.Allowed {
-		logger.Debug("access allowed",
-			"resource", req.Resource,
-			"verb", req.Verb,
-		)
-		return nil
-	}
-
-	// Fall back to role for backwards compatibility
-	if requester.GetOrgRole().Includes(c.fallbackRole) {
-		logger.Debug("access allowed via role fallback",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"fallbackRole", c.fallbackRole,
-			"orgRole", requester.GetOrgRole(),
-		)
-		return nil // Fallback succeeded
-	}
-
-	logger.Debug("access denied (fallback role not met)",
-		"resource", req.Resource,
-		"verb", req.Verb,
-		"group", req.Group,
-		"fallbackRole", c.fallbackRole,
-		"orgRole", requester.GetOrgRole(),
-	)
-	return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("%s role is required", strings.ToLower(string(c.fallbackRole))))
-}

apps/provisioning/pkg/auth/session_access_checker_test.go

@@ -1,244 +0,0 @@
-package auth
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-
-	authlib "github.com/grafana/authlib/types"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// mockRequester implements identity.Requester for testing.
-type mockRequester struct {
-	identity.Requester
-	orgRole      identity.RoleType
-	identityType authlib.IdentityType
-	namespace    string
-}
-
-func (m *mockRequester) GetOrgRole() identity.RoleType {
-	return m.orgRole
-}
-
-func (m *mockRequester) GetIdentityType() authlib.IdentityType {
-	return m.identityType
-}
-
-func (m *mockRequester) GetNamespace() string {
-	return m.namespace
-}
-
-func TestSessionAccessChecker_Check(t *testing.T) {
-	ctx := context.Background()
-	req := authlib.CheckRequest{
-		Verb:      "get",
-		Group:     "provisioning.grafana.app",
-		Resource:  "repositories",
-		Name:      "test-repo",
-		Namespace: "default",
-	}
-
-	tests := []struct {
-		name          string
-		fallbackRole  identity.RoleType
-		innerResponse authlib.CheckResponse
-		innerErr      error
-		requester     *mockRequester
-		expectAllow   bool
-	}{
-		{
-			name:          "allowed by checker",
-			fallbackRole:  identity.RoleAdmin,
-			innerResponse: authlib.CheckResponse{Allowed: true},
-			requester:     &mockRequester{orgRole: identity.RoleViewer, identityType: authlib.TypeUser},
-			expectAllow:   true,
-		},
-		{
-			name:          "denied by checker, fallback to admin role succeeds",
-			fallbackRole:  identity.RoleAdmin,
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			requester:     &mockRequester{orgRole: identity.RoleAdmin, identityType: authlib.TypeUser},
-			expectAllow:   true,
-		},
-		{
-			name:          "denied by checker, fallback to admin role fails for viewer",
-			fallbackRole:  identity.RoleAdmin,
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			requester:     &mockRequester{orgRole: identity.RoleViewer, identityType: authlib.TypeUser},
-			expectAllow:   false,
-		},
-		{
-			name:         "error from checker, fallback to admin role succeeds",
-			fallbackRole: identity.RoleAdmin,
-			innerErr:     errors.New("access check failed"),
-			requester:    &mockRequester{orgRole: identity.RoleAdmin, identityType: authlib.TypeUser},
-			expectAllow:  true,
-		},
-		{
-			name:         "error from checker, fallback fails for viewer",
-			fallbackRole: identity.RoleAdmin,
-			innerErr:     errors.New("access check failed"),
-			requester:    &mockRequester{orgRole: identity.RoleViewer, identityType: authlib.TypeUser},
-			expectAllow:  false,
-		},
-		{
-			name:          "denied, editor fallback succeeds for editor",
-			fallbackRole:  identity.RoleEditor,
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			requester:     &mockRequester{orgRole: identity.RoleEditor, identityType: authlib.TypeUser},
-			expectAllow:   true,
-		},
-		{
-			name:          "denied, editor fallback fails for viewer",
-			fallbackRole:  identity.RoleEditor,
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			requester:     &mockRequester{orgRole: identity.RoleViewer, identityType: authlib.TypeUser},
-			expectAllow:   false,
-		},
-		{
-			name:          "no fallback configured, denied stays denied",
-			fallbackRole:  "", // no fallback
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			requester:     &mockRequester{orgRole: identity.RoleAdmin, identityType: authlib.TypeUser},
-			expectAllow:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mock := &mockInnerAccessChecker{
-				response: tt.innerResponse,
-				err:      tt.innerErr,
-			}
-
-			checker := NewSessionAccessChecker(mock)
-			if tt.fallbackRole != "" {
-				checker = checker.WithFallbackRole(tt.fallbackRole)
-			}
-
-			// Add requester to context
-			testCtx := identity.WithRequester(ctx, tt.requester)
-
-			err := checker.Check(testCtx, req, "")
-
-			if tt.expectAllow {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				assert.True(t, apierrors.IsForbidden(err), "expected Forbidden error, got: %v", err)
-			}
-		})
-	}
-}
-
-func TestSessionAccessChecker_NoRequester(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: true},
-	}
-
-	checker := NewSessionAccessChecker(mock)
-	err := checker.Check(context.Background(), authlib.CheckRequest{}, "")
-
-	require.Error(t, err)
-	assert.True(t, apierrors.IsUnauthorized(err), "expected Unauthorized error")
-}
-
-func TestSessionAccessChecker_WithFallbackRole_ImmutableOriginal(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: false},
-	}
-
-	original := NewSessionAccessChecker(mock)
-	withAdmin := original.WithFallbackRole(identity.RoleAdmin)
-	withEditor := original.WithFallbackRole(identity.RoleEditor)
-
-	ctx := identity.WithRequester(context.Background(), &mockRequester{
-		orgRole:      identity.RoleEditor,
-		identityType: authlib.TypeUser,
-	})
-
-	req := authlib.CheckRequest{}
-
-	// Original should deny (no fallback)
-	err := original.Check(ctx, req, "")
-	require.Error(t, err, "original should deny without fallback")
-
-	// WithAdmin should deny for editor
-	err = withAdmin.Check(ctx, req, "")
-	require.Error(t, err, "admin fallback should deny for editor")
-
-	// WithEditor should allow for editor
-	err = withEditor.Check(ctx, req, "")
-	require.NoError(t, err, "editor fallback should allow for editor")
-}
-
-func TestSessionAccessChecker_WithFallbackRole_ChainedCalls(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: false},
-	}
-
-	// Ensure chained WithFallbackRole calls work correctly
-	checker := NewSessionAccessChecker(mock).
-		WithFallbackRole(identity.RoleAdmin).
-		WithFallbackRole(identity.RoleEditor) // This should override admin
-
-	ctx := identity.WithRequester(context.Background(), &mockRequester{
-		orgRole:      identity.RoleEditor,
-		identityType: authlib.TypeUser,
-	})
-
-	err := checker.Check(ctx, authlib.CheckRequest{}, "")
-	require.NoError(t, err, "last fallback (editor) should be used")
-}
-
-func TestSessionAccessChecker_RealSignedInUser(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: false},
-	}
-
-	checker := NewSessionAccessChecker(mock).WithFallbackRole(identity.RoleAdmin)
-
-	// Use a real SignedInUser
-	signedInUser := &user.SignedInUser{
-		UserID:  1,
-		OrgID:   1,
-		OrgRole: identity.RoleAdmin,
-	}
-
-	ctx := identity.WithRequester(context.Background(), signedInUser)
-
-	err := checker.Check(ctx, authlib.CheckRequest{}, "")
-	require.NoError(t, err, "admin user should be allowed via fallback")
-}
-
-func TestSessionAccessChecker_FillsNamespace(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: true},
-	}
-
-	checker := NewSessionAccessChecker(mock)
-
-	ctx := identity.WithRequester(context.Background(), &mockRequester{
-		orgRole:      identity.RoleAdmin,
-		identityType: authlib.TypeUser,
-		namespace:    "org-123",
-	})
-
-	// Request without namespace
-	req := authlib.CheckRequest{
-		Verb:     "get",
-		Group:    "provisioning.grafana.app",
-		Resource: "repositories",
-		Name:     "test-repo",
-		// Namespace intentionally empty
-	}
-
-	err := checker.Check(ctx, req, "")
-	require.NoError(t, err)
-}

apps/provisioning/pkg/auth/token_access_checker.go

@@ -1,92 +0,0 @@
-package auth
-
-import (
-	"context"
-	"fmt"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
-	authlib "github.com/grafana/authlib/types"
-	"github.com/grafana/grafana-app-sdk/logging"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-)
-
-// tokenAccessChecker implements AccessChecker using access tokens from context.
-type tokenAccessChecker struct {
-	inner authlib.AccessChecker
-}
-
-// NewTokenAccessChecker creates an AccessChecker that gets identity from access tokens
-// via AuthInfoFrom(ctx). Role-based fallback is not supported.
-func NewTokenAccessChecker(inner authlib.AccessChecker) AccessChecker {
-	return &tokenAccessChecker{inner: inner}
-}
-
-// WithFallbackRole returns the same checker since fallback is not supported.
-func (c *tokenAccessChecker) WithFallbackRole(_ identity.RoleType) AccessChecker {
-	return c
-}
-
-// Check performs an access check using AuthInfo from context.
-// Returns nil if access is allowed, or an appropriate API error if denied.
-func (c *tokenAccessChecker) Check(ctx context.Context, req authlib.CheckRequest, folder string) error {
-	logger := logging.FromContext(ctx).With("logger", "tokenAccessChecker")
-
-	// Get identity from access token in context
-	id, ok := authlib.AuthInfoFrom(ctx)
-	if !ok {
-		logger.Debug("no auth info in context",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"namespace", req.Namespace,
-		)
-		return apierrors.NewUnauthorized("no auth info in context")
-	}
-
-	logger.Debug("checking access",
-		"identityType", id.GetIdentityType(),
-		"namespace", id.GetNamespace(),
-		"resource", req.Resource,
-		"verb", req.Verb,
-		"group", req.Group,
-		"name", req.Name,
-		"folder", folder,
-	)
-
-	// Fill in namespace from identity if not provided
-	if req.Namespace == "" {
-		req.Namespace = id.GetNamespace()
-	}
-
-	// Perform the access check
-	rsp, err := c.inner.Check(ctx, id, req, folder)
-
-	// Build the GroupResource for error messages
-	gr := schema.GroupResource{Group: req.Group, Resource: req.Resource}
-
-	if err != nil {
-		logger.Debug("access check error",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"error", err.Error(),
-		)
-		return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("%s.%s is forbidden: %w", req.Resource, req.Group, err))
-	}
-	if !rsp.Allowed {
-		logger.Debug("access check denied",
-			"resource", req.Resource,
-			"verb", req.Verb,
-			"group", req.Group,
-			"identityType", id.GetIdentityType(),
-			"allowed", rsp.Allowed,
-		)
-		return apierrors.NewForbidden(gr, req.Name, fmt.Errorf("permission denied"))
-	}
-
-	logger.Debug("access allowed",
-		"resource", req.Resource,
-		"verb", req.Verb,
-	)
-	return nil
-}

apps/provisioning/pkg/auth/token_access_checker_test.go

@@ -1,137 +0,0 @@
-package auth
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-
-	authlib "github.com/grafana/authlib/types"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestTokenAccessChecker_Check(t *testing.T) {
-	req := authlib.CheckRequest{
-		Verb:      "get",
-		Group:     "provisioning.grafana.app",
-		Resource:  "repositories",
-		Name:      "test-repo",
-		Namespace: "default",
-	}
-
-	tests := []struct {
-		name          string
-		innerResponse authlib.CheckResponse
-		innerErr      error
-		authInfo      *identity.StaticRequester
-		expectAllow   bool
-	}{
-		{
-			name:          "allowed by checker",
-			innerResponse: authlib.CheckResponse{Allowed: true},
-			authInfo:      &identity.StaticRequester{Type: authlib.TypeUser},
-			expectAllow:   true,
-		},
-		{
-			name:          "denied by checker",
-			innerResponse: authlib.CheckResponse{Allowed: false},
-			authInfo:      &identity.StaticRequester{Type: authlib.TypeUser},
-			expectAllow:   false,
-		},
-		{
-			name:        "error from checker",
-			innerErr:    errors.New("access check failed"),
-			authInfo:    &identity.StaticRequester{Type: authlib.TypeUser},
-			expectAllow: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mock := &mockInnerAccessChecker{
-				response: tt.innerResponse,
-				err:      tt.innerErr,
-			}
-
-			checker := NewTokenAccessChecker(mock)
-
-			// Add auth info to context
-			testCtx := authlib.WithAuthInfo(context.Background(), tt.authInfo)
-
-			err := checker.Check(testCtx, req, "")
-
-			if tt.expectAllow {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				assert.True(t, apierrors.IsForbidden(err), "expected Forbidden error, got: %v", err)
-			}
-		})
-	}
-}
-
-func TestTokenAccessChecker_NoAuthInfo(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: true},
-	}
-
-	checker := NewTokenAccessChecker(mock)
-	err := checker.Check(context.Background(), authlib.CheckRequest{}, "")
-
-	require.Error(t, err)
-	assert.True(t, apierrors.IsUnauthorized(err), "expected Unauthorized error")
-}
-
-func TestTokenAccessChecker_WithFallbackRole_IsNoOp(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: false},
-	}
-
-	checker := NewTokenAccessChecker(mock)
-	checkerWithFallback := checker.WithFallbackRole(identity.RoleAdmin)
-
-	// They should be the same instance
-	assert.Same(t, checker, checkerWithFallback, "WithFallbackRole should return same instance")
-}
-
-func TestTokenAccessChecker_FillsNamespace(t *testing.T) {
-	mock := &mockInnerAccessChecker{
-		response: authlib.CheckResponse{Allowed: true},
-	}
-
-	checker := NewTokenAccessChecker(mock)
-
-	ctx := authlib.WithAuthInfo(context.Background(), &identity.StaticRequester{
-		Type:      authlib.TypeUser,
-		Namespace: "org-123",
-	})
-
-	// Request without namespace
-	req := authlib.CheckRequest{
-		Verb:     "get",
-		Group:    "provisioning.grafana.app",
-		Resource: "repositories",
-		Name:     "test-repo",
-		// Namespace intentionally empty
-	}
-
-	err := checker.Check(ctx, req, "")
-	require.NoError(t, err)
-}
-
-// mockInnerAccessChecker implements authlib.AccessChecker for testing.
-type mockInnerAccessChecker struct {
-	response authlib.CheckResponse
-	err      error
-}
-
-func (m *mockInnerAccessChecker) Check(_ context.Context, _ authlib.AuthInfo, _ authlib.CheckRequest, _ string) (authlib.CheckResponse, error) {
-	return m.response, m.err
-}
-
-func (m *mockInnerAccessChecker) Compile(_ context.Context, _ authlib.AuthInfo, _ authlib.ListRequest) (authlib.ItemChecker, authlib.Zookie, error) {
-	return nil, nil, nil
-}

apps/provisioning/pkg/repository/tester.go

@@ -23,13 +23,7 @@ func NewSimpleRepositoryTester(validator RepositoryValidator) SimpleRepositoryTe
 
 // TestRepository validates the repository and then runs a health check
 func (t *SimpleRepositoryTester) TestRepository(ctx context.Context, repo Repository) (*provisioning.TestResults, error) {
-	// Determine if this is a CREATE or UPDATE operation
-	// If the repository has been observed by the controller (ObservedGeneration > 0),
-	// it's an existing repository and we should treat it as UPDATE
-	cfg := repo.Config()
-	isCreate := cfg.Status.ObservedGeneration == 0
-
-	errors := t.validator.ValidateRepository(repo, isCreate)
+	errors := t.validator.ValidateRepository(repo)
 	if len(errors) > 0 {
 		rsp := &provisioning.TestResults{
 			Code:    http.StatusUnprocessableEntity, // Invalid

apps/provisioning/pkg/repository/validator.go

@@ -32,9 +32,7 @@ func NewValidator(minSyncInterval time.Duration, allowedTargets []provisioning.S
 }
 
 // ValidateRepository solely does configuration checks on the repository object. It does not run a health check or compare against existing repositories.
-// isCreate indicates whether this is a CREATE operation (true) or UPDATE operation (false).
-// When isCreate is false, allowedTargets validation is skipped to allow existing repositories to continue working.
-func (v *RepositoryValidator) ValidateRepository(repo Repository, isCreate bool) field.ErrorList {
+func (v *RepositoryValidator) ValidateRepository(repo Repository) field.ErrorList {
 	list := repo.Validate()
 	cfg := repo.Config()
 
@@ -46,7 +44,7 @@ func (v *RepositoryValidator) ValidateRepository(repo Repository, isCreate bool)
 		if cfg.Spec.Sync.Target == "" {
 			list = append(list, field.Required(field.NewPath("spec", "sync", "target"),
 				"The target type is required when sync is enabled"))
-		} else if isCreate && !slices.Contains(v.allowedTargets, cfg.Spec.Sync.Target) {
+		} else if !slices.Contains(v.allowedTargets, cfg.Spec.Sync.Target) {
 			list = append(list,
 				field.Invalid(
 					field.NewPath("spec", "target"),

apps/provisioning/pkg/repository/validator_test.go

@@ -303,8 +303,7 @@ func TestValidateRepository(t *testing.T) {
 	validator := NewValidator(10*time.Second, []provisioning.SyncTargetType{provisioning.SyncTargetTypeFolder}, false)
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Tests validate new configurations, so always pass isCreate=true
-			errors := validator.ValidateRepository(tt.repository, true)
+			errors := validator.ValidateRepository(tt.repository)
 			require.Len(t, errors, tt.expectedErrs)
 			if tt.validateError != nil {
 				tt.validateError(t, errors)

conf/defaults.ini

@@ -335,9 +335,6 @@ rudderstack_data_plane_url =
 # Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
 rudderstack_sdk_url =
 
-# Rudderstack v3 SDK, optional, defaults to false. If set, Rudderstack v3 SDK will be used instead of v1
-rudderstack_v3_sdk_url = 
-
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 rudderstack_config_url =
 
@@ -1653,11 +1650,6 @@ loki_basic_auth_password =
 # Accepts duration formats like: 30s, 1m, 1h.
 rule_query_offset = 1m
 
-# Default data source UID to use for query execution when importing Prometheus rules.
-# This default is used when the X-Grafana-Alerting-Datasource-UID header is not provided.
-# If not set, the header becomes required.
-default_datasource_uid =
-
 [recording_rules]
 # Enable recording rules.
 enabled = true
@@ -2269,7 +2261,7 @@ fail_tests_on_console = true
 # List of targets that can be controlled by a repository, separated by |.
 # Instance means the whole grafana instance will be controlled by a repository.
 # Folder limits it to a folder within the grafana instance.
-allowed_targets = folder
+allowed_targets = instance|folder
 
 # Whether image rendering is allowed for dashboard previews.
 # Requires image rendering service to be configured.

conf/sample.ini

@@ -322,9 +322,6 @@
 # Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
 ;rudderstack_sdk_url =
 
-# Rudderstack v3 SDK, optional, defaults to false. If set, Rudderstack v3 SDK will be used instead of v1
-;rudderstack_v3_sdk_url = 
-
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 ;rudderstack_config_url =
 
@@ -1615,11 +1612,6 @@ max_annotations_to_keep =
 # Accepts duration formats like: 30s, 1m, 1h.
 rule_query_offset = 1m
 
-# Default data source UID to use for query execution when importing Prometheus rules.
-# This default is used when the X-Grafana-Alerting-Datasource-UID header is not provided.
-# If not set, the header becomes required.
-default_datasource_uid =
-
 #################################### Recording Rules #####################
 [recording_rules]
 # Enable recording rules.

devenv/dev-dashboards/migrations/migrations.json

@@ -299,9 +299,15 @@
         "y": 0
       },
       "id": 6,
-      "options": {},
-      "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

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

@@ -71,12 +71,13 @@
       "id": 1,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -147,12 +148,13 @@
       "id": 4,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -223,12 +225,13 @@
       "id": 3,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -296,15 +299,93 @@
         "x": 12,
         "y": 1
       },
-      "id": 8,
+      "id": 5,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
+        },
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "circle",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sparkline": false
+      },
+      "pluginVersion": "13.0.0-pre",
+      "targets": [
+        {
+          "alias": "1",
+          "datasource": {
+            "type": "grafana-testdata-datasource"
+          },
+          "max": 100,
+          "min": 1,
+          "noise": 22,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "spread": 22,
+          "startValue": 1
+        }
+      ],
+      "title": "Spotlight",
+      "type": "radialbar"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "max": 100,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 4,
+        "x": 16,
+        "y": 1
+      },
+      "id": 8,
+      "maxDataPoints": 20,
+      "options": {
+        "barWidthFactor": 0.4,
+        "effects": {
+          "barGlow": true,
+          "centerGlow": true,
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -369,18 +450,19 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 16,
-        "y": 1
+        "x": 0,
+        "y": 7
       },
       "id": 22,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.72,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -445,18 +527,19 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 20,
-        "y": 1
+        "x": 4,
+        "y": 7
       },
       "id": 23,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.72,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -496,7 +579,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 7
+        "y": 13
       },
       "id": 17,
       "panels": [],
@@ -533,19 +616,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
+        "w": 5,
         "x": 0,
-        "y": 8
+        "y": 14
       },
       "id": 18,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.1,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -609,19 +693,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 4,
-        "y": 8
+        "w": 5,
+        "x": 5,
+        "y": 14
       },
       "id": 19,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.32,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -685,19 +770,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 8,
-        "y": 8
+        "w": 5,
+        "x": 10,
+        "y": 14
       },
       "id": 20,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.57,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -761,19 +847,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 12,
-        "y": 8
+        "w": 5,
+        "x": 15,
+        "y": 14
       },
       "id": 21,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidthFactor": 0.8,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false
+          "gradient": false,
+          "rounded": true,
+          "spotlight": true
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -813,7 +900,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 14
+        "y": 20
       },
       "id": 24,
       "panels": [],
@@ -854,19 +941,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
+        "w": 6,
         "x": 0,
-        "y": 15
+        "y": 21
       },
       "id": 25,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.9,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -930,19 +1018,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 4,
-        "y": 15
+        "w": 6,
+        "x": 6,
+        "y": 21
       },
       "id": 26,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.72,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1006,19 +1095,20 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 4,
-        "x": 8,
-        "y": 15
+        "w": 5,
+        "x": 12,
+        "y": 21
       },
       "id": 29,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.72,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1081,20 +1171,21 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 4,
-        "x": 12,
-        "y": 15
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 27
       },
       "id": 30,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.9,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1157,20 +1248,21 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 4,
-        "x": 16,
-        "y": 15
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 27
       },
       "id": 28,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.72,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false
+          "gradient": false,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1206,7 +1298,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 21
+        "y": 34
       },
       "id": 31,
       "panels": [],
@@ -1253,17 +1345,18 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 22
+        "y": 35
       },
       "id": 32,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.9,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1333,17 +1426,18 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 22
+        "y": 35
       },
       "id": 34,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.9,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1413,17 +1507,18 @@
         "h": 10,
         "w": 6,
         "x": 14,
-        "y": 22
+        "y": 35
       },
       "id": 33,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.9,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1459,7 +1554,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 32
+        "y": 45
       },
       "id": 6,
       "panels": [],
@@ -1500,20 +1595,20 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 33
+        "y": 46
       },
       "id": 9,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
-        "endpointMarker": "glow",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1526,7 +1621,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1581,18 +1677,19 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 39
+        "y": 52
       },
       "id": 11,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
         "glow": "both",
         "orientation": "auto",
@@ -1606,7 +1703,8 @@
         "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": true
+        "sparkline": true,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1633,7 +1731,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 45
+        "y": 58
       },
       "id": 12,
       "panels": [],
@@ -1675,18 +1773,19 @@
         "h": 7,
         "w": 4,
         "x": 0,
-        "y": 46
+        "y": 59
       },
       "id": 13,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.49,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
         "glow": "both",
         "orientation": "auto",
@@ -1700,7 +1799,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1718,22 +1818,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"
     },
@@ -1772,18 +1856,19 @@
         "h": 7,
         "w": 5,
         "x": 4,
-        "y": 46
+        "y": 59
       },
       "id": 14,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.49,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
         "glow": "both",
         "orientation": "auto",
@@ -1797,7 +1882,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1815,22 +1901,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"
     },
@@ -1868,18 +1938,19 @@
         "h": 7,
         "w": 5,
         "x": 9,
-        "y": 46
+        "y": 59
       },
       "id": 15,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.84,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
         "glow": "both",
         "orientation": "auto",
@@ -1893,7 +1964,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1948,18 +2020,19 @@
         "h": 7,
         "w": 6,
         "x": 14,
-        "y": 46
+        "y": 59
       },
       "id": 16,
       "maxDataPoints": 20,
       "options": {
-        "barShape": "rounded",
         "barWidth": 12,
         "barWidthFactor": 0.66,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true
+          "gradient": true,
+          "rounded": true,
+          "spotlight": true
         },
         "glow": "both",
         "orientation": "auto",
@@ -1973,7 +2046,8 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false
+        "sparkline": false,
+        "spotlight": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2000,7 +2074,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 53
+        "y": 66
       },
       "id": 35,
       "panels": [],
@@ -2031,19 +2105,20 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 12,
+        "h": 8,
+        "w": 6,
         "x": 0,
-        "y": 54
+        "y": 67
       },
       "id": 36,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.5,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -2096,19 +2171,20 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 54
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 67
       },
       "id": 37,
       "options": {
-        "barShape": "flat",
         "barWidthFactor": 0.5,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true
+          "gradient": true,
+          "rounded": false,
+          "spotlight": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -2148,6 +2224,5 @@
   "timezone": "browser",
   "title": "Panel tests - Gauge (new)",
   "uid": "panel-tests-gauge-new",
-  "version": 22,
-  "weekStart": ""
+  "version": 9
 }

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",
@@ -957,6 +956,8 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
+          "rounded": false,
+          "spotlight": false,
           "gradient": false
         }
       }

devenv/docker/blocks/mysql/docker-compose.yaml

@@ -7,15 +7,7 @@
       MYSQL_PASSWORD: password
     ports:
       - "3306:3306"
-    command:
-      - mysqld
-      - --character-set-server=utf8mb4
-      - --collation-server=utf8mb4_unicode_ci
-      - --innodb_monitor_enable=all
-      - --default-authentication-plugin=mysql_native_password
-      # Please keep sql-require-primary-key option enabled, to make sure we don't accidentally introduce migration
-      # adding new table without PK.
-      - --sql-require-primary-key=ON
+    command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --default-authentication-plugin=mysql_native_password]
 
   fake-mysql-data:
     image: grafana/fake-data-gen

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**.
 
@@ -242,8 +242,6 @@ Set to `true` to import recording rules in paused state.
 
 The UID of the data source to use for alert rule queries.
 
-If not specified in the header, Grafana uses the configured default from `unified_alerting.prometheus_conversion.default_datasource_uid`. If neither the header nor the configuration option is provided, the request fails.
-
 #### `X-Grafana-Alerting-Target-Datasource-UID`
 
 The UID of the target data source for recording rules. If not specified, the value from `X-Grafana-Alerting-Datasource-UID` is used.