chore(feature-toggles): Deprecate feature_toggles.enable configuration

Co-authored-by: dave.henderson <dave.henderson@grafana.com>
Revert: OSS Seeding (115729) (#115839 )
2026-01-07 17:33:22 +08:00 · 2026-01-06 12:34:25 -05:00 · 2026-01-05 12:33:55 -06:00 · 2026-01-05 11:46:14 -06:00 · 2026-01-05 17:04:07 +00:00 · 2026-01-05 17:53:45 +01:00
1077 changed files with 52914 additions and 16530 deletions
--- a/.github/CODEOWNERS
+++ b/.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
--- a/.github/actions/build-package/action.yml
+++ b/.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:
--- a/.github/actions/change-detection/action.yml
+++ b/.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/**'
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -365,7 +365,9 @@
    "type": "changedfiles",
    "matches": [
      "public/app/plugins/panel/gauge/**/*",
-      "/packages/grafana-ui/src/components/Gauge/**/*"
+      "public/app/plugins/panel/radialbar/**/*",
+      "/packages/grafana-ui/src/components/Gauge/**/*",
+      "/packages/grafana-ui/src/components/RadialGauge/**/*"
    ],
    "action": "updateLabel",
    "addLabel": "area/panel/gauge"
--- a/.github/workflows/cleanup-branches.yml
+++ b/.github/workflows/cleanup-branches.yml
@@ -14,5 +14,5 @@ jobs:
      - uses: actions/checkout@v5
      - uses: grafana/shared-workflows/actions/cleanup-branches@cleanup-branches/v0.2.1
        with:
-          dry-run: true
+          dry-run: false
          max-date: "1 month ago"
--- a/.yarn/patches/@storybook-core-npm-8.6.2-8c752112c0.patch
+++ b/.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",
--- a/SECURITY.md
+++ b/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).
--- a/apps/advisor/go.mod
+++ b/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
@@ -165,6 +166,7 @@ require (
 	github.com/grafana/grafana-azure-sdk-go/v2 v2.3.1 // indirect
 	github.com/grafana/grafana/apps/provisioning v0.0.0 // indirect
 	github.com/grafana/grafana/pkg/apiserver v0.0.0 // indirect
+	github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 // indirect
 	github.com/grafana/otel-profiling-go v0.5.1 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
 	github.com/grafana/sqlds/v4 v4.2.7 // indirect
--- a/apps/advisor/go.sum
+++ b/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=
--- a/apps/alerting/historian/go.mod
+++ b/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
--- a/apps/alerting/historian/go.sum
+++ b/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=
--- a/apps/alerting/historian/pkg/app/notification/lokireader.go
+++ b/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,
--- a/apps/alerting/historian/pkg/app/notification/lokireader_test.go
+++ b/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)
+}
--- a/apps/alerting/notifications/kinds/v0alpha1/template_spec.cue
+++ b/apps/alerting/notifications/kinds/v0alpha1/template_spec.cue
@@ -1,6 +1,9 @@
 package v0alpha1

+TemplateKind:  *"grafana" | "mimir"
+
 TemplateGroupSpec: {
 	title:   string
 	content: string
+	kind:    TemplateKind
 }
--- a/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/templategroup_spec_gen.go
+++ b/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/templategroup_spec_gen.go
@@ -2,13 +2,24 @@

 package v0alpha1

+// +k8s:openapi-gen=true
+type TemplateGroupTemplateKind string
+
+const (
+	TemplateGroupTemplateKindGrafana TemplateGroupTemplateKind = "grafana"
+	TemplateGroupTemplateKindMimir   TemplateGroupTemplateKind = "mimir"
+)
+
 // +k8s:openapi-gen=true
 type TemplateGroupSpec struct {
-	Title   string `json:"title"`
-	Content string `json:"content"`
+	Title   string                    `json:"title"`
+	Content string                    `json:"content"`
+	Kind    TemplateGroupTemplateKind `json:"kind"`
 }

 // NewTemplateGroupSpec creates a new TemplateGroupSpec object.
 func NewTemplateGroupSpec() *TemplateGroupSpec {
-	return &TemplateGroupSpec{}
+	return &TemplateGroupSpec{
+		Kind: TemplateGroupTemplateKindGrafana,
+	}
 }
--- a/apps/alerting/notifications/pkg/apis/alertingnotifications_manifest.go
+++ b/apps/alerting/notifications/pkg/apis/alertingnotifications_manifest.go
@@ -26,7 +26,7 @@ var (
 	rawSchemaRoutingTreev0alpha1       = []byte(`{"Matcher":{"additionalProperties":false,"properties":{"label":{"type":"string"},"type":{"enum":["=","!=","=~","!~"],"type":"string"},"value":{"type":"string"}},"required":["type","label","value"],"type":"object"},"Route":{"additionalProperties":false,"properties":{"active_time_intervals":{"items":{"type":"string"},"type":"array"},"continue":{"type":"boolean"},"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"matchers":{"items":{"$ref":"#/components/schemas/Matcher"},"type":"array"},"mute_time_intervals":{"items":{"type":"string"},"type":"array"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["continue"],"type":"object"},"RouteDefaults":{"additionalProperties":false,"properties":{"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"}},"required":["receiver"],"type":"object"},"RoutingTree":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"defaults":{"$ref":"#/components/schemas/RouteDefaults"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["defaults","routes"],"type":"object"}}`)
 	versionSchemaRoutingTreev0alpha1   app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaRoutingTreev0alpha1, &versionSchemaRoutingTreev0alpha1)
-	rawSchemaTemplateGroupv0alpha1     = []byte(`{"TemplateGroup":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"content":{"type":"string"},"title":{"type":"string"}},"required":["title","content"],"type":"object"}}`)
+	rawSchemaTemplateGroupv0alpha1     = []byte(`{"TemplateGroup":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"TemplateKind":{"enum":["grafana","mimir"],"type":"string"},"spec":{"additionalProperties":false,"properties":{"content":{"type":"string"},"kind":{"$ref":"#/components/schemas/TemplateKind","default":"grafana"},"title":{"type":"string"}},"required":["title","content","kind"],"type":"object"}}`)
 	versionSchemaTemplateGroupv0alpha1 app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaTemplateGroupv0alpha1, &versionSchemaTemplateGroupv0alpha1)
 	rawSchemaTimeIntervalv0alpha1      = []byte(`{"Interval":{"additionalProperties":false,"properties":{"days_of_month":{"items":{"type":"string"},"type":"array"},"location":{"type":"string"},"months":{"items":{"type":"string"},"type":"array"},"times":{"items":{"$ref":"#/components/schemas/TimeRange"},"type":"array"},"weekdays":{"items":{"type":"string"},"type":"array"},"years":{"items":{"type":"string"},"type":"array"}},"type":"object"},"TimeInterval":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"TimeRange":{"additionalProperties":false,"properties":{"end_time":{"type":"string"},"start_time":{"type":"string"}},"required":["start_time","end_time"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"name":{"type":"string"},"time_intervals":{"items":{"$ref":"#/components/schemas/Interval"},"type":"array"}},"required":["name","time_intervals"],"type":"object"}}`)
--- a/apps/dashboard/pkg/migration/conversion/conversion_data_loss_detection.go
+++ b/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
--- a/apps/dashboard/pkg/migration/conversion/metrics.go
+++ b/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)
 		}

--- a/apps/dashboard/pkg/migration/conversion/testdata/input/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.json
+++ b/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": [
        {
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_new.v42.json
+++ b/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": [
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests_old_to_new.v42.json
+++ b/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",
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.bom-in-links.json
+++ b/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"]
+    }
+  }
+}
+
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.groupby.json
+++ b/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": ""
+    }
+  }
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.panel-target-missing-refid.json
+++ b/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": {}
+}
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v2beta1.value-mapping-and-overrides.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v2beta1.value-mapping-and-overrides.json
@@ -0,0 +1,864 @@
+{
+    "kind": "DashboardWithAccessInfo",
+    "apiVersion": "dashboard.grafana.app/v2beta1",
+    "metadata": {
+      "name": "value-mapping-test",
+      "namespace": "default",
+      "uid": "value-mapping-test",
+      "resourceVersion": "1765384157199094",
+      "generation": 2,
+      "creationTimestamp": "2025-11-19T20:09:28Z",
+      "labels": {
+        "grafana.app/deprecatedInternalID": "646372978987008"
+      }
+    },
+    "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",
+      "description": "Test dashboard for all value mapping types and override matcher types",
+      "editable": true,
+      "elements": {
+        "panel-1": {
+          "kind": "Panel",
+          "spec": {
+            "id": 1,
+            "title": "ValueMap Example",
+            "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "up"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "stat",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {
+                    "mappings": [
+                      {
+                        "type": "value",
+                        "options": {
+                          "critical": {
+                            "text": "Critical!",
+                            "color": "red",
+                            "index": 0
+                          },
+                          "ok": {
+                            "text": "OK",
+                            "color": "green",
+                            "index": 2
+                          },
+                          "warning": {
+                            "text": "Warning",
+                            "color": "orange",
+                            "index": 1
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byName",
+                        "options": "status"
+                      },
+                      "properties": [
+                        {
+                          "id": "custom.width",
+                          "value": 100
+                        },
+                        {
+                          "id": "custom.align",
+                          "value": "center"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "panel-2": {
+          "kind": "Panel",
+          "spec": {
+            "id": 2,
+            "title": "RangeMap Example",
+            "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "cpu_usage_percent"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "gauge",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {
+                    "mappings": [
+                      {
+                        "type": "range",
+                        "options": {
+                          "from": 0,
+                          "to": 50,
+                          "result": {
+                            "text": "Low",
+                            "color": "green",
+                            "index": 0
+                          }
+                        }
+                      },
+                      {
+                        "type": "range",
+                        "options": {
+                          "from": 50,
+                          "to": 80,
+                          "result": {
+                            "text": "Medium",
+                            "color": "orange",
+                            "index": 1
+                          }
+                        }
+                      },
+                      {
+                        "type": "range",
+                        "options": {
+                          "from": 80,
+                          "to": 100,
+                          "result": {
+                            "text": "High",
+                            "color": "red",
+                            "index": 2
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byRegexp",
+                        "options": "/^cpu_/"
+                      },
+                      "properties": [
+                        {
+                          "id": "unit",
+                          "value": "percent"
+                        },
+                        {
+                          "id": "decimals",
+                          "value": 2
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "panel-3": {
+          "kind": "Panel",
+          "spec": {
+            "id": 3,
+            "title": "RegexMap Example",
+            "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "log_level"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "stat",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {
+                    "mappings": [
+                      {
+                        "type": "regex",
+                        "options": {
+                          "pattern": "/^error.*/",
+                          "result": {
+                            "text": "Error",
+                            "color": "red",
+                            "index": 0
+                          }
+                        }
+                      },
+                      {
+                        "type": "regex",
+                        "options": {
+                          "pattern": "/^warn.*/",
+                          "result": {
+                            "text": "Warning",
+                            "color": "orange",
+                            "index": 1
+                          }
+                        }
+                      },
+                      {
+                        "type": "regex",
+                        "options": {
+                          "pattern": "/^info.*/",
+                          "result": {
+                            "text": "Info",
+                            "color": "blue",
+                            "index": 2
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byType",
+                        "options": "string"
+                      },
+                      "properties": [
+                        {
+                          "id": "custom.cellOptions",
+                          "value": {
+                            "type": "color-text"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "panel-4": {
+          "kind": "Panel",
+          "spec": {
+            "id": 4,
+            "title": "SpecialValueMap Example",
+            "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "some_metric"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "stat",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {
+                    "mappings": [
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "null",
+                          "result": {
+                            "text": "No Data",
+                            "color": "gray",
+                            "index": 0
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "nan",
+                          "result": {
+                            "text": "Not a Number",
+                            "color": "gray",
+                            "index": 1
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "null+nan",
+                          "result": {
+                            "text": "N/A",
+                            "color": "gray",
+                            "index": 2
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "true",
+                          "result": {
+                            "text": "Yes",
+                            "color": "green",
+                            "index": 3
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "false",
+                          "result": {
+                            "text": "No",
+                            "color": "red",
+                            "index": 4
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "empty",
+                          "result": {
+                            "text": "Empty",
+                            "color": "gray",
+                            "index": 5
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byFrameRefID",
+                        "options": "A"
+                      },
+                      "properties": [
+                        {
+                          "id": "color",
+                          "value": {
+                            "fixedColor": "blue",
+                            "mode": "fixed"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "panel-6": {
+          "kind": "Panel",
+          "spec": {
+            "id": 6,
+            "title": "Empty Properties Override Example",
+            "description": "Panel with override that has empty properties array - tests conversion of overrides without any property modifications",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "empty_override_metric"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "stat",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {},
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byName",
+                        "options": "field_with_empty_override"
+                      },
+                      "properties": []
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "panel-5": {
+          "kind": "Panel",
+          "spec": {
+            "id": 5,
+            "title": "Combined Mappings and Overrides Example",
+            "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
+            "links": [],
+            "data": {
+              "kind": "QueryGroup",
+              "spec": {
+                "queries": [
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "combined_metric"
+                        }
+                      },
+                      "refId": "A",
+                      "hidden": false
+                    }
+                  },
+                  {
+                    "kind": "PanelQuery",
+                    "spec": {
+                      "query": {
+                        "kind": "DataQuery",
+                        "group": "prometheus",
+                        "version": "v0",
+                        "datasource": {
+                          "name": "prometheus-uid"
+                        },
+                        "spec": {
+                          "expr": "secondary_metric"
+                        }
+                      },
+                      "refId": "B",
+                      "hidden": false
+                    }
+                  }
+                ],
+                "transformations": [],
+                "queryOptions": {}
+              }
+            },
+            "vizConfig": {
+              "kind": "VizConfig",
+              "group": "table",
+              "version": "",
+              "spec": {
+                "options": {},
+                "fieldConfig": {
+                  "defaults": {
+                    "mappings": [
+                      {
+                        "type": "value",
+                        "options": {
+                          "failure": {
+                            "text": "Failure",
+                            "color": "red",
+                            "index": 1
+                          },
+                          "success": {
+                            "text": "Success",
+                            "color": "green",
+                            "index": 0
+                          }
+                        }
+                      },
+                      {
+                        "type": "range",
+                        "options": {
+                          "from": 0,
+                          "to": 100,
+                          "result": {
+                            "text": "In Range",
+                            "color": "blue",
+                            "index": 2
+                          }
+                        }
+                      },
+                      {
+                        "type": "regex",
+                        "options": {
+                          "pattern": "/^[A-Z]{3}-\\d+$/",
+                          "result": {
+                            "text": "ID Format",
+                            "color": "purple",
+                            "index": 3
+                          }
+                        }
+                      },
+                      {
+                        "type": "special",
+                        "options": {
+                          "match": "null",
+                          "result": {
+                            "text": "Missing",
+                            "color": "gray",
+                            "index": 4
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "overrides": [
+                    {
+                      "matcher": {
+                        "id": "byName",
+                        "options": "status"
+                      },
+                      "properties": [
+                        {
+                          "id": "custom.width",
+                          "value": 120
+                        },
+                        {
+                          "id": "custom.cellOptions",
+                          "value": {
+                            "type": "color-background"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "matcher": {
+                        "id": "byRegexp",
+                        "options": "/^value_/"
+                      },
+                      "properties": [
+                        {
+                          "id": "unit",
+                          "value": "short"
+                        },
+                        {
+                          "id": "min",
+                          "value": 0
+                        },
+                        {
+                          "id": "max",
+                          "value": 100
+                        }
+                      ]
+                    },
+                    {
+                      "matcher": {
+                        "id": "byType",
+                        "options": "number"
+                      },
+                      "properties": [
+                        {
+                          "id": "decimals",
+                          "value": 2
+                        },
+                        {
+                          "id": "thresholds",
+                          "value": {
+                            "mode": "absolute",
+                            "steps": [
+                              {
+                                "color": "green",
+                                "value": null
+                              },
+                              {
+                                "color": "yellow",
+                                "value": 50
+                              },
+                              {
+                                "color": "red",
+                                "value": 80
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "matcher": {
+                        "id": "byFrameRefID",
+                        "options": "B"
+                      },
+                      "properties": [
+                        {
+                          "id": "displayName",
+                          "value": "Secondary Query"
+                        }
+                      ]
+                    },
+                    {
+                      "matcher": {
+                        "id": "byValue",
+                        "options": {
+                          "op": "gte",
+                          "reducer": "allIsNull",
+                          "value": 0
+                        }
+                      },
+                      "properties": [
+                        {
+                          "id": "custom.hidden",
+                          "value": true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      },
+      "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"
+                }
+              }
+            },
+            {
+              "kind": "GridLayoutItem",
+              "spec": {
+                "x": 0,
+                "y": 8,
+                "width": 12,
+                "height": 8,
+                "element": {
+                  "kind": "ElementReference",
+                  "name": "panel-3"
+                }
+              }
+            },
+            {
+              "kind": "GridLayoutItem",
+              "spec": {
+                "x": 12,
+                "y": 8,
+                "width": 12,
+                "height": 8,
+                "element": {
+                  "kind": "ElementReference",
+                  "name": "panel-4"
+                }
+              }
+            },
+            {
+              "kind": "GridLayoutItem",
+              "spec": {
+                "x": 0,
+                "y": 16,
+                "width": 24,
+                "height": 8,
+                "element": {
+                  "kind": "ElementReference",
+                  "name": "panel-5"
+                }
+              }
+            },
+            {
+              "kind": "GridLayoutItem",
+              "spec": {
+                "x": 0,
+                "y": 24,
+                "width": 12,
+                "height": 8,
+                "element": {
+                  "kind": "ElementReference",
+                  "name": "panel-6"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "links": [],
+      "liveNow": false,
+      "preload": false,
+      "tags": [
+        "value-mapping",
+        "overrides",
+        "test"
+      ],
+      "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": "Value Mapping and Overrides Test",
+      "variables": []
+    },
+    "status": {
+      "conversion": {
+        "failed": false,
+        "storedVersion": "v1beta1"
+      }
+    }
+  }
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v0alpha1.json
+++ b/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",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2alpha1.json
+++ b/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)"
            }
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2beta1.json
+++ b/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)"
            }
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2alpha1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2beta1.json
+++ b/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": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -115,6 +131,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -115,6 +131,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "gdev-prometheus"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "gdev-prometheus"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -50,6 +54,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -50,6 +54,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v0alpha1.json
@@ -65,6 +65,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Versions running\nShows the versions reported by each running pod.\n\nThe rollout will fail if any pod is not running the expected version.\n\nPods in green are running the expected version, while pods running other versions are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -185,6 +188,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Deployment rollout progress\nShows the number of pods for each `Deployment` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `Deployment`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -286,6 +292,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### StatefulSet rollout progress\nShows the number of pods for each `StatefulSet` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `StatefulSet`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -399,6 +408,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Aggregator lag\nShows the consumption lag of each aggregator pod.\n\nThis panel may show no data if aggregators are not deployed to this cell.\n\nThe rollout will fail if any pod's consumption lag is both:\n* greater than 30s (red area on graph), and\n* trending upwards compared to 1 minute earlier\n\n",
        "fieldConfig": {
          "defaults": {
@@ -468,6 +480,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Unhealthy Deployment replicas\nShows the number of unavailable pods for each `Deployment`.\n\nThe rollout will fail if any `Deployment` has an unavailable pod.\n\nBoth this panel and the rollout check ignore any `Deployment`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`Deployment`s shown in green do not have any unavailable pods, while `Deployment`s shown in orange have one or more unavailable pods.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -569,6 +584,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Unhealthy StatefulSet replicas\nShows the number of pods for each `StatefulSet` that are not ready.\n\nThe rollout will fail if any `StatefulSet` has fewer ready pods than requested.\n\nBoth this panel and the rollout check ignore any `StatefulSets`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`StatefulSets`s shown in green do not have any pods that are not ready, while `StatefulSet`s shown in orange have one or more pods that are not ready.\n\n",
        "fieldConfig": {
          "defaults": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v1beta1.json
@@ -65,6 +65,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Versions running\nShows the versions reported by each running pod.\n\nThe rollout will fail if any pod is not running the expected version.\n\nPods in green are running the expected version, while pods running other versions are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -185,6 +188,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Deployment rollout progress\nShows the number of pods for each `Deployment` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `Deployment`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -286,6 +292,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### StatefulSet rollout progress\nShows the number of pods for each `StatefulSet` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `StatefulSet`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -399,6 +408,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Aggregator lag\nShows the consumption lag of each aggregator pod.\n\nThis panel may show no data if aggregators are not deployed to this cell.\n\nThe rollout will fail if any pod's consumption lag is both:\n* greater than 30s (red area on graph), and\n* trending upwards compared to 1 minute earlier\n\n",
        "fieldConfig": {
          "defaults": {
@@ -468,6 +480,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Unhealthy Deployment replicas\nShows the number of unavailable pods for each `Deployment`.\n\nThe rollout will fail if any `Deployment` has an unavailable pod.\n\nBoth this panel and the rollout check ignore any `Deployment`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`Deployment`s shown in green do not have any unavailable pods, while `Deployment`s shown in orange have one or more unavailable pods.\n\n",
        "fieldConfig": {
          "defaults": {
@@ -569,6 +584,9 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "uid": "$datasource"
+        },
        "description": "### Unhealthy StatefulSet replicas\nShows the number of pods for each `StatefulSet` that are not ready.\n\nThe rollout will fail if any `StatefulSet` has fewer ready pods than requested.\n\nBoth this panel and the rollout check ignore any `StatefulSets`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`StatefulSets`s shown in green do not have any pods that are not ready, while `StatefulSet`s shown in orange have one or more pods that are not ready.\n\n",
        "fieldConfig": {
          "defaults": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v0alpha1.json
@@ -37,6 +37,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,6 +63,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v1beta1.json
@@ -37,6 +37,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,6 +63,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v0alpha1.json
@@ -44,6 +44,9 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample metric showing connection count.",
        "fieldConfig": {
          "defaults": {
@@ -134,6 +137,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample counter metric.",
        "fieldConfig": {
          "defaults": {
@@ -224,6 +230,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample error metric.",
        "fieldConfig": {
          "defaults": {
@@ -314,6 +323,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample event rate metric.",
        "fieldConfig": {
          "defaults": {
@@ -404,6 +416,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample resource utilization metric.",
        "fieldConfig": {
          "defaults": {
@@ -493,6 +508,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample memory allocation metrics.",
        "fieldConfig": {
          "defaults": {
@@ -593,6 +611,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample utilization percentage.",
        "fieldConfig": {
          "defaults": {
@@ -662,6 +683,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample latency metric for primary operations.",
        "fieldConfig": {
          "defaults": {
@@ -748,6 +772,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample latency metric for secondary operations.",
        "fieldConfig": {
          "defaults": {
@@ -834,6 +861,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample expansion events metric.",
        "fieldConfig": {
          "defaults": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v1beta1.json
@@ -44,6 +44,9 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample metric showing connection count.",
        "fieldConfig": {
          "defaults": {
@@ -134,6 +137,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample counter metric.",
        "fieldConfig": {
          "defaults": {
@@ -224,6 +230,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample error metric.",
        "fieldConfig": {
          "defaults": {
@@ -314,6 +323,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample event rate metric.",
        "fieldConfig": {
          "defaults": {
@@ -404,6 +416,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample resource utilization metric.",
        "fieldConfig": {
          "defaults": {
@@ -493,6 +508,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample memory allocation metrics.",
        "fieldConfig": {
          "defaults": {
@@ -593,6 +611,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample utilization percentage.",
        "fieldConfig": {
          "defaults": {
@@ -662,6 +683,9 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample latency metric for primary operations.",
        "fieldConfig": {
          "defaults": {
@@ -748,6 +772,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample latency metric for secondary operations.",
        "fieldConfig": {
          "defaults": {
@@ -834,6 +861,9 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "uid": "${example_datasource}"
+        },
        "description": "Sample expansion events metric.",
        "fieldConfig": {
          "defaults": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v0alpha1.json
@@ -39,6 +39,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -61,6 +65,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -151,6 +159,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -173,6 +185,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -195,6 +211,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -229,6 +249,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 16,
@@ -251,6 +275,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 8,
@@ -286,6 +314,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 24,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v1beta1.json
@@ -39,6 +39,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -61,6 +65,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -151,6 +159,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -173,6 +185,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -195,6 +211,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -229,6 +249,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 16,
@@ -251,6 +275,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 8,
@@ -286,6 +314,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 24,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v0alpha1.json
@@ -41,6 +41,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 24,
@@ -78,6 +82,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -103,6 +111,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -128,6 +140,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "fieldConfig": {
          "defaults": {
            "thresholds": {
@@ -174,6 +190,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "${loki}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -202,6 +222,10 @@
        "type": "logs"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "${loki}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -230,6 +254,10 @@
        "type": "logs"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -255,6 +283,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Number of concurrent processing threads available for handling operations",
        "gridPos": {
          "h": 7,
@@ -280,6 +312,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "tempo",
+          "uid": "${tempo}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -324,6 +360,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
        "fieldConfig": {
          "defaults": {
@@ -425,6 +465,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
        "gridPos": {
          "h": 7,
@@ -477,6 +521,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Total number of jobs waiting to be processed",
        "gridPos": {
          "h": 7,
@@ -502,6 +550,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "fieldConfig": {
          "defaults": {
            "unit": "s"
@@ -532,6 +584,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "How long a job is in the queue before being picked up",
        "gridPos": {
          "h": 7,
@@ -584,6 +640,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -609,6 +669,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -633,6 +697,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -675,6 +743,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v1beta1.json
@@ -41,6 +41,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 24,
@@ -78,6 +82,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -103,6 +111,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -128,6 +140,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "fieldConfig": {
          "defaults": {
            "thresholds": {
@@ -174,6 +190,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "${loki}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -202,6 +222,10 @@
        "type": "logs"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "${loki}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -230,6 +254,10 @@
        "type": "logs"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -255,6 +283,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Number of concurrent processing threads available for handling operations",
        "gridPos": {
          "h": 7,
@@ -280,6 +312,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "tempo",
+          "uid": "${tempo}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -324,6 +360,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
        "fieldConfig": {
          "defaults": {
@@ -425,6 +465,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
        "gridPos": {
          "h": 7,
@@ -477,6 +521,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "Total number of jobs waiting to be processed",
        "gridPos": {
          "h": 7,
@@ -502,6 +550,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "fieldConfig": {
          "defaults": {
            "unit": "s"
@@ -532,6 +584,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "description": "How long a job is in the queue before being picked up",
        "gridPos": {
          "h": 7,
@@ -584,6 +640,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -609,6 +669,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -633,6 +697,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -675,6 +743,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prom}"
+        },
        "gridPos": {
          "h": 7,
          "w": 8,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 4,
@@ -115,6 +131,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -137,6 +157,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -159,6 +183,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 24,
@@ -181,6 +209,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 24,
@@ -203,6 +235,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -225,6 +261,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 4,
@@ -115,6 +131,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -137,6 +157,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -159,6 +183,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 6,
          "w": 24,
@@ -181,6 +209,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 24,
@@ -203,6 +235,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -225,6 +261,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 4,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +75,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -98,6 +106,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -126,6 +138,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -160,6 +176,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +75,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -98,6 +106,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -126,6 +138,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -160,6 +176,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -55,6 +59,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -83,6 +91,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -111,6 +123,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -140,6 +156,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -168,6 +188,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -55,6 +59,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -83,6 +91,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -111,6 +123,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -140,6 +156,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -168,6 +188,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -50,6 +54,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -73,6 +81,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -95,6 +107,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -50,6 +54,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -73,6 +81,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -95,6 +107,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -62,6 +66,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -102,6 +110,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 24,
@@ -144,6 +156,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -186,6 +202,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -62,6 +66,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -102,6 +110,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 24,
@@ -144,6 +156,10 @@
        "type": "gauge"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -186,6 +202,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,6 +64,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -97,6 +105,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -136,6 +148,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -165,6 +181,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,6 +64,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -97,6 +105,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -136,6 +148,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -165,6 +181,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
        "gridPos": {
          "h": 3,
@@ -57,6 +61,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
        "gridPos": {
          "h": 3,
@@ -80,6 +88,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg-\u003emean, max-\u003emax, min-\u003emin, total-\u003esum, current-\u003elastNotNull, count-\u003ecount).",
        "gridPos": {
          "h": 3,
@@ -103,6 +115,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
        "gridPos": {
          "h": 3,
@@ -126,6 +142,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
        "gridPos": {
          "h": 3,
@@ -149,6 +169,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
        "gridPos": {
          "h": 3,
@@ -172,6 +196,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
        "gridPos": {
          "h": 3,
@@ -208,6 +236,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
        "gridPos": {
          "h": 3,
@@ -231,6 +263,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests all color mode mappings: cell-\u003ecolor-background, row-\u003ecolor-background, value-\u003ecolor-text.",
        "gridPos": {
          "h": 3,
@@ -254,6 +290,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
        "gridPos": {
          "h": 3,
@@ -277,6 +317,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
        "gridPos": {
          "h": 3,
@@ -300,6 +344,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
        "gridPos": {
          "h": 3,
@@ -323,6 +371,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests various date format patterns and aliases.",
        "gridPos": {
          "h": 3,
@@ -346,6 +398,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -369,6 +425,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Angular table without styles property should not be migrated.",
        "gridPos": {
          "h": 3,
@@ -392,6 +452,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Non-table panels should remain completely unchanged.",
        "gridPos": {
          "h": 3,
@@ -415,6 +479,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Other panel types should not be affected by table migration.",
        "gridPos": {
          "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
        "gridPos": {
          "h": 3,
@@ -57,6 +61,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
        "gridPos": {
          "h": 3,
@@ -80,6 +88,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg-\u003emean, max-\u003emax, min-\u003emin, total-\u003esum, current-\u003elastNotNull, count-\u003ecount).",
        "gridPos": {
          "h": 3,
@@ -103,6 +115,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
        "gridPos": {
          "h": 3,
@@ -126,6 +142,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
        "gridPos": {
          "h": 3,
@@ -149,6 +169,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
        "gridPos": {
          "h": 3,
@@ -172,6 +196,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
        "gridPos": {
          "h": 3,
@@ -208,6 +236,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
        "gridPos": {
          "h": 3,
@@ -231,6 +263,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests all color mode mappings: cell-\u003ecolor-background, row-\u003ecolor-background, value-\u003ecolor-text.",
        "gridPos": {
          "h": 3,
@@ -254,6 +290,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
        "gridPos": {
          "h": 3,
@@ -277,6 +317,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
        "gridPos": {
          "h": 3,
@@ -300,6 +344,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
        "gridPos": {
          "h": 3,
@@ -323,6 +371,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests various date format patterns and aliases.",
        "gridPos": {
          "h": 3,
@@ -346,6 +398,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -369,6 +425,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Angular table without styles property should not be migrated.",
        "gridPos": {
          "h": 3,
@@ -392,6 +452,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Non-table panels should remain completely unchanged.",
        "gridPos": {
          "h": 3,
@@ -415,6 +479,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Other panel types should not be affected by table migration.",
        "gridPos": {
          "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v0alpha1.json
@@ -33,6 +33,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -55,6 +59,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v1beta1.json
@@ -33,6 +33,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -55,6 +59,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "text"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -56,6 +60,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -78,6 +86,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,6 +119,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -56,6 +60,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -78,6 +86,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,6 +119,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -56,6 +60,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -85,6 +93,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,6 +119,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -136,6 +152,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -159,6 +179,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "gridPos": {
          "h": 8,
          "w": 8,
@@ -182,6 +206,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -249,6 +277,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "gridPos": {
          "h": 8,
          "w": 8,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -56,6 +60,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -85,6 +93,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,6 +119,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -136,6 +152,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -159,6 +179,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "gridPos": {
          "h": 8,
          "w": 8,
@@ -182,6 +206,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -249,6 +277,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PD8C576611E62080A"
+        },
        "gridPos": {
          "h": 8,
          "w": 8,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -49,6 +53,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,6 +105,10 @@
        "type": "barchart"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -125,6 +129,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -151,6 +159,10 @@
        "type": "xychart"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -178,6 +190,10 @@
        "type": "xychart2"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -204,6 +220,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -305,6 +325,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "fieldConfig": {
              "defaults": {
                "unit": "bytes"
@@ -337,6 +361,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "fieldConfig": {
              "overrides": [
                {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -125,6 +129,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -151,6 +159,10 @@
        "type": "xychart"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -178,6 +190,10 @@
        "type": "xychart2"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -204,6 +220,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -305,6 +325,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "fieldConfig": {
              "defaults": {
                "unit": "bytes"
@@ -337,6 +361,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "fieldConfig": {
              "overrides": [
                {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,6 +63,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -99,6 +107,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -149,6 +161,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -171,6 +187,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -259,6 +279,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,6 +63,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -99,6 +107,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -149,6 +161,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -171,6 +187,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -259,6 +279,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v0alpha1.json
@@ -33,6 +33,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +75,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v1beta1.json
@@ -33,6 +33,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +75,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "non-default-test-ds-uid"
+        },
        "description": "Tests v33 migration behavior when panel datasource is explicitly null. Should remain null after migration (returnDefaultAsNull: true).",
        "gridPos": {
          "h": 3,
@@ -51,6 +55,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests v33 migration behavior when panel datasource is already a proper object reference. Should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -75,6 +83,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "non-default-test-ds-uid"
+        },
        "description": "Tests v33 migration when panel datasource is a string name. Should convert to proper object with uid, type, apiVersion.",
        "gridPos": {
          "h": 3,
@@ -98,6 +110,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests v33 migration when panel has datasource string but empty targets array. Panel datasource should still migrate.",
        "gridPos": {
          "h": 3,
@@ -283,6 +299,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "description": "Nested panel with string datasource should migrate to proper object reference, proving row panel recursion works.",
            "gridPos": {
              "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "non-default-test-ds-uid"
+        },
        "description": "Tests v33 migration behavior when panel datasource is explicitly null. Should remain null after migration (returnDefaultAsNull: true).",
        "gridPos": {
          "h": 3,
@@ -51,6 +55,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests v33 migration behavior when panel datasource is already a proper object reference. Should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -75,6 +83,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "loki",
+          "uid": "non-default-test-ds-uid"
+        },
        "description": "Tests v33 migration when panel datasource is a string name. Should convert to proper object with uid, type, apiVersion.",
        "gridPos": {
          "h": 3,
@@ -98,6 +110,10 @@
        "type": "table"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests v33 migration when panel has datasource string but empty targets array. Panel datasource should still migrate.",
        "gridPos": {
          "h": 3,
@@ -283,6 +299,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "description": "Nested panel with string datasource should migrate to proper object reference, proving row panel recursion works.",
            "gridPos": {
              "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v0alpha1.json
@@ -289,6 +289,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -355,6 +359,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -386,6 +394,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -492,6 +504,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -522,6 +538,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -626,6 +646,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -689,6 +713,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -738,6 +766,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -769,6 +801,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -818,6 +854,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -849,6 +889,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -927,6 +971,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -1006,6 +1054,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v1beta1.json
@@ -289,6 +289,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -355,6 +359,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -386,6 +394,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -492,6 +504,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -522,6 +538,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -626,6 +646,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -689,6 +713,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -738,6 +766,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -769,6 +801,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -818,6 +854,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -849,6 +889,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -927,6 +971,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "default-ds-uid"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -1006,6 +1054,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
            "gridPos": {
              "h": 3,
              "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v0alpha1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -70,6 +74,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -125,6 +133,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -154,6 +166,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -183,6 +199,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -205,6 +225,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -227,6 +251,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "unit": "bytes"
@@ -254,6 +282,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v1beta1.json
@@ -27,6 +27,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -70,6 +74,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -125,6 +133,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -154,6 +166,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -183,6 +199,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -205,6 +225,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -227,6 +251,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "unit": "bytes"
@@ -254,6 +282,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "fieldConfig": {
          "defaults": {
            "custom": {
--- a/Show More
+++ b/Show More