Provisioning: Improve connection deletion error handling with undelete

When finalizer removal fails, the connection is now "undeleted" by removing the DeletionTimestamp. This prevents connections from being stuck in deletion state and allows users to retry deletion later. Additionally: - Expand retry logic to handle more transient errors (not just ServiceUnavailable) - Add isTransientError helper to detect retriable errors - Add comprehensive tests for undelete behavior and transient error detection This ensures that if the controller cannot remove the finalizer due to transient errors (network issues, API timeouts, etc.), the connection returns to normal state rather than remaining stuck in deletion.
Provisioning: Add finalizer-based deletion handling for connections
2026-01-14 13:21:26 +00:00 · 2026-01-12 08:38:14 +01:00 · 2026-01-09 17:51:02 +01:00 · 2026-01-09 16:34:41 +01:00 · 2026-01-09 13:18:59 +01:00 · 2026-01-09 11:56:55 +00:00
717 changed files with 25633 additions and 18155 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -94,7 +94,6 @@
 /apps/shorturl/ @grafana/sharing-squad
 /apps/secret/ @grafana/grafana-operator-experience-squad
 /apps/scope/ @grafana/grafana-operator-experience-squad
-/apps/investigations/ @fcjack @matryer @svennergr
 /apps/advisor/ @grafana/plugins-platform-backend
 /apps/iam/ @grafana/access-squad
 /apps/sdk.mk @grafana/grafana-app-platform-squad
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -19,7 +19,6 @@ updates:
      - "/apps/dashboard"
      - "/apps/folder"
      - "/apps/iam"
-      - "/apps/investigations"
      - "/apps/playlist"
      - "/apps/plugins"
      - "/apps/preferences"
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -67,14 +67,6 @@ linters:
          deny:
            - pkg: github.com/grafana/grafana/pkg
              desc: apiserver is not allowed to import grafana core
-        apps-investigation:
-          list-mode: lax
-          files:
-            - ./apps/investigations/*
-            - ./apps/investigations/**/*
-          deny:
-            - pkg: github.com/grafana/grafana/pkg
-              desc: apps/investigations is not allowed to import grafana core
        apps-playlist:
          list-mode: lax
          files:
--- a/.yarn/patches/@storybook-core-npm-8.6.15-a468a35170.patch
+++ b/.yarn/patches/@storybook-core-npm-8.6.15-a468a35170.patch
@@ -1,8 +1,8 @@
 diff --git a/dist/builder-manager/index.js b/dist/builder-manager/index.js
-index 3d7f9b213dae1801bda62b31db31b9113e382ccd..212501c63d20146c29db63fb0f6300c6779eecb5 100644
+index ac8ac6a5f6a3b7852c4064e93dc9acd3201289e6..34a0a5a5c38dd7fe525c9ebd382a10a451d4d4f3 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) => {
+@@ -1974,7 +1974,7 @@ var pa = /^\/($|\?)/, G, C, xt = /* @__PURE__ */ o(async (e) => {
     bundle: !0,
     minify: !0,
     sourcemap: !1,
--- a/2
+++ b/2
@@ -91,6 +91,7 @@ COPY pkg/storage/unified/resource pkg/storage/unified/resource
 COPY pkg/storage/unified/resourcepb pkg/storage/unified/resourcepb
 COPY pkg/storage/unified/apistore pkg/storage/unified/apistore
 COPY pkg/semconv pkg/semconv
+COPY pkg/plugins pkg/plugins
 COPY pkg/aggregator pkg/aggregator
 COPY apps/playlist apps/playlist
 COPY apps/quotas apps/quotas
@@ -103,7 +104,6 @@ COPY apps/collections apps/collections
 COPY apps/provisioning apps/provisioning
 COPY apps/secret apps/secret
 COPY apps/scope apps/scope
-COPY apps/investigations apps/investigations
 COPY apps/logsdrilldown apps/logsdrilldown
 COPY apps/advisor apps/advisor
 COPY apps/dashboard apps/dashboard
--- 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
@@ -67,14 +68,14 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/at-wat/mqtt-go v0.19.6 // indirect
 	github.com/aws/aws-sdk-go v1.55.7 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.39.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.18.14 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.8 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.38.5 // indirect
-	github.com/aws/smithy-go v1.23.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.40.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // indirect
+	github.com/aws/smithy-go v1.23.2 // indirect
 	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -161,14 +162,14 @@ require (
 	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
-	github.com/grafana/grafana-aws-sdk v1.3.0 // indirect
+	github.com/grafana/grafana-aws-sdk v1.4.2 // indirect
 	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
+	github.com/grafana/sqlds/v5 v5.0.3 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // 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=
@@ -171,44 +173,44 @@ github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
 github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
-github.com/aws/aws-sdk-go-v2 v1.39.1 h1:fWZhGAwVRK/fAN2tmt7ilH4PPAE11rDj7HytrmbZ2FE=
-github.com/aws/aws-sdk-go-v2 v1.39.1/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
+github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
+github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 h1:12SpdwU8Djs+YGklkinSSlcrPyj3H4VifVsKf78KbwA=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11/go.mod h1:dd+Lkp6YmMryke+qxW/VnKyhMBDTYP41Q2Bb+6gNZgY=
-github.com/aws/aws-sdk-go-v2/config v1.31.10 h1:7LllDZAegXU3yk41mwM6KcPu0wmjKGQB1bg99bNdQm4=
-github.com/aws/aws-sdk-go-v2/config v1.31.10/go.mod h1:Ge6gzXPjqu4v0oHvgAwvGzYcK921GU0hQM25WF/Kl+8=
-github.com/aws/aws-sdk-go-v2/credentials v1.18.14 h1:TxkI7QI+sFkTItN/6cJuMZEIVMFXeu2dI1ZffkXngKI=
-github.com/aws/aws-sdk-go-v2/credentials v1.18.14/go.mod h1:12x4Uw/vijC11XkctTjy92TNCQ+UnNJkT7fzX0Yd93E=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.8 h1:gLD09eaJUdiszm7vd1btiQUYE0Hj+0I2b8AS+75z9AY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.8/go.mod h1:4RW3oMPt1POR74qVOC4SbubxAwdP4pCT0nSw3jycOU4=
+github.com/aws/aws-sdk-go-v2/config v1.31.17 h1:QFl8lL6RgakNK86vusim14P2k8BFSxjvUkcWLDjgz9Y=
+github.com/aws/aws-sdk-go-v2/config v1.31.17/go.mod h1:V8P7ILjp/Uef/aX8TjGk6OHZN6IKPM5YW6S78QnRD5c=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.21 h1:56HGpsgnmD+2/KpG0ikvvR8+3v3COCwaF4r+oWwOeNA=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.21/go.mod h1:3YELwedmQbw7cXNaII2Wywd+YY58AmLPwX4LzARgmmA=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13/go.mod h1:Peg/GBAQ6JDt+RoBf4meB1wylmAipb7Kg2ZFakZTlwk=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 h1:cTXRdLkpBanlDwISl+5chq5ui1d1YWg4PWMR9c3kXyw=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84/go.mod h1:kwSy5X7tfIHN39uucmjQVs2LvDdXEjQucgQQEqCggEo=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.8 h1:6bgAZgRyT4RoFWhxS+aoGMFyE0cD1bSzFnEEi4bFPGI=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.8/go.mod h1:KcGkXFVU8U28qS4KvLEcPxytPZPBcRawaH2Pf/0jptE=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.8 h1:HhJYoES3zOz34yWEpGENqJvRVPqpmJyR3+AFg9ybhdY=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.8/go.mod h1:JnA+hPWeYAVbDssp83tv+ysAG8lTfLVXvSsyKg/7xNA=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 h1:GMYy2EOWfzdP3wfVAGXBNKY5vK4K8vMET4sYOYltmqs=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36/go.mod h1:gDhdAV6wL3PmPqBhiPbnlS447GoWs8HTTOYef9/9Inw=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 h1:nAP2GYbfh8dd2zGZqFRSMlq+/F6cMPBUuCsGAMkN074=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4/go.mod h1:LT10DsiGjLWh4GbjInf9LQejkYEhBgBCjLG5+lvk4EE=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.8 h1:M6JI2aGFEzYxsF6CXIuRBnkge9Wf9a2xU39rNeXgu10=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.8/go.mod h1:Fw+MyTwlwjFsSTE31mH211Np+CUslml8mzc0AFEG09s=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 h1:kDqdFvMY4AtKoACfzIGD8A0+hbT41KTKF//gq7jITfM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13/go.mod h1:lmKuogqSU3HzQCwZ9ZtcqOc5XGMqtDK7OIc2+DxiUEg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 h1:qcLWgdhq45sDM9na4cvXax9dyLitn8EYBRl8Ak4XtG4=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17/go.mod h1:M+jkjBFZ2J6DJrjMv2+vkBbuht6kxJYtJiwoVgX4p4U=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 h1:0reDqfEN+tB+sozj2r92Bep8MEwBZgtAXTND1Kk9OXg=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0/go.mod h1:kUklwasNoCn5YpyAqC/97r6dzTA1SRKJfKq16SXeoDU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.29.4 h1:FTdEN9dtWPB0EOURNtDPmwGp6GGvMqRJCAihkSl/1No=
-github.com/aws/aws-sdk-go-v2/service/sso v1.29.4/go.mod h1:mYubxV9Ff42fZH4kexj43gFPhgc/LyC7KqvUKt1watc=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.0 h1:I7ghctfGXrscr7r1Ga/mDqSJKm7Fkpl5Mwq79Z+rZqU=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.0/go.mod h1:Zo9id81XP6jbayIFWNuDpA6lMBWhsVy+3ou2jLa4JnA=
-github.com/aws/aws-sdk-go-v2/service/sts v1.38.5 h1:+LVB0xBqEgjQoqr9bGZbRzvg212B0f17JdflleJRNR4=
-github.com/aws/aws-sdk-go-v2/service/sts v1.38.5/go.mod h1:xoaxeqnnUaZjPjaICgIy5B+MHCSb/ZSOn4MvkFNOUA0=
-github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
-github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 h1:0JPwLz1J+5lEOfy/g0SURC9cxhbQ1lIMHMa+AHZSzz0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.1/go.mod h1:fKvyjJcz63iL/ftA6RaM8sRCtN4r4zl4tjL3qw5ec7k=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 h1:OWs0/j2UYR5LOGi88sD5/lhN6TDLG6SfA7CqsQO9zF0=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5/go.mod h1:klO+ejMvYsB4QATfEOIXk8WAEwN4N0aBfJpvC+5SZBo=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 h1:mLlUgHn02ue8whiR4BmxxGJLR2gwU6s6ZzJ5wDamBUs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.1/go.mod h1:E19xDjpzPZC7LS2knI9E6BaRFDK43Eul7vd6rSq2HWk=
+github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
+github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0=
@@ -635,8 +637,8 @@ github.com/grafana/grafana-app-sdk v0.48.7 h1:9mF7nqkqP0QUYYDlznoOt+GIyjzj45wGfU
 github.com/grafana/grafana-app-sdk v0.48.7/go.mod h1:DWsaaH39ZMHwSOSoUBaeW8paMrRaYsjRYlLwCJYd78k=
 github.com/grafana/grafana-app-sdk/logging v0.48.7 h1:Oa5qg473gka5+W/WQk61Xbw4YdAv+wV2Z4bJtzeCaQw=
 github.com/grafana/grafana-app-sdk/logging v0.48.7/go.mod h1:5u3KalezoBAAo2Y3ytDYDAIIPvEqFLLDSxeiK99QxDU=
-github.com/grafana/grafana-aws-sdk v1.3.0 h1:/bfJzP93rCel1GbWoRSq0oUo424MZXt8jAp2BK9w8tM=
-github.com/grafana/grafana-aws-sdk v1.3.0/go.mod h1:VGycF0JkCGKND2O5je1ucOqPJ0ZNhZYzV3c2bNBAaGk=
+github.com/grafana/grafana-aws-sdk v1.4.2 h1:GrUEoLbs46r8rG/GZL4L2b63Bo+rkIYKdtCT7kT5KkM=
+github.com/grafana/grafana-aws-sdk v1.4.2/go.mod h1:1qnZdYs6gQzxxF0dDodaE7Rn9fiMzuhwvtaAZ7ySnhY=
 github.com/grafana/grafana-azure-sdk-go/v2 v2.3.1 h1:FFcEA01tW+SmuJIuDbHOdgUBL+d7DPrZ2N4zwzPhfGk=
 github.com/grafana/grafana-azure-sdk-go/v2 v2.3.1/go.mod h1:Oi4anANlCuTCc66jCyqIzfVbgLXFll8Wja+Y4vfANlc=
 github.com/grafana/grafana-plugin-sdk-go v0.284.0 h1:1bK7eWsnPBLUWDcWJWe218Ik5ad0a5JpEL4mH9ry7Ws=
@@ -653,8 +655,8 @@ github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasn
 github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
-github.com/grafana/sqlds/v4 v4.2.7 h1:sFQhsS7DBakNMdxa++yOfJ9BVvkZwFJ0B95o57K0/XA=
-github.com/grafana/sqlds/v4 v4.2.7/go.mod h1:BQRjUG8rOqrBI4NAaeoWrIMuoNgfi8bdhCJ+5cgEfLU=
+github.com/grafana/sqlds/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
+github.com/grafana/sqlds/v5 v5.0.3/go.mod h1:GKeTTiC+GeR1X0z3f0Iee+hZnNgN62uQpj5XVMx5Uew=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
 github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
--- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
@@ -129,7 +129,7 @@ DashboardLink: {
 	placement?: DashboardLinkPlacement
 }

-// Dashboard Link placement. Defines where the link should be displayed. 
+// Dashboard Link placement. Defines where the link should be displayed.
 // - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu
 DashboardLinkPlacement: "inControlsMenu"

@@ -932,6 +932,7 @@ CustomVariableSpec: {
 	skipUrlSync:  bool | *false
 	description?: string
 	allowCustomValue: bool | *true
+	valuesFormat?: "csv" | "json"
 }

 // Custom variable kind
--- a/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2beta1/dashboard_spec.cue
@@ -935,6 +935,7 @@ CustomVariableSpec: {
 	skipUrlSync:  bool | *false
 	description?: string
 	allowCustomValue: bool | *true
+	valuesFormat?: "csv" | "json"
 }

 // Custom variable kind
--- a/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue
@@ -222,8 +222,10 @@ lineage: schemas: [{
 			// Optional field, if you want to extract part of a series name or metric node segment.
 			// Named capture groups can be used to separate the display text and value.
 			regex?: string
-      // Determine whether regex applies to variable value or display text
-      regexApplyTo?: #VariableRegexApplyTo
+			// Optional, indicates whether a custom type variable uses CSV or JSON to define its values
+			valuesFormat?: "csv" | "json" | *"csv"
+			// Determine whether regex applies to variable value or display text
+			regexApplyTo?: #VariableRegexApplyTo
 			// Additional static options for query variable
 			staticOptions?: [...#VariableOption]
 			// Ordering of static options in relation to options returned from data source for query variable
--- a/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
@@ -222,8 +222,10 @@ lineage: schemas: [{
 			// Optional field, if you want to extract part of a series name or metric node segment.
 			// Named capture groups can be used to separate the display text and value.
 			regex?: string
-      // Determine whether regex applies to variable value or display text
-      regexApplyTo?: #VariableRegexApplyTo
+			// Optional, indicates whether a custom type variable uses CSV or JSON to define its values
+			valuesFormat?: "csv" | "json" | *"csv"
+			// Determine whether regex applies to variable value or display text
+			regexApplyTo?: #VariableRegexApplyTo
 			// Additional static options for query variable
 			staticOptions?: [...#VariableOption]
 			// Ordering of static options in relation to options returned from data source for query variable
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
@@ -133,7 +133,7 @@ DashboardLink: {
 	placement?: DashboardLinkPlacement
 }

-// Dashboard Link placement. Defines where the link should be displayed. 
+// Dashboard Link placement. Defines where the link should be displayed.
 // - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu
 DashboardLinkPlacement: "inControlsMenu"

@@ -936,6 +936,7 @@ CustomVariableSpec: {
 	skipUrlSync:  bool | *false
 	description?: string
 	allowCustomValue: bool | *true
+	valuesFormat?: "csv" | "json"
 }

 // Custom variable kind
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
@@ -1703,18 +1703,19 @@ func NewDashboardCustomVariableKind() *DashboardCustomVariableKind {
 // Custom variable specification
 // +k8s:openapi-gen=true
 type DashboardCustomVariableSpec struct {
-	Name             string                    `json:"name"`
-	Query            string                    `json:"query"`
-	Current          DashboardVariableOption   `json:"current"`
-	Options          []DashboardVariableOption `json:"options"`
-	Multi            bool                      `json:"multi"`
-	IncludeAll       bool                      `json:"includeAll"`
-	AllValue         *string                   `json:"allValue,omitempty"`
-	Label            *string                   `json:"label,omitempty"`
-	Hide             DashboardVariableHide     `json:"hide"`
-	SkipUrlSync      bool                      `json:"skipUrlSync"`
-	Description      *string                   `json:"description,omitempty"`
-	AllowCustomValue bool                      `json:"allowCustomValue"`
+	Name             string                                   `json:"name"`
+	Query            string                                   `json:"query"`
+	Current          DashboardVariableOption                  `json:"current"`
+	Options          []DashboardVariableOption                `json:"options"`
+	Multi            bool                                     `json:"multi"`
+	IncludeAll       bool                                     `json:"includeAll"`
+	AllValue         *string                                  `json:"allValue,omitempty"`
+	Label            *string                                  `json:"label,omitempty"`
+	Hide             DashboardVariableHide                    `json:"hide"`
+	SkipUrlSync      bool                                     `json:"skipUrlSync"`
+	Description      *string                                  `json:"description,omitempty"`
+	AllowCustomValue bool                                     `json:"allowCustomValue"`
+	ValuesFormat     *DashboardCustomVariableSpecValuesFormat `json:"valuesFormat,omitempty"`
 }

 // NewDashboardCustomVariableSpec creates a new DashboardCustomVariableSpec object.
@@ -2098,6 +2099,14 @@ const (
 	DashboardQueryVariableSpecStaticOptionsOrderSorted DashboardQueryVariableSpecStaticOptionsOrder = "sorted"
 )

+// +k8s:openapi-gen=true
+type DashboardCustomVariableSpecValuesFormat string
+
+const (
+	DashboardCustomVariableSpecValuesFormatCsv  DashboardCustomVariableSpecValuesFormat = "csv"
+	DashboardCustomVariableSpecValuesFormatJson DashboardCustomVariableSpecValuesFormat = "json"
+)
+
 // +k8s:openapi-gen=true
 type DashboardPanelKindOrLibraryPanelKind struct {
 	PanelKind        *DashboardPanelKind        `json:"PanelKind,omitempty"`
--- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
@@ -1548,6 +1548,12 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardCustomVariableSpec(ref common.R
 							Format:  "",
 						},
 					},
+					"valuesFormat": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
 				},
 				Required: []string{"name", "query", "current", "options", "multi", "includeAll", "hide", "skipUrlSync", "allowCustomValue"},
 			},
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue
@@ -939,6 +939,7 @@ CustomVariableSpec: {
 	skipUrlSync:  bool | *false
 	description?: string
 	allowCustomValue: bool | *true
+	valuesFormat?: "csv" | "json"
 }

 // Custom variable kind
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go
@@ -1707,18 +1707,19 @@ func NewDashboardCustomVariableKind() *DashboardCustomVariableKind {
 // Custom variable specification
 // +k8s:openapi-gen=true
 type DashboardCustomVariableSpec struct {
-	Name             string                    `json:"name"`
-	Query            string                    `json:"query"`
-	Current          DashboardVariableOption   `json:"current"`
-	Options          []DashboardVariableOption `json:"options"`
-	Multi            bool                      `json:"multi"`
-	IncludeAll       bool                      `json:"includeAll"`
-	AllValue         *string                   `json:"allValue,omitempty"`
-	Label            *string                   `json:"label,omitempty"`
-	Hide             DashboardVariableHide     `json:"hide"`
-	SkipUrlSync      bool                      `json:"skipUrlSync"`
-	Description      *string                   `json:"description,omitempty"`
-	AllowCustomValue bool                      `json:"allowCustomValue"`
+	Name             string                                   `json:"name"`
+	Query            string                                   `json:"query"`
+	Current          DashboardVariableOption                  `json:"current"`
+	Options          []DashboardVariableOption                `json:"options"`
+	Multi            bool                                     `json:"multi"`
+	IncludeAll       bool                                     `json:"includeAll"`
+	AllValue         *string                                  `json:"allValue,omitempty"`
+	Label            *string                                  `json:"label,omitempty"`
+	Hide             DashboardVariableHide                    `json:"hide"`
+	SkipUrlSync      bool                                     `json:"skipUrlSync"`
+	Description      *string                                  `json:"description,omitempty"`
+	AllowCustomValue bool                                     `json:"allowCustomValue"`
+	ValuesFormat     *DashboardCustomVariableSpecValuesFormat `json:"valuesFormat,omitempty"`
 }

 // NewDashboardCustomVariableSpec creates a new DashboardCustomVariableSpec object.
@@ -2133,6 +2134,14 @@ const (
 	DashboardQueryVariableSpecStaticOptionsOrderSorted DashboardQueryVariableSpecStaticOptionsOrder = "sorted"
 )

+// +k8s:openapi-gen=true
+type DashboardCustomVariableSpecValuesFormat string
+
+const (
+	DashboardCustomVariableSpecValuesFormatCsv  DashboardCustomVariableSpecValuesFormat = "csv"
+	DashboardCustomVariableSpecValuesFormatJson DashboardCustomVariableSpecValuesFormat = "json"
+)
+
 // +k8s:openapi-gen=true
 type DashboardPanelKindOrLibraryPanelKind struct {
 	PanelKind        *DashboardPanelKind        `json:"PanelKind,omitempty"`
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/zz_generated.openapi.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/zz_generated.openapi.go
@@ -1560,6 +1560,12 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardCustomVariableSpec(ref common.Re
 							Format:  "",
 						},
 					},
+					"valuesFormat": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
 				},
 				Required: []string{"name", "query", "current", "options", "multi", "includeAll", "hide", "skipUrlSync", "allowCustomValue"},
 			},
--- a/apps/dashboard/pkg/apis/dashboard_manifest.go
+++ b/apps/dashboard/pkg/apis/dashboard_manifest.go
--- 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/v1beta1.legacy-ds-ref.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.legacy-ds-ref.json
@@ -0,0 +1,287 @@
+{
+    "kind": "Dashboard",
+    "apiVersion": "dashboard.grafana.app/v1beta1",
+    "metadata": {
+      "name": "legacy-ds-ref"
+    },
+    "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,
+      "panels": [
+        {
+          "datasource": "${datasource}",
+          "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": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Minimum cluster size"
+                },
+                "properties": [
+                  {
+                    "id": "color",
+                    "value": {
+                      "fixedColor": "red",
+                      "mode": "fixed"
+                    }
+                  },
+                  {
+                    "id": "custom.lineStyle",
+                    "value": {
+                      "dash": [10, 10],
+                      "fill": "dash"
+                    }
+                  },
+                  {
+                    "id": "custom.lineWidth",
+                    "value": 1
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 9,
+            "w": 8,
+            "x": 0,
+            "y": 0
+          },
+          "id": 16,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "timeCompare": false,
+            "tooltip": {
+              "hideZeros": false,
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": "${datasource}",
+              "editorMode": "code",
+              "expr": "count by (version) (alloy_build_info{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"})",
+              "instant": false,
+              "legendFormat": "{{version}}",
+              "range": true,
+              "refId": "B"
+            }
+          ],
+          "title": "Number of Alloy Instances",
+          "type": "timeseries"
+        },
+        {
+          "datasource": "${datasource}",
+          "description": "CPU usage of the Alloy process relative to 1 CPU core.\n\nFor example, 100% means using one entire CPU core.\n",
+          "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
+                  }
+                ]
+              },
+              "unit": "percentunit"
+            },
+            "overrides": [
+              {
+                "__systemRef": "hideSeriesFrom",
+                "matcher": {
+                  "id": "byNames",
+                  "options": {
+                    "mode": "exclude",
+                    "names": [
+                      "Total"
+                    ],
+                    "prefix": "All except:",
+                    "readOnly": true
+                  }
+                },
+                "properties": [
+                  {
+                    "id": "custom.hideFrom",
+                    "value": {
+                      "legend": false,
+                      "tooltip": true,
+                      "viz": true
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 9,
+            "w": 8,
+            "x": 8,
+            "y": 0
+          },
+          "id": 17,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "timeCompare": false,
+            "tooltip": {
+              "hideZeros": false,
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": "${datasource}",
+              "expr": "rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+              "hide": true,
+              "instant": false,
+              "legendFormat": "{{instance}}",
+              "range": true,
+              "refId": "A"
+            },
+            {
+              "datasource": "${datasource}",
+              "editorMode": "code",
+              "expr": "sum(rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))",
+              "instant": false,
+              "legendFormat": "Total",
+              "range": true,
+              "refId": "B"
+            }
+          ],
+          "title": "CPU usage",
+          "type": "timeseries"
+        } 
+      ],
+      "time": {
+        "from": "now-90m",
+        "to": "now"
+      },
+      "timezone": "utc",
+      "title": "Legacy DS Panel Query Ref",
+      "weekStart": ""
+    }
+}
+ 
+  
--- 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/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v0alpha1.json
@@ -77,6 +77,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource migration with targets - should fallback to default",
        "gridPos": {
          "h": 3,
@@ -100,6 +104,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource with empty targets array - should create default target",
        "gridPos": {
          "h": 3,
@@ -123,6 +131,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource with missing targets - should create default target array",
        "gridPos": {
          "h": 3,
@@ -180,6 +192,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with already migrated datasource object - should preserve existing refs",
        "gridPos": {
          "h": 3,
@@ -203,6 +219,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "unknown-target-datasource"
+        },
        "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
        "gridPos": {
          "h": 3,
@@ -260,6 +280,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel inheriting datasource from target when panel datasource was default",
        "gridPos": {
          "h": 3,
@@ -283,6 +307,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with datasource referenced by name - should migrate to full object",
        "gridPos": {
          "h": 3,
@@ -306,6 +334,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with datasource referenced by UID - should migrate to full object",
        "gridPos": {
          "h": 3,
@@ -345,6 +377,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "elasticsearch",
+              "uid": "existing-target-uid"
+            },
            "description": "Nested panel in collapsed row with default datasource",
            "gridPos": {
              "h": 3,
@@ -368,6 +404,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "elasticsearch",
+              "uid": "existing-target-uid"
+            },
            "description": "Nested panel in collapsed row with unknown datasource",
            "gridPos": {
              "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v1beta1.json
@@ -77,6 +77,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource migration with targets - should fallback to default",
        "gridPos": {
          "h": 3,
@@ -100,6 +104,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource with empty targets array - should create default target",
        "gridPos": {
          "h": 3,
@@ -123,6 +131,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "description": "Tests null panel datasource with missing targets - should create default target array",
        "gridPos": {
          "h": 3,
@@ -180,6 +192,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with already migrated datasource object - should preserve existing refs",
        "gridPos": {
          "h": 3,
@@ -203,6 +219,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "unknown-target-datasource"
+        },
        "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
        "gridPos": {
          "h": 3,
@@ -260,6 +280,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel inheriting datasource from target when panel datasource was default",
        "gridPos": {
          "h": 3,
@@ -283,6 +307,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with datasource referenced by name - should migrate to full object",
        "gridPos": {
          "h": 3,
@@ -306,6 +334,10 @@
        "type": "timeseries"
      },
      {
+        "datasource": {
+          "type": "elasticsearch",
+          "uid": "existing-target-uid"
+        },
        "description": "Tests panel with datasource referenced by UID - should migrate to full object",
        "gridPos": {
          "h": 3,
@@ -345,6 +377,10 @@
        "id": -1,
        "panels": [
          {
+            "datasource": {
+              "type": "elasticsearch",
+              "uid": "existing-target-uid"
+            },
            "description": "Nested panel in collapsed row with default datasource",
            "gridPos": {
              "h": 3,
@@ -368,6 +404,10 @@
            "type": "timeseries"
          },
          {
+            "datasource": {
+              "type": "elasticsearch",
+              "uid": "existing-target-uid"
+            },
            "description": "Nested panel in collapsed row with unknown datasource",
            "gridPos": {
              "h": 3,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v4.no-op.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v4.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,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.v4.no-op.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v4.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,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.v5.no-op.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v5.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,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.v5.no-op.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v5.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,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.v6.pulldowns_and_templating.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v6.pulldowns_and_templating.v0alpha1.json
@@ -49,6 +49,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -72,6 +76,10 @@
        "type": "timeseries"
      },
      {
+        "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.v6.pulldowns_and_templating.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v6.pulldowns_and_templating.v1beta1.json
@@ -49,6 +49,10 @@
    "liveNow": false,
    "panels": [
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -72,6 +76,10 @@
        "type": "timeseries"
      },
      {
+        "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.v7.timepicker.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v7.timepicker.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.v7.timepicker.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v7.timepicker.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.v9.no-op.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v9.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,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.v9.no-op.v1beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v9.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": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -71,6 +79,10 @@
        "type": "stat"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "default-ds-uid"
+        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v0alpha1.json
@@ -0,0 +1,294 @@
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v0alpha1",
+  "metadata": {
+    "name": "legacy-ds-ref"
+  },
+  "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,
+    "panels": [
+      {
+        "datasource": "${datasource}",
+        "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": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Minimum cluster size"
+              },
+              "properties": [
+                {
+                  "id": "color",
+                  "value": {
+                    "fixedColor": "red",
+                    "mode": "fixed"
+                  }
+                },
+                {
+                  "id": "custom.lineStyle",
+                  "value": {
+                    "dash": [
+                      10,
+                      10
+                    ],
+                    "fill": "dash"
+                  }
+                },
+                {
+                  "id": "custom.lineWidth",
+                  "value": 1
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 9,
+          "w": 8,
+          "x": 0,
+          "y": 0
+        },
+        "id": 16,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "timeCompare": false,
+          "tooltip": {
+            "hideZeros": false,
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": "${datasource}",
+            "editorMode": "code",
+            "expr": "count by (version) (alloy_build_info{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"})",
+            "instant": false,
+            "legendFormat": "{{version}}",
+            "range": true,
+            "refId": "B"
+          }
+        ],
+        "title": "Number of Alloy Instances",
+        "type": "timeseries"
+      },
+      {
+        "datasource": "${datasource}",
+        "description": "CPU usage of the Alloy process relative to 1 CPU core.\n\nFor example, 100% means using one entire CPU core.\n",
+        "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
+                }
+              ]
+            },
+            "unit": "percentunit"
+          },
+          "overrides": [
+            {
+              "__systemRef": "hideSeriesFrom",
+              "matcher": {
+                "id": "byNames",
+                "options": {
+                  "mode": "exclude",
+                  "names": [
+                    "Total"
+                  ],
+                  "prefix": "All except:",
+                  "readOnly": true
+                }
+              },
+              "properties": [
+                {
+                  "id": "custom.hideFrom",
+                  "value": {
+                    "legend": false,
+                    "tooltip": true,
+                    "viz": true
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 9,
+          "w": 8,
+          "x": 8,
+          "y": 0
+        },
+        "id": 17,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "timeCompare": false,
+          "tooltip": {
+            "hideZeros": false,
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": "${datasource}",
+            "expr": "rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+            "hide": true,
+            "instant": false,
+            "legendFormat": "{{instance}}",
+            "range": true,
+            "refId": "A"
+          },
+          {
+            "datasource": "${datasource}",
+            "editorMode": "code",
+            "expr": "sum(rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))",
+            "instant": false,
+            "legendFormat": "Total",
+            "range": true,
+            "refId": "B"
+          }
+        ],
+        "title": "CPU usage",
+        "type": "timeseries"
+      }
+    ],
+    "time": {
+      "from": "now-90m",
+      "to": "now"
+    },
+    "timezone": "utc",
+    "title": "Legacy DS Panel Query Ref",
+    "weekStart": ""
+  },
+  "status": {
+    "conversion": {
+      "failed": false,
+      "storedVersion": "v1beta1"
+    }
+  }
+}
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v2alpha1.json
@@ -0,0 +1,405 @@
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v2alpha1",
+  "metadata": {
+    "name": "legacy-ds-ref"
+  },
+  "spec": {
+    "annotations": [
+      {
+        "kind": "AnnotationQuery",
+        "spec": {
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "query": {
+            "kind": "grafana",
+            "spec": {}
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations \u0026 Alerts",
+          "builtIn": true,
+          "legacyOptions": {
+            "type": "dashboard"
+          }
+        }
+      }
+    ],
+    "cursorSync": "Off",
+    "editable": true,
+    "elements": {
+      "panel-16": {
+        "kind": "Panel",
+        "spec": {
+          "id": 16,
+          "title": "Number of Alloy Instances",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "",
+                      "spec": {
+                        "editorMode": "code",
+                        "expr": "count by (version) (alloy_build_info{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"})",
+                        "instant": false,
+                        "legendFormat": "{{version}}",
+                        "range": true
+                      }
+                    },
+                    "datasource": {
+                      "type": "",
+                      "uid": "${datasource}"
+                    },
+                    "refId": "B",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "timeseries",
+            "spec": {
+              "pluginVersion": "",
+              "options": {
+                "legend": {
+                  "calcs": [],
+                  "displayMode": "list",
+                  "placement": "bottom",
+                  "showLegend": true
+                },
+                "timeCompare": false,
+                "tooltip": {
+                  "hideZeros": false,
+                  "mode": "single",
+                  "sort": "none"
+                }
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "palette-classic"
+                  },
+                  "custom": {
+                    "axisBorderShow": false,
+                    "axisCenteredZero": false,
+                    "axisColorMode": "text",
+                    "axisLabel": "",
+                    "axisPlacement": "auto",
+                    "barAlignment": 0,
+                    "barWidthFactor": 0.6,
+                    "drawStyle": "line",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "hideFrom": {
+                      "legend": false,
+                      "tooltip": false,
+                      "viz": false
+                    },
+                    "insertNulls": false,
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "pointSize": 5,
+                    "scaleDistribution": {
+                      "type": "linear"
+                    },
+                    "showPoints": "auto",
+                    "showValues": false,
+                    "spanNulls": false,
+                    "stacking": {
+                      "group": "A",
+                      "mode": "none"
+                    },
+                    "thresholdsStyle": {
+                      "mode": "off"
+                    }
+                  }
+                },
+                "overrides": [
+                  {
+                    "matcher": {
+                      "id": "byName",
+                      "options": "Minimum cluster size"
+                    },
+                    "properties": [
+                      {
+                        "id": "color",
+                        "value": {
+                          "fixedColor": "red",
+                          "mode": "fixed"
+                        }
+                      },
+                      {
+                        "id": "custom.lineStyle",
+                        "value": {
+                          "dash": [
+                            10,
+                            10
+                          ],
+                          "fill": "dash"
+                        }
+                      },
+                      {
+                        "id": "custom.lineWidth",
+                        "value": 1
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      "panel-17": {
+        "kind": "Panel",
+        "spec": {
+          "id": 17,
+          "title": "CPU usage",
+          "description": "CPU usage of the Alloy process relative to 1 CPU core.\n\nFor example, 100% means using one entire CPU core.\n",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "",
+                      "spec": {
+                        "expr": "rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+                        "instant": false,
+                        "legendFormat": "{{instance}}",
+                        "range": true
+                      }
+                    },
+                    "datasource": {
+                      "type": "",
+                      "uid": "${datasource}"
+                    },
+                    "refId": "A",
+                    "hidden": true
+                  }
+                },
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "",
+                      "spec": {
+                        "editorMode": "code",
+                        "expr": "sum(rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))",
+                        "instant": false,
+                        "legendFormat": "Total",
+                        "range": true
+                      }
+                    },
+                    "datasource": {
+                      "type": "",
+                      "uid": "${datasource}"
+                    },
+                    "refId": "B",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "timeseries",
+            "spec": {
+              "pluginVersion": "",
+              "options": {
+                "legend": {
+                  "calcs": [],
+                  "displayMode": "list",
+                  "placement": "bottom",
+                  "showLegend": true
+                },
+                "timeCompare": false,
+                "tooltip": {
+                  "hideZeros": false,
+                  "mode": "single",
+                  "sort": "none"
+                }
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "unit": "percentunit",
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "palette-classic"
+                  },
+                  "custom": {
+                    "axisBorderShow": false,
+                    "axisCenteredZero": false,
+                    "axisColorMode": "text",
+                    "axisLabel": "",
+                    "axisPlacement": "auto",
+                    "barAlignment": 0,
+                    "barWidthFactor": 0.6,
+                    "drawStyle": "line",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "hideFrom": {
+                      "legend": false,
+                      "tooltip": false,
+                      "viz": false
+                    },
+                    "insertNulls": false,
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "pointSize": 5,
+                    "scaleDistribution": {
+                      "type": "linear"
+                    },
+                    "showPoints": "auto",
+                    "showValues": false,
+                    "spanNulls": false,
+                    "stacking": {
+                      "group": "A",
+                      "mode": "none"
+                    },
+                    "thresholdsStyle": {
+                      "mode": "off"
+                    }
+                  }
+                },
+                "overrides": [
+                  {
+                    "__systemRef": "hideSeriesFrom",
+                    "matcher": {
+                      "id": "byNames",
+                      "options": {
+                        "mode": "exclude",
+                        "names": [
+                          "Total"
+                        ],
+                        "prefix": "All except:",
+                        "readOnly": true
+                      }
+                    },
+                    "properties": [
+                      {
+                        "id": "custom.hideFrom",
+                        "value": {
+                          "legend": false,
+                          "tooltip": true,
+                          "viz": true
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "layout": {
+      "kind": "GridLayout",
+      "spec": {
+        "items": [
+          {
+            "kind": "GridLayoutItem",
+            "spec": {
+              "x": 0,
+              "y": 0,
+              "width": 8,
+              "height": 9,
+              "element": {
+                "kind": "ElementReference",
+                "name": "panel-16"
+              }
+            }
+          },
+          {
+            "kind": "GridLayoutItem",
+            "spec": {
+              "x": 8,
+              "y": 0,
+              "width": 8,
+              "height": 9,
+              "element": {
+                "kind": "ElementReference",
+                "name": "panel-17"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "links": [],
+    "liveNow": false,
+    "preload": false,
+    "tags": [],
+    "timeSettings": {
+      "timezone": "utc",
+      "from": "now-90m",
+      "to": "now",
+      "autoRefresh": "",
+      "autoRefreshIntervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "hideTimepicker": false,
+      "fiscalYearStartMonth": 0
+    },
+    "title": "Legacy DS Panel Query Ref",
+    "variables": []
+  },
+  "status": {
+    "conversion": {
+      "failed": false,
+      "storedVersion": "v1beta1"
+    }
+  }
+}
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.legacy-ds-ref.v2beta1.json
@@ -0,0 +1,411 @@
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v2beta1",
+  "metadata": {
+    "name": "legacy-ds-ref"
+  },
+  "spec": {
+    "annotations": [
+      {
+        "kind": "AnnotationQuery",
+        "spec": {
+          "query": {
+            "kind": "DataQuery",
+            "group": "grafana",
+            "version": "v0",
+            "datasource": {
+              "name": "-- Grafana --"
+            },
+            "spec": {}
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations \u0026 Alerts",
+          "builtIn": true,
+          "legacyOptions": {
+            "type": "dashboard"
+          }
+        }
+      }
+    ],
+    "cursorSync": "Off",
+    "editable": true,
+    "elements": {
+      "panel-16": {
+        "kind": "Panel",
+        "spec": {
+          "id": 16,
+          "title": "Number of Alloy Instances",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "DataQuery",
+                      "group": "",
+                      "version": "v0",
+                      "datasource": {
+                        "name": "${datasource}"
+                      },
+                      "spec": {
+                        "editorMode": "code",
+                        "expr": "count by (version) (alloy_build_info{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\"})",
+                        "instant": false,
+                        "legendFormat": "{{version}}",
+                        "range": true
+                      }
+                    },
+                    "refId": "B",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "VizConfig",
+            "group": "timeseries",
+            "version": "",
+            "spec": {
+              "options": {
+                "legend": {
+                  "calcs": [],
+                  "displayMode": "list",
+                  "placement": "bottom",
+                  "showLegend": true
+                },
+                "timeCompare": false,
+                "tooltip": {
+                  "hideZeros": false,
+                  "mode": "single",
+                  "sort": "none"
+                }
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "palette-classic"
+                  },
+                  "custom": {
+                    "axisBorderShow": false,
+                    "axisCenteredZero": false,
+                    "axisColorMode": "text",
+                    "axisLabel": "",
+                    "axisPlacement": "auto",
+                    "barAlignment": 0,
+                    "barWidthFactor": 0.6,
+                    "drawStyle": "line",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "hideFrom": {
+                      "legend": false,
+                      "tooltip": false,
+                      "viz": false
+                    },
+                    "insertNulls": false,
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "pointSize": 5,
+                    "scaleDistribution": {
+                      "type": "linear"
+                    },
+                    "showPoints": "auto",
+                    "showValues": false,
+                    "spanNulls": false,
+                    "stacking": {
+                      "group": "A",
+                      "mode": "none"
+                    },
+                    "thresholdsStyle": {
+                      "mode": "off"
+                    }
+                  }
+                },
+                "overrides": [
+                  {
+                    "matcher": {
+                      "id": "byName",
+                      "options": "Minimum cluster size"
+                    },
+                    "properties": [
+                      {
+                        "id": "color",
+                        "value": {
+                          "fixedColor": "red",
+                          "mode": "fixed"
+                        }
+                      },
+                      {
+                        "id": "custom.lineStyle",
+                        "value": {
+                          "dash": [
+                            10,
+                            10
+                          ],
+                          "fill": "dash"
+                        }
+                      },
+                      {
+                        "id": "custom.lineWidth",
+                        "value": 1
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      "panel-17": {
+        "kind": "Panel",
+        "spec": {
+          "id": 17,
+          "title": "CPU usage",
+          "description": "CPU usage of the Alloy process relative to 1 CPU core.\n\nFor example, 100% means using one entire CPU core.\n",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "DataQuery",
+                      "group": "",
+                      "version": "v0",
+                      "datasource": {
+                        "name": "${datasource}"
+                      },
+                      "spec": {
+                        "expr": "rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+                        "instant": false,
+                        "legendFormat": "{{instance}}",
+                        "range": true
+                      }
+                    },
+                    "refId": "A",
+                    "hidden": true
+                  }
+                },
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "DataQuery",
+                      "group": "",
+                      "version": "v0",
+                      "datasource": {
+                        "name": "${datasource}"
+                      },
+                      "spec": {
+                        "editorMode": "code",
+                        "expr": "sum(rate(alloy_resources_process_cpu_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))",
+                        "instant": false,
+                        "legendFormat": "Total",
+                        "range": true
+                      }
+                    },
+                    "refId": "B",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "VizConfig",
+            "group": "timeseries",
+            "version": "",
+            "spec": {
+              "options": {
+                "legend": {
+                  "calcs": [],
+                  "displayMode": "list",
+                  "placement": "bottom",
+                  "showLegend": true
+                },
+                "timeCompare": false,
+                "tooltip": {
+                  "hideZeros": false,
+                  "mode": "single",
+                  "sort": "none"
+                }
+              },
+              "fieldConfig": {
+                "defaults": {
+                  "unit": "percentunit",
+                  "thresholds": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "value": 0,
+                        "color": "green"
+                      },
+                      {
+                        "value": 80,
+                        "color": "red"
+                      }
+                    ]
+                  },
+                  "color": {
+                    "mode": "palette-classic"
+                  },
+                  "custom": {
+                    "axisBorderShow": false,
+                    "axisCenteredZero": false,
+                    "axisColorMode": "text",
+                    "axisLabel": "",
+                    "axisPlacement": "auto",
+                    "barAlignment": 0,
+                    "barWidthFactor": 0.6,
+                    "drawStyle": "line",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "hideFrom": {
+                      "legend": false,
+                      "tooltip": false,
+                      "viz": false
+                    },
+                    "insertNulls": false,
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "pointSize": 5,
+                    "scaleDistribution": {
+                      "type": "linear"
+                    },
+                    "showPoints": "auto",
+                    "showValues": false,
+                    "spanNulls": false,
+                    "stacking": {
+                      "group": "A",
+                      "mode": "none"
+                    },
+                    "thresholdsStyle": {
+                      "mode": "off"
+                    }
+                  }
+                },
+                "overrides": [
+                  {
+                    "__systemRef": "hideSeriesFrom",
+                    "matcher": {
+                      "id": "byNames",
+                      "options": {
+                        "mode": "exclude",
+                        "names": [
+                          "Total"
+                        ],
+                        "prefix": "All except:",
+                        "readOnly": true
+                      }
+                    },
+                    "properties": [
+                      {
+                        "id": "custom.hideFrom",
+                        "value": {
+                          "legend": false,
+                          "tooltip": true,
+                          "viz": true
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "layout": {
+      "kind": "GridLayout",
+      "spec": {
+        "items": [
+          {
+            "kind": "GridLayoutItem",
+            "spec": {
+              "x": 0,
+              "y": 0,
+              "width": 8,
+              "height": 9,
+              "element": {
+                "kind": "ElementReference",
+                "name": "panel-16"
+              }
+            }
+          },
+          {
+            "kind": "GridLayoutItem",
+            "spec": {
+              "x": 8,
+              "y": 0,
+              "width": 8,
+              "height": 9,
+              "element": {
+                "kind": "ElementReference",
+                "name": "panel-17"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "links": [],
+    "liveNow": false,
+    "preload": false,
+    "tags": [],
+    "timeSettings": {
+      "timezone": "utc",
+      "from": "now-90m",
+      "to": "now",
+      "autoRefresh": "",
+      "autoRefreshIntervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "hideTimepicker": false,
+      "fiscalYearStartMonth": 0
+    },
+    "title": "Legacy DS Panel Query Ref",
+    "variables": []
+  },
+  "status": {
+    "conversion": {
+      "failed": false,
+      "storedVersion": "v1beta1"
+    }
+  }
+}
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.complete.v0alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.complete.v0alpha1.json
@@ -66,6 +66,10 @@
        "type": "row"
      },
      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "gdev-prometheus"
+        },
        "description": "This panel demonstrates conditional rendering features",
        "fieldConfig": {
          "defaults": {
--- a/Show More
+++ b/Show More