fix tests

Remove duplicate isGroupMember methods from OAuth connectors

.github/CODEOWNERS

@@ -24,7 +24,6 @@
 /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
@@ -426,6 +425,7 @@ 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,7 +501,6 @@ 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
@@ -520,7 +519,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,14 +82,6 @@ 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
@@ -134,13 +126,11 @@ 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} --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
+        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
     - id: output
       shell: bash
       env:

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

@@ -95,9 +95,11 @@ 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

@@ -0,0 +1,13 @@
+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

@@ -1,29 +0,0 @@
-# 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,6 +54,7 @@ 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
@@ -157,7 +158,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-20251212143239-491433b332b7 // indirect
+	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // 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,6 +115,8 @@ 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=
@@ -619,8 +621,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-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+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/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-20251212143239-491433b332b7
+	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f
 	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-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+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/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,6 +31,10 @@ 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 (
@@ -111,13 +115,13 @@ func buildQuery(query Query) (string, error) {
 		fmt.Sprintf(`%s=%q`, historian.LabelFrom, historian.LabelFromValue),
 	}
 
-	if query.RuleUID != nil {
-		selectors = append(selectors,
-			fmt.Sprintf(`%s=%q`, historian.LabelRuleUID, *query.RuleUID))
-	}
-
 	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)
+	}
+
 	// Add receiver filter if specified.
 	if query.Receiver != nil && *query.Receiver != "" {
 		logql += fmt.Sprintf(` | receiver = %q`, *query.Receiver)
@@ -211,16 +215,13 @@ func parseLokiEntry(s lokiclient.Sample) (Entry, error) {
 		groupLabels = make(map[string]string)
 	}
 
-	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,
-		}
-	}
+	alerts := []EntryAlert{{
+		Status:      lokiEntry.Alert.Status,
+		Labels:      lokiEntry.Alert.Labels,
+		Annotations: lokiEntry.Alert.Annotations,
+		StartsAt:    lokiEntry.Alert.StartsAt,
+		EndsAt:      lokiEntry.Alert.EndsAt,
+	}}
 
 	return Entry{
 		Timestamp:    s.T,

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

@@ -7,6 +7,7 @@ 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"
@@ -133,9 +134,8 @@ func TestBuildQuery(t *testing.T) {
 			query: Query{
 				RuleUID: stringPtr("test-rule-uid"),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid"`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with receiver filter",
@@ -143,9 +143,8 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID:  stringPtr("test-rule-uid"),
 				Receiver: stringPtr("email-receiver"),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | receiver = "email-receiver"`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | receiver = "email-receiver"`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with status filter",
@@ -153,9 +152,8 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Status:  createStatusPtr(v0alpha1.CreateNotificationqueryRequestNotificationStatusFiring),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | status = "firing"`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | status = "firing"`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with success outcome filter",
@@ -163,9 +161,8 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Outcome: outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeSuccess),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | error = ""`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | error = ""`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with error outcome filter",
@@ -173,9 +170,8 @@ func TestBuildQuery(t *testing.T) {
 				RuleUID: stringPtr("test-rule-uid"),
 				Outcome: outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeError),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | error != ""`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | error != ""`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with many filters",
@@ -185,9 +181,8 @@ func TestBuildQuery(t *testing.T) {
 				Status:   createStatusPtr(v0alpha1.CreateNotificationqueryRequestNotificationStatusResolved),
 				Outcome:  outcomePtr(v0alpha1.CreateNotificationqueryRequestNotificationOutcomeSuccess),
 			},
-			expected: fmt.Sprintf(`{%s=%q,%s=%q} | json | receiver = "email-receiver" | status = "resolved" | error = ""`,
-				historian.LabelFrom, historian.LabelFromValue,
-				historian.LabelRuleUID, "test-rule-uid"),
+			expected: fmt.Sprintf(`{%s=%q} | json | alert_labels___alert_rule_uid__ = "test-rule-uid" | receiver = "email-receiver" | status = "resolved" | error = ""`,
+				historian.LabelFrom, historian.LabelFromValue),
 		},
 		{
 			name: "query with group label matcher",
@@ -277,19 +272,19 @@ func TestParseLokiEntry(t *testing.T) {
 					GroupLabels: map[string]string{
 						"alertname": "test-alert",
 					},
-					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),
+					Alert: 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),
 					},
+					AlertIndex:   0,
+					AlertCount:   1,
 					Retry:        false,
 					Duration:     100,
 					PipelineTime: now,
@@ -335,7 +330,9 @@ func TestParseLokiEntry(t *testing.T) {
 					Error:         "notification failed",
 					GroupKey:      "key:thing",
 					GroupLabels:   map[string]string{},
-					Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
+					Alert:         historian.NotificationHistoryLokiEntryAlert{},
+					AlertIndex:    0,
+					AlertCount:    1,
 					PipelineTime:  now,
 				}),
 			},
@@ -347,7 +344,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,
 			},
@@ -365,7 +362,7 @@ func TestParseLokiEntry(t *testing.T) {
 				Status:       Status("firing"),
 				Outcome:      OutcomeSuccess,
 				GroupLabels:  map[string]string{},
-				Alerts:       []EntryAlert{},
+				Alerts:       []EntryAlert{{}},
 				PipelineTime: now,
 			},
 		},
@@ -448,7 +445,9 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-1",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
+								Alert:         historian.NotificationHistoryLokiEntryAlert{},
+								AlertIndex:    0,
+								AlertCount:    1,
 								PipelineTime:  now,
 							}),
 						},
@@ -459,7 +458,9 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-3",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
+								Alert:         historian.NotificationHistoryLokiEntryAlert{},
+								AlertIndex:    0,
+								AlertCount:    1,
 								PipelineTime:  now,
 							}),
 						},
@@ -474,7 +475,9 @@ func TestLokiReader_RunQuery(t *testing.T) {
 								Receiver:      "receiver-2",
 								Status:        "firing",
 								GroupLabels:   map[string]string{},
-								Alerts:        []historian.NotificationHistoryLokiEntryAlert{},
+								Alert:         historian.NotificationHistoryLokiEntryAlert{},
+								AlertIndex:    0,
+								AlertCount:    1,
 								PipelineTime:  now,
 							}),
 						},
@@ -546,19 +549,19 @@ func createMockLokiResponse(timestamp time.Time) lokiclient.QueryRes {
 								GroupLabels: map[string]string{
 									"alertname": "test-alert",
 								},
-								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),
+								Alert: 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),
 								},
+								AlertIndex:   0,
+								AlertCount:   1,
 								Retry:        false,
 								Duration:     100,
 								PipelineTime: timestamp,
@@ -587,10 +590,19 @@ func createLokiEntryJSONWithNilLabels(t *testing.T, timestamp time.Time) string
 		"status": "firing",
 		"error": "",
 		"groupLabels": null,
-		"alerts": [],
+		"alert": {},
+		"alertIndex": 0,
+		"alertCount": 1,
 		"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,12 +180,15 @@ func countAnnotationsV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	annotationList, ok := annotations["list"].([]interface{})
-	if !ok {
-		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)
 	}
 
-	return len(annotationList)
+	return 0
 }
 
 // countLinksV0V1 counts dashboard links in v0alpha1 or v1beta1 dashboard spec
@@ -194,12 +197,15 @@ func countLinksV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	links, ok := spec["links"].([]interface{})
-	if !ok {
-		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)
 	}
 
-	return len(links)
+	return 0
 }
 
 // countVariablesV0V1 counts template variables in v0alpha1 or v1beta1 dashboard spec
@@ -213,12 +219,15 @@ func countVariablesV0V1(spec map[string]interface{}) int {
 		return 0
 	}
 
-	variableList, ok := templating["list"].([]interface{})
-	if !ok {
-		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)
 	}
 
-	return len(variableList)
+	return 0
 }
 
 // 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 = string(source.UID)
+			dashboardUID = source.Name
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv1.Dashboard:
-			dashboardUID = string(source.UID)
+			dashboardUID = source.Name
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv2alpha1.Dashboard:
-			dashboardUID = string(source.UID)
+			dashboardUID = source.Name
 			// Don't track schema version for v2+ (redundant with API version)
 		case *dashv2beta1.Dashboard:
-			dashboardUID = string(source.UID)
+			dashboardUID = source.Name
 			// 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,15 +300,9 @@
         "y": 0
       },
       "id": 6,
-      "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"
-      },
+      "options": {},
+      "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,12 +71,11 @@
       "id": 1,
       "maxDataPoints": 20,
       "options": {
+        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": true,
-          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -150,12 +149,11 @@
       "id": 4,
       "maxDataPoints": 20,
       "options": {
+        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": false,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -229,12 +227,11 @@
       "id": 3,
       "maxDataPoints": 20,
       "options": {
+        "barShape": "rounded",
         "barWidthFactor": 0.4,
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": false,
           "gradient": false
         },
         "orientation": "auto",
@@ -271,85 +268,6 @@
       "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"
@@ -391,10 +309,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -470,10 +387,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": false,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -549,10 +465,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": false,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -641,10 +556,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -720,10 +634,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -799,10 +712,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -878,10 +790,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -974,10 +885,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1053,10 +963,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1132,10 +1041,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1211,10 +1119,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1290,10 +1197,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1386,10 +1292,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1469,10 +1374,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1552,10 +1456,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1641,13 +1544,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": {
@@ -1662,8 +1565,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1730,10 +1632,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1748,8 +1649,7 @@
         "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": true,
-        "spotlight": true
+        "sparkline": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1830,10 +1730,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1848,8 +1747,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1917,9 +1815,6 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "sparkline": false,
-          "spotlight": true,
           "gradient": true
         },
         "glow": "both",
@@ -1934,10 +1829,10 @@
         "segmentCount": 12,
         "segmentSpacing": 0.3,
         "shape": "circle",
+        "barShape": "rounded",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2004,10 +1899,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2022,8 +1916,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2090,10 +1983,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "rounded": true,
-          "spotlight": true,
           "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2108,8 +2000,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "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,8 +955,6 @@
         "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

@@ -0,0 +1,142 @@
+{
+  "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

@@ -0,0 +1,166 @@
+{
+    "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

@@ -0,0 +1,156 @@
+{
+  "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,7 +743,9 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": "$datasource",
+          "datasource": {
+            "uid": "$datasource"
+          },
           "hide": 0,
           "includeAll": true,
           "label": "cluster",
@@ -764,7 +766,9 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": "$datasource",
+          "datasource": {
+            "uid": "$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,8 +961,12 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
+          "datasource": {
+            "type": "",
+            "uid": "$datasource"
+          },
           "query": {
-            "kind": "prometheus",
+            "kind": "",
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -988,8 +992,12 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
+          "datasource": {
+            "type": "",
+            "uid": "$datasource"
+          },
           "query": {
-            "kind": "prometheus",
+            "kind": "",
             "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,8 +978,11 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "prometheus",
+            "group": "",
             "version": "v0",
+            "datasource": {
+              "name": "$datasource"
+            },
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -1007,8 +1010,11 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "prometheus",
+            "group": "",
             "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,7 +115,14 @@
             "kind": "logs",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "logs",
+                  "originalOptions": {
+                    "height": 100
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

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

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

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

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

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

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

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

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

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

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

@@ -110,7 +110,15 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -115,7 +115,15 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -361,7 +361,15 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -372,7 +372,15 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

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

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

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

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

@@ -296,6 +296,7 @@
         }
       },
       {
+        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
         "datasource": {
           "type": "grafana-testdata-datasource"
         },
@@ -306,15 +307,7 @@
           "y": 0
         },
         "id": 6,
-        "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"
-        },
+        "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": {
-                "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"
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "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": {
-                "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"
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "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,6 +62,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -151,6 +157,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -241,6 +253,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -320,6 +338,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -401,6 +425,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -480,6 +510,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -559,6 +595,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -639,6 +681,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -730,6 +778,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -927,6 +981,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1006,6 +1066,12 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1085,6 +1151,12 @@
             "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,6 +67,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -159,6 +165,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -252,6 +264,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -334,6 +352,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -418,6 +442,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -500,6 +530,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -582,6 +618,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -665,6 +707,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -759,6 +807,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -961,6 +1015,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1043,6 +1103,12 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "gauge",
+                  "originalOptions": {
+                    "nullPointMode": "null"
+                  }
+                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1125,6 +1191,12 @@
             "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,13 +77,12 @@
         "id": 1,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -156,13 +155,12 @@
         "id": 4,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": false,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -235,13 +233,12 @@
         "id": 3,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -277,85 +274,6 @@
         "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"
@@ -393,13 +311,12 @@
         "id": 8,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -472,13 +389,12 @@
         "id": 22,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -551,13 +467,12 @@
         "id": 23,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -643,13 +558,12 @@
         "id": 18,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.1,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -722,13 +636,12 @@
         "id": 19,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.32,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -801,13 +714,12 @@
         "id": 20,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.57,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -880,13 +792,12 @@
         "id": 21,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidthFactor": 0.8,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": false,
-            "rounded": true,
-            "spotlight": true
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -976,13 +887,12 @@
         "id": 25,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1055,13 +965,12 @@
         "id": 26,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1134,13 +1043,12 @@
         "id": 29,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true,
-            "rounded": false,
-            "spotlight": false
+            "gradient": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1213,13 +1121,12 @@
         "id": 30,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1292,13 +1199,12 @@
         "id": 28,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.72,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": false
+            "gradient": false
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1388,13 +1294,12 @@
         "id": 32,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true,
-            "rounded": false,
-            "spotlight": false
+            "gradient": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1471,13 +1376,12 @@
         "id": 34,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true,
-            "rounded": false,
-            "spotlight": false
+            "gradient": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1554,13 +1458,12 @@
         "id": 33,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "flat",
           "barWidthFactor": 0.9,
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": true,
-            "rounded": false,
-            "spotlight": false
+            "gradient": true
           },
           "orientation": "auto",
           "reduceOptions": {
@@ -1645,15 +1548,15 @@
         "id": 9,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "spotlight": true
+            "gradient": true
           },
+          "endpointMarker": "glow",
           "glow": "both",
           "orientation": "auto",
           "reduceOptions": {
@@ -1668,8 +1571,7 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false,
-          "spotlight": true
+          "sparkline": false
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1731,14 +1633,13 @@
         "id": 11,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.4,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "spotlight": true
+            "gradient": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1754,8 +1655,7 @@
           "shape": "gauge",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": true,
-          "spotlight": true
+          "sparkline": true
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1831,14 +1731,13 @@
         "id": 13,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.49,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "spotlight": true
+            "gradient": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1854,8 +1753,7 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false,
-          "spotlight": true
+          "sparkline": false
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -1918,15 +1816,13 @@
         "id": 14,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.49,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "sparkline": false,
-            "spotlight": true
+            "gradient": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -1942,8 +1838,7 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false,
-          "spotlight": true
+          "sparkline": false
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -2005,14 +1900,13 @@
         "id": 15,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.84,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "spotlight": true
+            "gradient": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -2028,8 +1922,7 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false,
-          "spotlight": true
+          "sparkline": false
         },
         "pluginVersion": "13.0.0-pre",
         "targets": [
@@ -2091,14 +1984,13 @@
         "id": 16,
         "maxDataPoints": 20,
         "options": {
+          "barShape": "rounded",
           "barWidth": 12,
           "barWidthFactor": 0.66,
           "effects": {
             "barGlow": true,
             "centerGlow": true,
-            "gradient": true,
-            "rounded": true,
-            "spotlight": true
+            "gradient": true
           },
           "glow": "both",
           "orientation": "auto",
@@ -2114,8 +2006,7 @@
           "shape": "circle",
           "showThresholdLabels": false,
           "showThresholdMarkers": false,
-          "sparkline": false,
-          "spotlight": true
+          "sparkline": false
         },
         "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,13 +73,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -165,14 +164,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -188,8 +186,7 @@
                 "shape": "gauge",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": true,
-                "spotlight": true
+                "sparkline": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -262,14 +259,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -285,8 +281,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -360,15 +355,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "sparkline": false,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -384,8 +377,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -459,14 +451,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.84,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -482,8 +473,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -556,14 +546,13 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.66,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -579,8 +568,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -653,13 +641,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.1,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -745,13 +732,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.32,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -837,13 +823,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.57,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -929,13 +914,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.8,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1021,13 +1005,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1113,13 +1096,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1201,13 +1183,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1293,13 +1274,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1385,13 +1365,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1477,13 +1456,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1573,13 +1551,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1661,13 +1638,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1753,13 +1729,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1849,13 +1824,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1945,13 +1919,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2045,105 +2018,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": true,
-                  "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
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2229,13 +2109,12 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2321,15 +2200,15 @@
             "spec": {
               "pluginVersion": "13.0.0-pre",
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
+                "endpointMarker": "glow",
                 "glow": "both",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2344,8 +2223,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -2429,19 +2307,6 @@
                         }
                       }
                     },
-                    {
-                      "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,13 +77,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -172,14 +171,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -195,8 +193,7 @@
                 "shape": "gauge",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": true,
-                "spotlight": true
+                "sparkline": true
               },
               "fieldConfig": {
                 "defaults": {
@@ -272,14 +269,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -295,8 +291,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -373,15 +368,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.49,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "sparkline": false,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -397,8 +390,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -475,14 +467,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.84,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -498,8 +489,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -575,14 +565,13 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.66,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
                 "glow": "both",
                 "orientation": "auto",
@@ -598,8 +587,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -675,13 +663,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.1,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -770,13 +757,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.32,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -865,13 +851,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.57,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -960,13 +945,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.8,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1055,13 +1039,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1150,13 +1133,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1241,13 +1223,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1336,13 +1317,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1431,13 +1411,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1526,13 +1505,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.72,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1625,13 +1603,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1716,13 +1693,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1811,13 +1787,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -1910,13 +1885,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2009,13 +1983,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "flat",
                 "barWidthFactor": 0.9,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": true,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": true
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2112,108 +2085,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": false,
                   "centerGlow": true,
-                  "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
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2302,13 +2179,12 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": false,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2397,15 +2273,15 @@
             "version": "13.0.0-pre",
             "spec": {
               "options": {
+                "barShape": "rounded",
                 "barWidth": 12,
                 "barWidthFactor": 0.4,
                 "effects": {
                   "barGlow": true,
                   "centerGlow": true,
-                  "gradient": true,
-                  "rounded": true,
-                  "spotlight": true
+                  "gradient": true
                 },
+                "endpointMarker": "glow",
                 "glow": "both",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -2420,8 +2296,7 @@
                 "shape": "circle",
                 "showThresholdLabels": false,
                 "showThresholdMarkers": false,
-                "sparkline": false,
-                "spotlight": true
+                "sparkline": false
               },
               "fieldConfig": {
                 "defaults": {
@@ -2505,19 +2380,6 @@
                         }
                       }
                     },
-                    {
-                      "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,9 +961,7 @@
           "effects": {
             "barGlow": false,
             "centerGlow": false,
-            "gradient": false,
-            "rounded": false,
-            "spotlight": false
+            "gradient": 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,9 +864,7 @@
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": 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,9 +901,7 @@
                 "effects": {
                   "barGlow": false,
                   "centerGlow": false,
-                  "gradient": false,
-                  "rounded": false,
-                  "spotlight": false
+                  "gradient": false
                 },
                 "orientation": "auto",
                 "reduceOptions": {

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

@@ -412,7 +412,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -456,7 +466,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -500,7 +520,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1681,7 +1711,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2061,7 +2101,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "content": "Just verify that the tooltip time has millisecond resolution ",
+                    "editable": true,
+                    "error": false,
+                    "mode": "markdown"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2105,7 +2155,17 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "content": "Verify that axis labels look ok",
+                    "editable": true,
+                    "error": false,
+                    "mode": "markdown"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -429,7 +429,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -475,7 +485,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -521,7 +541,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1779,7 +1809,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2172,7 +2212,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "content": "Just verify that the tooltip time has millisecond resolution ",
+                    "editable": true,
+                    "error": false,
+                    "mode": "markdown"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2218,7 +2268,17 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {},
+              "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "text",
+                  "originalOptions": {
+                    "content": "Verify that axis labels look ok",
+                    "editable": true,
+                    "error": false,
+                    "mode": "markdown"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -74,7 +74,44 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -116,7 +153,46 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -158,7 +234,44 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -204,7 +317,46 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -246,7 +398,44 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -288,7 +477,44 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -78,7 +78,44 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -123,7 +160,46 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -168,7 +244,44 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -216,7 +329,46 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -261,7 +413,44 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -306,7 +495,44 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -665,7 +665,42 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -691,7 +691,42 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {},
+              "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"
+                  }
+                }
+              },
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

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

@@ -56,6 +56,14 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "panel-tests"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -94,6 +102,15 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "gdev",
+                      "demo"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -133,6 +150,15 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "templating",
+                      "gdev"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -172,6 +198,15 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "gdev",
+                      "datasource-test"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -211,6 +246,12 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": []
+                  }
+                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -247,6 +288,15 @@
             "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,6 +58,14 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "panel-tests"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -97,6 +105,15 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "gdev",
+                      "demo"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -137,6 +154,15 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "templating",
+                      "gdev"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -177,6 +203,15 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": [
+                      "gdev",
+                      "datasource-test"
+                    ]
+                  }
+                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -217,6 +252,12 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
+                "__angularMigration": {
+                  "autoMigrateFrom": "dashlist",
+                  "originalOptions": {
+                    "tags": []
+                  }
+                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -254,6 +295,15 @@
             "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

@@ -0,0 +1,161 @@
+{
+  "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

@@ -0,0 +1,242 @@
+{
+  "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

@@ -0,0 +1,246 @@
+{
+  "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

@@ -0,0 +1,172 @@
+{
+  "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

@@ -0,0 +1,229 @@
+{
+  "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

@@ -0,0 +1,232 @@
+{
+  "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

@@ -0,0 +1,161 @@
+{
+  "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

@@ -0,0 +1,227 @@
+{
+  "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

@@ -0,0 +1,231 @@
+{
+  "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,6 +2,7 @@ package conversion
 
 import (
 	"context"
+	"strings"
 
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apiserver/pkg/endpoints/request"
@@ -79,5 +80,57 @@ 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,6 +229,36 @@ 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 != "" {
@@ -393,7 +423,8 @@ 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 {
-						dashLink.Url = &urlStr
+						cleanUrl := stripBOM(urlStr)
+						dashLink.Url = &cleanUrl
 					}
 				}
 
@@ -1185,6 +1216,10 @@ 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)
 	}
@@ -1532,6 +1567,10 @@ 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)
 	}
@@ -1709,6 +1748,10 @@ 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)
 	}
@@ -1722,7 +1765,9 @@ func buildGroupByVariable(ctx context.Context, varMap map[string]interface{}, co
 			Hide:        commonProps.Hide,
 			SkipUrlSync: commonProps.SkipUrlSync,
 			Current:     buildVariableCurrent(varMap["current"]),
-			Multi:       getBoolField(varMap, "multi", false),
+			// We set it to true by default because GroupByVariable
+			// constructor defaults to multi: true
+			Multi: getBoolField(varMap, "multi", true),
 		},
 	}
 
@@ -2006,6 +2051,28 @@ 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 {
@@ -2018,6 +2085,27 @@ 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 == "" {
@@ -2182,7 +2270,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:   schemaversion.GetStringValue(linkMap, "url"),
+				Url:   stripBOM(schemaversion.GetStringValue(linkMap, "url")),
 			}
 			if _, exists := linkMap["targetBlank"]; exists {
 				targetBlank := getBoolField(linkMap, "targetBlank", false)
@@ -2253,23 +2341,33 @@ 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": extractAngularOptions(panelMap),
+			"originalOptions": originalOptions,
 		}
 	}
 
+	// 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)
 
@@ -2413,9 +2511,14 @@ func extractFieldConfigDefaults(defaults map[string]interface{}) dashv2alpha1.Da
 		hasDefaults = true
 	}
 
-	// Extract array field
+	// Extract array field - strip BOMs from link URLs
 	if linksArray, ok := extractArrayField(defaults, "links"); ok {
-		fieldConfigDefaults.Links = linksArray
+		cleanedLinks := stripBOMFromInterface(linksArray)
+		if cleanedArray, ok := cleanedLinks.([]interface{}); ok {
+			fieldConfigDefaults.Links = cleanedArray
+		} else {
+			fieldConfigDefaults.Links = linksArray
+		}
 		hasDefaults = true
 	}
 
@@ -2701,9 +2804,11 @@ 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: propertyMap["value"],
+							Value: cleanedValue,
 						})
 					}
 				}

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

@@ -210,6 +210,48 @@ 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,6 +290,7 @@
       }
     },
     {
+      "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
       "datasource": {
         "type": "grafana-testdata-datasource"
       },
@@ -300,15 +301,7 @@
         "y": 0
       },
       "id": 6,
-      "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"
-      },
+      "mode": "markdown",
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

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

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

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

@@ -75,10 +75,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -154,10 +153,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -233,10 +231,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -305,85 +302,6 @@
         "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": {
@@ -391,10 +309,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -460,8 +377,8 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 0,
-        "y": 7
+        "x": 16,
+        "y": 1
       },
       "id": 22,
       "maxDataPoints": 20,
@@ -470,10 +387,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -539,8 +455,8 @@
       "gridPos": {
         "h": 6,
         "w": 4,
-        "x": 4,
-        "y": 7
+        "x": 20,
+        "y": 1
       },
       "id": 23,
       "maxDataPoints": 20,
@@ -549,10 +465,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -593,7 +508,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 13
+        "y": 7
       },
       "id": 17,
       "panels": [],
@@ -630,9 +545,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 5,
+        "w": 4,
         "x": 0,
-        "y": 14
+        "y": 8
       },
       "id": 18,
       "maxDataPoints": 20,
@@ -641,10 +556,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -709,9 +623,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 5,
-        "x": 5,
-        "y": 14
+        "w": 4,
+        "x": 4,
+        "y": 8
       },
       "id": 19,
       "maxDataPoints": 20,
@@ -720,10 +634,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -788,9 +701,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 5,
-        "x": 10,
-        "y": 14
+        "w": 4,
+        "x": 8,
+        "y": 8
       },
       "id": 20,
       "maxDataPoints": 20,
@@ -799,10 +712,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -867,9 +779,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 5,
-        "x": 15,
-        "y": 14
+        "w": 4,
+        "x": 12,
+        "y": 8
       },
       "id": 21,
       "maxDataPoints": 20,
@@ -878,10 +790,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": false,
-          "rounded": true,
-          "spotlight": true
+          "gradient": false
         },
+        "barShape": "rounded",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -922,7 +833,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 20
+        "y": 14
       },
       "id": 24,
       "panels": [],
@@ -963,9 +874,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 6,
+        "w": 4,
         "x": 0,
-        "y": 21
+        "y": 15
       },
       "id": 25,
       "maxDataPoints": 20,
@@ -974,10 +885,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1042,9 +952,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 6,
-        "x": 6,
-        "y": 21
+        "w": 4,
+        "x": 4,
+        "y": 15
       },
       "id": 26,
       "maxDataPoints": 20,
@@ -1053,10 +963,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1121,9 +1030,9 @@
       },
       "gridPos": {
         "h": 6,
-        "w": 5,
-        "x": 12,
-        "y": 21
+        "w": 4,
+        "x": 8,
+        "y": 15
       },
       "id": 29,
       "maxDataPoints": 20,
@@ -1132,10 +1041,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1199,10 +1107,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 7,
-        "w": 6,
-        "x": 0,
-        "y": 27
+        "h": 6,
+        "w": 4,
+        "x": 12,
+        "y": 15
       },
       "id": 30,
       "maxDataPoints": 20,
@@ -1211,10 +1119,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1278,10 +1185,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 7,
-        "w": 6,
-        "x": 6,
-        "y": 27
+        "h": 6,
+        "w": 4,
+        "x": 16,
+        "y": 15
       },
       "id": 28,
       "maxDataPoints": 20,
@@ -1290,10 +1197,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": false
+          "gradient": false
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1330,7 +1236,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 34
+        "y": 21
       },
       "id": 31,
       "panels": [],
@@ -1377,7 +1283,7 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 35
+        "y": 22
       },
       "id": 32,
       "maxDataPoints": 20,
@@ -1386,10 +1292,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1460,7 +1365,7 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 35
+        "y": 22
       },
       "id": 34,
       "maxDataPoints": 20,
@@ -1469,10 +1374,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1543,7 +1447,7 @@
         "h": 10,
         "w": 6,
         "x": 14,
-        "y": 35
+        "y": 22
       },
       "id": 33,
       "maxDataPoints": 20,
@@ -1552,10 +1456,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -1592,7 +1495,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 45
+        "y": 32
       },
       "id": 6,
       "panels": [],
@@ -1633,20 +1536,20 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 46
+        "y": 33
       },
       "id": 9,
       "maxDataPoints": 20,
       "options": {
         "barWidth": 12,
         "barWidthFactor": 0.4,
+        "barShape": "rounded",
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "endpointMarker": "glow",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1661,8 +1564,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1717,7 +1619,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 52
+        "y": 39
       },
       "id": 11,
       "maxDataPoints": 20,
@@ -1727,10 +1629,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1745,8 +1646,7 @@
         "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": true,
-        "spotlight": true
+        "sparkline": true
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1773,7 +1673,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 58
+        "y": 45
       },
       "id": 12,
       "panels": [],
@@ -1815,7 +1715,7 @@
         "h": 7,
         "w": 4,
         "x": 0,
-        "y": 59
+        "y": 46
       },
       "id": 13,
       "maxDataPoints": 20,
@@ -1825,10 +1725,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1843,8 +1742,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1862,6 +1760,22 @@
           "startValue": 0
         }
       ],
+      "transformations": [
+        {
+          "id": "calculateField",
+          "options": {
+            "mode": "unary",
+            "reduce": {
+              "reducer": "sum"
+            },
+            "replaceFields": true,
+            "unary": {
+              "operator": "round",
+              "fieldName": "A-series"
+            }
+          }
+        }
+      ],
       "title": "Active gateways",
       "type": "radialbar"
     },
@@ -1900,7 +1814,7 @@
         "h": 7,
         "w": 5,
         "x": 4,
-        "y": 59
+        "y": 46
       },
       "id": 14,
       "maxDataPoints": 20,
@@ -1910,10 +1824,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -1928,8 +1841,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -1947,6 +1859,22 @@
           "startValue": 0
         }
       ],
+      "transformations": [
+        {
+          "id": "calculateField",
+          "options": {
+            "mode": "unary",
+            "reduce": {
+              "reducer": "sum"
+            },
+            "replaceFields": true,
+            "unary": {
+              "operator": "round",
+              "fieldName": "A-series"
+            }
+          }
+        }
+      ],
       "title": "Active pods",
       "type": "radialbar"
     },
@@ -1984,7 +1912,7 @@
         "h": 7,
         "w": 5,
         "x": 9,
-        "y": 59
+        "y": 46
       },
       "id": 15,
       "maxDataPoints": 20,
@@ -1994,10 +1922,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2012,8 +1939,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2068,7 +1994,7 @@
         "h": 7,
         "w": 6,
         "x": 14,
-        "y": 59
+        "y": 46
       },
       "id": 16,
       "maxDataPoints": 20,
@@ -2078,10 +2004,9 @@
         "effects": {
           "barGlow": true,
           "centerGlow": true,
-          "gradient": true,
-          "rounded": true,
-          "spotlight": true
+          "gradient": true
         },
+        "barShape": "rounded",
         "glow": "both",
         "orientation": "auto",
         "reduceOptions": {
@@ -2096,8 +2021,7 @@
         "shape": "circle",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
-        "sparkline": false,
-        "spotlight": true
+        "sparkline": false
       },
       "pluginVersion": "13.0.0-pre",
       "targets": [
@@ -2124,7 +2048,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 66
+        "y": 53
       },
       "id": 35,
       "panels": [],
@@ -2155,10 +2079,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 6,
+        "h": 5,
+        "w": 12,
         "x": 0,
-        "y": 67
+        "y": 54
       },
       "id": 36,
       "options": {
@@ -2166,10 +2090,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -2223,10 +2146,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 6,
-        "x": 6,
-        "y": 67
+        "h": 5,
+        "w": 12,
+        "x": 12,
+        "y": 54
       },
       "id": 37,
       "options": {
@@ -2234,10 +2157,9 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": true,
-          "rounded": false,
-          "spotlight": false
+          "gradient": true
         },
+        "barShape": "flat",
         "orientation": "auto",
         "reduceOptions": {
           "calcs": [
@@ -2279,4 +2201,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,6 +485,7 @@
       },
       "id": 12,
       "options": {
+        "displayName": "My gauge",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
@@ -955,9 +956,7 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "gradient": false,
-          "rounded": false,
-          "spotlight": false
+          "gradient": false
         },
         "orientation": "auto",
         "reduceOptions": {
@@ -1162,4 +1161,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,7 +654,9 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": "$datasource",
+        "datasource": {
+          "uid": "$datasource"
+        },
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -677,7 +679,9 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": "$datasource",
+        "datasource": {
+          "uid": "$datasource"
+        },
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

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

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

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

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

apps/iam/go.mod

@@ -89,6 +89,7 @@ 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
@@ -223,7 +224,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-20251212143239-491433b332b7 // indirect
+	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // 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,6 +167,8 @@ 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=
@@ -827,8 +829,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-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+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/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

@@ -0,0 +1,20 @@
+# 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,6 +23,7 @@ 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
@@ -90,7 +91,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-20251212143239-491433b332b7 // indirect
+	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // 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
@@ -191,7 +192,6 @@ 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,6 +7,8 @@ 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=
@@ -213,8 +215,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-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+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/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=
@@ -541,8 +543,6 @@ 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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,135 @@
+// 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,3 +1,4 @@
+// Package auth provides authentication utilities for the provisioning API.
 package auth
 
 import (
@@ -6,7 +7,6 @@ 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,29 +15,61 @@ type tokenExchanger interface {
 	Exchange(ctx context.Context, req authn.TokenExchangeRequest) (*authn.TokenExchangeResponse, error)
 }
 
-// RoundTripper injects an exchanged access token for the provisioning API into outgoing requests.
-type RoundTripper struct {
-	client    tokenExchanger
-	transport http.RoundTripper
-	audience  string
+// 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
+	}
 }
 
-// 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{
+// 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.
+type RoundTripper struct {
+	client        tokenExchanger
+	transport     http.RoundTripper
+	audience      string
+	extraAudience 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{
 		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.audience != v0alpha1.GROUP {
-		audiences = append(audiences, v0alpha1.GROUP)
+	if t.extraAudience != "" && t.extraAudience != t.audience {
+		audiences = append(audiences, t.extraAudience)
 	}
 
 	tokenResponse, err := t.client.Exchange(req.Context(), authn.TokenExchangeRequest{

apps/provisioning/pkg/auth/round_tripper_test.go

@@ -71,16 +71,29 @@ func TestRoundTripper_AudiencesAndNamespace(t *testing.T) {
 	tests := []struct {
 		name          string
 		audience      string
+		extraAudience string
 		wantAudiences []string
 	}{
 		{
-			name:          "adds group when custom audience",
+			name:          "uses only provided audience by default",
 			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:          "no duplicate when group audience",
+			name:          "extra audience no duplicate when same as primary",
 			audience:      v0alpha1.GROUP,
+			extraAudience: v0alpha1.GROUP,
 			wantAudiences: []string{v0alpha1.GROUP},
 		},
 	}
@@ -88,11 +101,15 @@ 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)
+			}), tt.audience, opts...)
 
 			req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://example", nil)
 			resp, err := tr.RoundTrip(req)

apps/provisioning/pkg/auth/session_access_checker.go

@@ -0,0 +1,153 @@
+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

@@ -0,0 +1,244 @@
+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

@@ -0,0 +1,92 @@
+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

@@ -0,0 +1,137 @@
+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,7 +23,13 @@ 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) {
-	errors := t.validator.ValidateRepository(repo)
+	// 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)
 	if len(errors) > 0 {
 		rsp := &provisioning.TestResults{
 			Code:    http.StatusUnprocessableEntity, // Invalid

apps/provisioning/pkg/repository/validator.go

@@ -32,7 +32,9 @@ 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.
-func (v *RepositoryValidator) ValidateRepository(repo Repository) field.ErrorList {
+// 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 {
 	list := repo.Validate()
 	cfg := repo.Config()
 
@@ -44,7 +46,7 @@ func (v *RepositoryValidator) ValidateRepository(repo Repository) field.ErrorLis
 		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 !slices.Contains(v.allowedTargets, cfg.Spec.Sync.Target) {
+		} else if isCreate && !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,7 +303,8 @@ 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) {
-			errors := validator.ValidateRepository(tt.repository)
+			// Tests validate new configurations, so always pass isCreate=true
+			errors := validator.ValidateRepository(tt.repository, true)
 			require.Len(t, errors, tt.expectedErrs)
 			if tt.validateError != nil {
 				tt.validateError(t, errors)

conf/defaults.ini

@@ -335,6 +335,9 @@ 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 =
 
@@ -1650,6 +1653,11 @@ 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
@@ -2261,7 +2269,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 = instance|folder
+allowed_targets = folder
 
 # Whether image rendering is allowed for dashboard previews.
 # Requires image rendering service to be configured.

conf/sample.ini

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

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

@@ -474,6 +474,7 @@
       },
       "id": 12,
       "options": {
+        "displayName": "My gauge",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
@@ -956,8 +957,6 @@
         "effects": {
           "barGlow": false,
           "centerGlow": false,
-          "rounded": false,
-          "spotlight": false,
           "gradient": false
         }
       }

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

@@ -7,7 +7,15 @@
       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]
+    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
 
   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 that the imported recording rules will query. 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 to which the imported recording rules will write metrics. By default, it is the data source selected in the **Data source** dropdown.
 
 10. Click **Import**.
 
@@ -242,6 +242,8 @@ 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.