wip: improve the working branch

docs: add comments explaining blur timeout pattern
- Explain why blur timeout is needed for focus transitions - Clarify that it handles focus moving between related UI elements - Addresses review feedback requesting explanation of blur timeout
2026-01-14 21:25:50 +00:00 · 2026-01-09 17:11:30 -05:00 · 2026-01-06 19:34:20 -05:00 · 2026-01-06 19:29:28 -05:00 · 2026-01-06 19:23:40 -05:00 · 2026-01-06 19:18:33 -05:00
692 changed files with 9907 additions and 21130 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -501,6 +501,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/filter-annotations.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
+/e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/grafana-datasource-random-walk.spec.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
@@ -519,7 +520,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
 /e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/visualization-suggestions*.spec.ts @grafana/dataviz-squad
+/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform

 # Packages
--- a/CONTRIBUTION.md
+++ b/CONTRIBUTION.md
@@ -0,0 +1,99 @@
+# Contribution: Pie Chart Keyboard Focus Indicator Fix
+
+## Issue
+**Issue #114227**: Keyboard focus indicator is not visible on data links in Pie Chart visualization
+
+When keyboard users navigate through a Pie Chart panel using the Tab key, data links (clickable links on chart segments) do not show a visible focus indicator. This makes it impossible for keyboard-only users to know which element is currently focused, reducing navigation clarity and accessibility.
+
+## Problem Analysis
+
+### Root Cause
+1. Pie chart slices with data links are rendered as SVG `<g>` elements
+2. These elements are not naturally keyboard focusable (SVG elements need `tabIndex` to be focusable)
+3. No focus event handlers were attached to trigger visual feedback
+4. No keyboard activation support (Enter/Space keys)
+
+### Two Rendering Cases
+- **Single link case**: `DataLinksContextMenu` wraps the slice in an `<a>` tag
+- **Multiple links case**: `DataLinksContextMenu` provides an `openMenu` function via render prop
+
+## Solution Approach
+
+### 1. Data Link Detection
+- Check for data links using `arc.data.hasLinks` and `arc.data.getLinks`
+- Determine if slice should be focusable based on presence of links
+
+### 2. Keyboard Accessibility
+- Added `tabIndex={0}` for slices with data links (multiple links case)
+- Added `tabIndex={-1}` for slices wrapped in `<a>` tag (single link case) to prevent double focus
+- Added `role="link"` and `aria-label` for proper screen reader support
+
+### 3. Focus Indicator
+- Leveraged Grafana's existing `DataHoverEvent` system for highlighting
+- On focus, publish `DataHoverEvent` to trigger the same visual highlight as mouse hover
+- On blur, publish `DataHoverClearEvent` to clear the highlight
+- Used a small delay on blur to prevent flickering during focus transitions
+
+### 4. Keyboard Activation
+- Added `handleKeyDown` to handle Enter key presses
+- For multiple links: Create synthetic mouse event and call `openMenu` directly
+- For single link: Dispatch native click event to trigger the `<a>` tag's default behavior
+
+### 5. Single Link Case Handling
+- Detected when slice is wrapped in `<a>` tag (when `openMenu` is undefined)
+- Attached focus/blur event listeners to the parent `<a>` tag
+- Ensured inner `<g>` element has `tabIndex={-1}` to prevent tab order conflicts
+- Ensured `<a>` tag is properly focusable (remove any `tabIndex="-1"` if present)
+
+### 6. Tab Order Optimization
+- Sorted slices with data links first in the DOM to ensure proper tab order
+- This ensures keyboard users reach interactive elements before non-interactive ones
+
+## Implementation Details
+
+### Key Changes in `PieChart.tsx`
+
+1. **Imports**: Added `useRef` and `useEffect` from React
+
+2. **SliceProps Interface**: Added `outerRadius` and `innerRadius` props to calculate click coordinates
+
+3. **PieSlice Component**:
+   - Added `elementRef` and `blurTimeoutRef` for DOM manipulation and blur handling
+   - Detected data links: `hasDataLinksDirect` and `hasDataLinks`
+   - Determined focusability: `shouldBeFocusable` (true only for multiple links case)
+   - Added `useEffect` hook to handle single link case (`<a>` tag focus/blur)
+   - Added `handleFocus` callback to publish `DataHoverEvent` on focus
+   - Added `handleBlur` callback to publish `DataHoverClearEvent` on blur (with delay)
+   - Added `handleKeyDown` callback to handle Enter key activation
+   - Updated `<g>` element with accessibility attributes:
+     - `tabIndex={shouldBeFocusable ? 0 : -1}`
+     - `role={shouldBeFocusable ? 'link' : undefined}`
+     - `aria-label={shouldBeFocusable ? ... : undefined}`
+     - `onKeyDown={shouldBeFocusable ? handleKeyDown : undefined}`
+     - `onFocus={hasDataLinks ? handleFocus : undefined}`
+     - `onBlur={hasDataLinks ? handleBlur : undefined}`
+     - `style={{ outline: 'none' }}` to remove browser default outline
+
+4. **PieChart Component**:
+   - Added sorting to `pie.arcs.map` to put slices with data links first
+   - Passed `outerRadius` and `innerRadius` to `PieSlice` components
+
+## Testing
+
+### Expected Behavior
+- Tab navigation reaches slices with data links
+- Focused slice shows visual highlight (scales up, others fade)
+- Enter key activates the data link menu
+- Tab order is logical (data link slices appear before non-link slices)
+
+## Files Modified
+
+- `public/app/plugins/panel/piechart/PieChart.tsx`
+
+## References
+
+- [WCAG 2.4.7 Focus Visible](https://www.w3.org/WAI/WCAG21/Understanding/focus-visible.html)
+- [Grafana Contributing Guide](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md)
+- Issue: https://github.com/grafana/grafana/issues/114227
+
+
--- a/apps/advisor/go.mod
+++ b/apps/advisor/go.mod
@@ -54,7 +54,6 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -68,14 +67,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.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/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/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
@@ -158,18 +157,18 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect
-	github.com/grafana/grafana-aws-sdk v1.4.2 // indirect
+	github.com/grafana/grafana-aws-sdk v1.3.0 // 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/v5 v5.0.3 // indirect
+	github.com/grafana/sqlds/v4 v4.2.7 // 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,8 +115,6 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapp
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
 github.com/IBM/pgxpoolprometheus v1.1.2 h1:sHJwxoL5Lw4R79Zt+H4Uj1zZ4iqXJLdk7XDE7TPs97U=
 github.com/IBM/pgxpoolprometheus v1.1.2/go.mod h1:+vWzISN6S9ssgurhUNmm6AlXL9XLah3TdWJktquKTR8=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -173,44 +171,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.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 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/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.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/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/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.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/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/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.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/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/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.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/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/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.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/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/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=
@@ -621,8 +619,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=
@@ -637,8 +635,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.4.2 h1:GrUEoLbs46r8rG/GZL4L2b63Bo+rkIYKdtCT7kT5KkM=
-github.com/grafana/grafana-aws-sdk v1.4.2/go.mod h1:1qnZdYs6gQzxxF0dDodaE7Rn9fiMzuhwvtaAZ7ySnhY=
+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-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=
@@ -655,8 +653,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/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
-github.com/grafana/sqlds/v5 v5.0.3/go.mod h1:GKeTTiC+GeR1X0z3f0Iee+hZnNgN62uQpj5XVMx5Uew=
+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/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/alerting/historian/go.mod
+++ b/apps/alerting/historian/go.mod
@@ -4,7 +4,7 @@ go 1.25.5

 require (
 	github.com/go-kit/log v0.2.1
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4
 	github.com/grafana/grafana-app-sdk v0.48.7
 	github.com/grafana/grafana-app-sdk/logging v0.48.7
--- a/apps/alerting/historian/go.sum
+++ b/apps/alerting/historian/go.sum
@@ -243,8 +243,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 h1:jSojuc7njleS3UOz223WDlXOinmuLAIPI0z2vtq8EgI=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4/go.mod h1:VahT+GtfQIM+o8ht2StR6J9g+Ef+C2Vokh5uuSmOD/4=
 github.com/grafana/grafana-app-sdk v0.48.7 h1:9mF7nqkqP0QUYYDlznoOt+GIyjzj45wGfUHB32u2ZMo=
--- a/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_schema_gen.go
+++ b/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_schema_gen.go
@@ -13,7 +13,7 @@ import (
 // schema is unexported to prevent accidental overwrites
 var (
 	schemaReceiver = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", NewReceiver(), &ReceiverList{}, resource.WithKind("Receiver"),
-		resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{
+		resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{
 			FieldSelector: "spec.title",
 			FieldValueFunc: func(o resource.Object) (string, error) {
 				cast, ok := o.(*Receiver)
--- 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"

@@ -790,8 +790,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -934,7 +932,6 @@ 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
@@ -794,8 +794,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -937,7 +935,6 @@ 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,10 +222,8 @@ 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
-			// 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
+      // 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/v0alpha1/dashboard_object_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}

 // Copy methods for all subresource types

-
-
 // DeepCopy creates a full deep copy of DashboardStatus
 func (s *DashboardStatus) DeepCopy() *DashboardStatus {
 	cpy := &DashboardStatus{}
--- a/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
@@ -222,10 +222,8 @@ 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
-			// 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
+      // 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_object_gen.go
+++ b/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_object_gen.go
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}

 // Copy methods for all subresource types

-
-
 // DeepCopy creates a full deep copy of DashboardStatus
 func (s *DashboardStatus) DeepCopy() *DashboardStatus {
 	cpy := &DashboardStatus{}
--- 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"

@@ -794,8 +794,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -938,7 +936,6 @@ 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
@@ -1411,8 +1411,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
@@ -1705,19 +1703,18 @@ 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"`
-	ValuesFormat     *DashboardCustomVariableSpecValuesFormat `json:"valuesFormat,omitempty"`
+	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"`
 }

 // NewDashboardCustomVariableSpec creates a new DashboardCustomVariableSpec object.
@@ -2101,14 +2098,6 @@ 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,12 +1548,6 @@ 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
@@ -798,8 +798,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -941,7 +939,6 @@ 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
@@ -1414,8 +1414,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
@@ -1709,19 +1707,18 @@ 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"`
-	ValuesFormat     *DashboardCustomVariableSpecValuesFormat `json:"valuesFormat,omitempty"`
+	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"`
 }

 // NewDashboardCustomVariableSpec creates a new DashboardCustomVariableSpec object.
@@ -2136,14 +2133,6 @@ 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,12 +1560,6 @@ 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/conversion_data_loss_detection.go
+++ b/apps/dashboard/pkg/migration/conversion/conversion_data_loss_detection.go
@@ -180,15 +180,12 @@ func countAnnotationsV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if annotationList, ok := annotations["list"].([]interface{}); ok {
-		return len(annotationList)
-	}
-	if annotationList, ok := annotations["list"].([]map[string]interface{}); ok {
-		return len(annotationList)
+	annotationList, ok := annotations["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(annotationList)
 }

 // countLinksV0V1 counts dashboard links in v0alpha1 or v1beta1 dashboard spec
@@ -197,15 +194,12 @@ func countLinksV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if links, ok := spec["links"].([]interface{}); ok {
-		return len(links)
-	}
-	if links, ok := spec["links"].([]map[string]interface{}); ok {
-		return len(links)
+	links, ok := spec["links"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(links)
 }

 // countVariablesV0V1 counts template variables in v0alpha1 or v1beta1 dashboard spec
@@ -219,15 +213,12 @@ func countVariablesV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if variableList, ok := templating["list"].([]interface{}); ok {
-		return len(variableList)
-	}
-	if variableList, ok := templating["list"].([]map[string]interface{}); ok {
-		return len(variableList)
+	variableList, ok := templating["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(variableList)
 }

 // collectStatsV0V1 collects statistics from v0alpha1 or v1beta1 dashboard
--- 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 = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv2alpha1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		case *dashv2beta1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		}

--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.bom-in-links.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.bom-in-links.json
@@ -1,142 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "title": "BOM Stripping Test Dashboard",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "schemaVersion": 42,
-    "tags": ["test", "bom"],
-    "editable": true,
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "url": "http://example.com?var=${datasource}&other=value",
-        "targetBlank": true,
-        "icon": "external link"
-      }
-    ],
-    "panels": [
-      {
-        "id": 1,
-        "type": "table",
-        "title": "Panel with BOM in field config override links",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {"color": "green"},
-                {"color": "red", "value": 80}
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "server"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "Override link with BOM",
-                      "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "links": [
-          {
-            "title": "Panel data link with BOM",
-            "url": "http://example.com/${__data.fields.cluster}&var=value",
-            "targetBlank": true
-          }
-        ],
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      },
-      {
-        "id": 2,
-        "type": "timeseries",
-        "title": "Panel with BOM in options dataLinks",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "options": {
-          "legend": {
-            "showLegend": true,
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "dataLinks": [
-            {
-              "title": "Options data link with BOM",
-              "url": "http://example.com?series=${__series.name}&time=${__value.time}",
-              "targetBlank": true
-            }
-          ]
-        },
-        "fieldConfig": {
-          "defaults": {
-            "links": [
-              {
-                "title": "Field config default link with BOM",
-                "url": "http://example.com?field=${__field.name}&value=${__value.raw}",
-                "targetBlank": false
-              }
-            ]
-          },
-          "overrides": []
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      }
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": ["5s", "10s", "30s", "1m", "5m"]
-    }
-  }
-}
-
--- 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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +93,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -131,10 +115,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +93,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -131,10 +115,6 @@
        "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -54,10 +50,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -54,10 +50,6 @@
        "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,9 +65,6 @@
        "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": {
@@ -188,9 +185,6 @@
        "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": {
@@ -292,9 +286,6 @@
        "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": {
@@ -408,9 +399,6 @@
        "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": {
@@ -480,9 +468,6 @@
        "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": {
@@ -584,9 +569,6 @@
        "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,9 +65,6 @@
        "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": {
@@ -188,9 +185,6 @@
        "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": {
@@ -292,9 +286,6 @@
        "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": {
@@ -408,9 +399,6 @@
        "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": {
@@ -480,9 +468,6 @@
        "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": {
@@ -584,9 +569,6 @@
        "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,10 +37,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -63,10 +59,6 @@
        "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,10 +37,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -63,10 +59,6 @@
        "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,9 +44,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample metric showing connection count.",
        "fieldConfig": {
          "defaults": {
@@ -137,9 +134,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample counter metric.",
        "fieldConfig": {
          "defaults": {
@@ -230,9 +224,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample error metric.",
        "fieldConfig": {
          "defaults": {
@@ -323,9 +314,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample event rate metric.",
        "fieldConfig": {
          "defaults": {
@@ -416,9 +404,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample resource utilization metric.",
        "fieldConfig": {
          "defaults": {
@@ -508,9 +493,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample memory allocation metrics.",
        "fieldConfig": {
          "defaults": {
@@ -611,9 +593,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample utilization percentage.",
        "fieldConfig": {
          "defaults": {
@@ -683,9 +662,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample latency metric for primary operations.",
        "fieldConfig": {
          "defaults": {
@@ -772,9 +748,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample latency metric for secondary operations.",
        "fieldConfig": {
          "defaults": {
@@ -861,9 +834,6 @@
        "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,9 +44,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample metric showing connection count.",
        "fieldConfig": {
          "defaults": {
@@ -137,9 +134,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample counter metric.",
        "fieldConfig": {
          "defaults": {
@@ -230,9 +224,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample error metric.",
        "fieldConfig": {
          "defaults": {
@@ -323,9 +314,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample event rate metric.",
        "fieldConfig": {
          "defaults": {
@@ -416,9 +404,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample resource utilization metric.",
        "fieldConfig": {
          "defaults": {
@@ -508,9 +493,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample memory allocation metrics.",
        "fieldConfig": {
          "defaults": {
@@ -611,9 +593,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample utilization percentage.",
        "fieldConfig": {
          "defaults": {
@@ -683,9 +662,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample latency metric for primary operations.",
        "fieldConfig": {
          "defaults": {
@@ -772,9 +748,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
        "description": "Sample latency metric for secondary operations.",
        "fieldConfig": {
          "defaults": {
@@ -861,9 +834,6 @@
        "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,10 +39,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -65,10 +61,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -159,10 +151,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -185,10 +173,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -211,10 +195,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -249,10 +229,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 16,
@@ -275,10 +251,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 8,
@@ -314,10 +286,6 @@
        "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,10 +39,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -65,10 +61,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 12,
@@ -159,10 +151,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -185,10 +173,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -211,10 +195,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -249,10 +229,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 16,
@@ -275,10 +251,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 8,
@@ -314,10 +286,6 @@
        "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,10 +41,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 24,
@@ -82,10 +78,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -111,10 +103,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -140,10 +128,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "fieldConfig": {
          "defaults": {
            "thresholds": {
@@ -190,10 +174,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -222,10 +202,6 @@
        "type": "logs"
      },
      {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -254,10 +230,6 @@
        "type": "logs"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -283,10 +255,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "Number of concurrent processing threads available for handling operations",
        "gridPos": {
          "h": 7,
@@ -312,10 +280,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "tempo",
-          "uid": "${tempo}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -360,10 +324,6 @@
        "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": {
@@ -465,10 +425,6 @@
        "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,
@@ -521,10 +477,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "Total number of jobs waiting to be processed",
        "gridPos": {
          "h": 7,
@@ -550,10 +502,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "fieldConfig": {
          "defaults": {
            "unit": "s"
@@ -584,10 +532,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "How long a job is in the queue before being picked up",
        "gridPos": {
          "h": 7,
@@ -640,10 +584,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -669,10 +609,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -697,10 +633,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -743,10 +675,6 @@
        "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,10 +41,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 24,
@@ -82,10 +78,6 @@
        "type": "row"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -111,10 +103,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -140,10 +128,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "fieldConfig": {
          "defaults": {
            "thresholds": {
@@ -190,10 +174,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -222,10 +202,6 @@
        "type": "logs"
      },
      {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -254,10 +230,6 @@
        "type": "logs"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -283,10 +255,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "Number of concurrent processing threads available for handling operations",
        "gridPos": {
          "h": 7,
@@ -312,10 +280,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "tempo",
-          "uid": "${tempo}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -360,10 +324,6 @@
        "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": {
@@ -465,10 +425,6 @@
        "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,
@@ -521,10 +477,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "Total number of jobs waiting to be processed",
        "gridPos": {
          "h": 7,
@@ -550,10 +502,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "fieldConfig": {
          "defaults": {
            "unit": "s"
@@ -584,10 +532,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "description": "How long a job is in the queue before being picked up",
        "gridPos": {
          "h": 7,
@@ -640,10 +584,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -669,10 +609,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -697,10 +633,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
        "gridPos": {
          "h": 7,
          "w": 8,
@@ -743,10 +675,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -105,10 +93,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 4,
@@ -131,10 +115,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -157,10 +137,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -183,10 +159,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 24,
@@ -209,10 +181,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 24,
@@ -235,10 +203,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -261,10 +225,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -105,10 +93,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 4,
@@ -131,10 +115,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 8,
@@ -157,10 +137,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -183,10 +159,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 6,
          "w": 24,
@@ -209,10 +181,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 24,
@@ -235,10 +203,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 4,
          "w": 6,
@@ -261,10 +225,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -75,10 +71,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -106,10 +98,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -138,10 +126,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -176,10 +160,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -75,10 +71,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -106,10 +98,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -138,10 +126,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -176,10 +160,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,10 +55,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -91,10 +83,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -123,10 +111,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -156,10 +140,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -188,10 +168,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,10 +55,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -91,10 +83,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -123,10 +111,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -156,10 +140,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -188,10 +168,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -54,10 +50,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -81,10 +73,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,10 +95,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -54,10 +50,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -81,10 +73,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,10 +95,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -66,10 +62,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -110,10 +102,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 24,
@@ -156,10 +144,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -202,10 +186,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -66,10 +62,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -110,10 +102,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 24,
@@ -156,10 +144,6 @@
        "type": "gauge"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -202,10 +186,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -64,10 +60,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +97,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -148,10 +136,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -181,10 +165,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -64,10 +60,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +97,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -148,10 +136,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -181,10 +165,6 @@
        "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,
@@ -61,10 +57,6 @@
        "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,
@@ -88,10 +80,6 @@
        "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,
@@ -115,10 +103,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
        "gridPos": {
          "h": 3,
@@ -142,10 +126,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
        "gridPos": {
          "h": 3,
@@ -169,10 +149,6 @@
        "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,
@@ -196,10 +172,6 @@
        "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,
@@ -236,10 +208,6 @@
        "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,
@@ -263,10 +231,6 @@
        "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,
@@ -290,10 +254,6 @@
        "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,
@@ -317,10 +277,6 @@
        "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,
@@ -344,10 +300,6 @@
        "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,
@@ -371,10 +323,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests various date format patterns and aliases.",
        "gridPos": {
          "h": 3,
@@ -398,10 +346,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -425,10 +369,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Angular table without styles property should not be migrated.",
        "gridPos": {
          "h": 3,
@@ -452,10 +392,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Non-table panels should remain completely unchanged.",
        "gridPos": {
          "h": 3,
@@ -479,10 +415,6 @@
        "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,10 +27,6 @@
    "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,
@@ -61,10 +57,6 @@
        "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,
@@ -88,10 +80,6 @@
        "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,
@@ -115,10 +103,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
        "gridPos": {
          "h": 3,
@@ -142,10 +126,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
        "gridPos": {
          "h": 3,
@@ -169,10 +149,6 @@
        "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,
@@ -196,10 +172,6 @@
        "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,
@@ -236,10 +208,6 @@
        "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,
@@ -263,10 +231,6 @@
        "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,
@@ -290,10 +254,6 @@
        "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,
@@ -317,10 +277,6 @@
        "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,
@@ -344,10 +300,6 @@
        "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,
@@ -371,10 +323,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Tests various date format patterns and aliases.",
        "gridPos": {
          "h": 3,
@@ -398,10 +346,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
        "gridPos": {
          "h": 3,
@@ -425,10 +369,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Angular table without styles property should not be migrated.",
        "gridPos": {
          "h": 3,
@@ -452,10 +392,6 @@
        "type": "table"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "description": "Non-table panels should remain completely unchanged.",
        "gridPos": {
          "h": 3,
@@ -479,10 +415,6 @@
        "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,10 +33,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,10 +55,6 @@
        "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,10 +33,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -59,10 +55,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "text"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,10 +56,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -86,10 +78,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -119,10 +107,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,10 +56,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -86,10 +78,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -119,10 +107,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,10 +56,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,10 +85,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -119,10 +107,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -152,10 +136,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -179,10 +159,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
        "gridPos": {
          "h": 8,
          "w": 8,
@@ -206,10 +182,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -277,10 +249,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -60,10 +56,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -93,10 +85,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -119,10 +107,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -152,10 +136,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -179,10 +159,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
        "gridPos": {
          "h": 8,
          "w": 8,
@@ -206,10 +182,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -277,10 +249,6 @@
        "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +93,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -105,10 +93,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -129,10 +125,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -159,10 +151,6 @@
        "type": "xychart"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -190,10 +178,6 @@
        "type": "xychart2"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -220,10 +204,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -325,10 +305,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "fieldConfig": {
              "defaults": {
                "unit": "bytes"
@@ -361,10 +337,6 @@
            "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -129,10 +125,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -159,10 +151,6 @@
        "type": "xychart"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -190,10 +178,6 @@
        "type": "xychart2"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -220,10 +204,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "mappings": [
@@ -325,10 +305,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "fieldConfig": {
              "defaults": {
                "unit": "bytes"
@@ -361,10 +337,6 @@
            "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -63,10 +59,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,10 +99,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -161,10 +149,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -187,10 +171,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -279,10 +259,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -63,10 +59,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -107,10 +99,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -161,10 +149,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -187,10 +171,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -279,10 +259,6 @@
        "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,10 +33,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -75,10 +71,6 @@
        "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,10 +33,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -75,10 +71,6 @@
        "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,10 +27,6 @@
    "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,
@@ -55,10 +51,6 @@
        "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,
@@ -83,10 +75,6 @@
        "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,
@@ -110,10 +98,6 @@
        "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,
@@ -299,10 +283,6 @@
        "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,10 +27,6 @@
    "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,
@@ -55,10 +51,6 @@
        "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,
@@ -83,10 +75,6 @@
        "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,
@@ -110,10 +98,6 @@
        "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,
@@ -299,10 +283,6 @@
        "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,10 +289,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -359,10 +355,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -394,10 +386,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -504,10 +492,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -538,10 +522,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -646,10 +626,6 @@
        "id": -1,
        "panels": [
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -713,10 +689,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -766,10 +738,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -801,10 +769,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -854,10 +818,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -889,10 +849,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -971,10 +927,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -1054,10 +1006,6 @@
            "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,10 +289,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -359,10 +355,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -394,10 +386,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -504,10 +492,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -538,10 +522,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -646,10 +626,6 @@
        "id": -1,
        "panels": [
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -713,10 +689,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -766,10 +738,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -801,10 +769,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -854,10 +818,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -889,10 +849,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -971,10 +927,6 @@
            "type": "timeseries"
          },
          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
            "gridPos": {
              "h": 3,
              "w": 6,
@@ -1054,10 +1006,6 @@
            "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -74,10 +70,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -133,10 +125,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -166,10 +154,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -199,10 +183,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -225,10 +205,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -251,10 +227,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "unit": "bytes"
@@ -282,10 +254,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -74,10 +70,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -133,10 +125,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -166,10 +154,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "custom": {
@@ -199,10 +183,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -225,10 +205,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -251,10 +227,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "fieldConfig": {
          "defaults": {
            "unit": "bytes"
@@ -282,10 +254,6 @@
        "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,10 +77,6 @@
    "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,
@@ -104,10 +100,6 @@
        "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,
@@ -131,10 +123,6 @@
        "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,
@@ -192,10 +180,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
        "description": "Tests panel with already migrated datasource object - should preserve existing refs",
        "gridPos": {
          "h": 3,
@@ -219,10 +203,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "unknown-target-datasource"
-        },
        "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
        "gridPos": {
          "h": 3,
@@ -280,10 +260,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
        "description": "Tests panel inheriting datasource from target when panel datasource was default",
        "gridPos": {
          "h": 3,
@@ -307,10 +283,6 @@
        "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,
@@ -334,10 +306,6 @@
        "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,
@@ -377,10 +345,6 @@
        "id": -1,
        "panels": [
          {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
            "description": "Nested panel in collapsed row with default datasource",
            "gridPos": {
              "h": 3,
@@ -404,10 +368,6 @@
            "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,10 +77,6 @@
    "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,
@@ -104,10 +100,6 @@
        "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,
@@ -131,10 +123,6 @@
        "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,
@@ -192,10 +180,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
        "description": "Tests panel with already migrated datasource object - should preserve existing refs",
        "gridPos": {
          "h": 3,
@@ -219,10 +203,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "unknown-target-datasource"
-        },
        "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
        "gridPos": {
          "h": 3,
@@ -280,10 +260,6 @@
        "type": "timeseries"
      },
      {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
        "description": "Tests panel inheriting datasource from target when panel datasource was default",
        "gridPos": {
          "h": 3,
@@ -307,10 +283,6 @@
        "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,
@@ -334,10 +306,6 @@
        "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,
@@ -377,10 +345,6 @@
        "id": -1,
        "panels": [
          {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
            "description": "Nested panel in collapsed row with default datasource",
            "gridPos": {
              "h": 3,
@@ -404,10 +368,6 @@
            "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +49,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -76,10 +72,6 @@
        "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,10 +49,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 8,
          "w": 12,
@@ -76,10 +72,6 @@
        "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,10 +27,6 @@
    "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,10 +27,6 @@
    "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "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,10 +27,6 @@
    "liveNow": false,
    "panels": [
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -53,10 +49,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
@@ -79,10 +71,6 @@
        "type": "stat"
      },
      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
        "gridPos": {
          "h": 3,
          "w": 6,
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2alpha1.json
@@ -120,7 +120,7 @@
                        "value": [
                          {
                            "title": "filter",
-                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
+                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
                          }
                        ]
                      }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul Marbach	849098bcf0	wip: improve the working branch	2026-01-09 17:11:30 -05:00
Abhijnya002	f70bc80a5c	docs: add comments explaining blur timeout pattern - Explain why blur timeout is needed for focus transitions - Clarify that it handles focus moving between related UI elements - Addresses review feedback requesting explanation of blur timeout	2026-01-06 19:34:20 -05:00
Abhijnya002	254a7b9971	feat: extend DataLinksContextMenu to support keyboard events - Update DataLinksContextMenu API to accept position objects for keyboard events - Add getMenuPosition helper function to calculate position from element - Update WithContextMenu to handle position objects and elements - Simplify pie chart keyboard handler to use position object API - Position calculation logic now in core component (DataLinksContextMenu) - Addresses review feedback about keyboard accessibility and position calculation	2026-01-06 19:29:28 -05:00
Abhijnya002	838bc756db	refactor: move event handler logic into wrapper component - Create PieChartDataLinksContextMenu wrapper that handles anchor event listeners - Create PieSliceWithDataLinks component that uses the wrapper - Remove large useEffect from PieSlice that was finding anchor after creation - Event handler logic is now co-located with DataLinksContextMenu usage - Addresses review feedback about handler management being outside component creation	2026-01-06 19:23:40 -05:00
Abhijnya002	bb012056eb	refactor: extract repeated event dispatch into useCallback - Create publishDataHoverEvent and publishDataHoverClearEvent useCallback functions - Replace all repeated eventBus.publish calls with the new callbacks - Update dependency arrays to use the new callbacks - Addresses review feedback on code duplication	2026-01-06 19:18:33 -05:00
Abhijnya002	4ac1bbc657	refactor: simplify ensureNotFocusable calls - Remove unnecessary 100ms setTimeout call - Keep immediate call and setTimeout(0) to handle React render timing - Add comments explaining the rationale - Addresses review feedback on code clarity	2026-01-06 19:14:29 -05:00
Abhijnya002	d46947ccb2	refactor: move outline style from inline to getSvgStyle CSS - Move outline: 'none' from inline style prop to CSS styles - Add outline: 'none' to all svgArg states (normal, highlighted, deemphasized) - Addresses review feedback on code organization	2026-01-06 19:11:51 -05:00
Abhijnya002	45bdeefbdf	fix: use i18n for aria-label and always set it in pie chart - Replace hardcoded aria-label string with @grafana/i18n translation - Always set aria-label instead of conditionally setting to undefined - Addresses review feedback on internationalization and accessibility	2026-01-06 19:09:22 -05:00
Abhijnya002	eb3df4fa00	Remove data links sorting from pie chart slices Remove the sort() call that was reordering pie slices based on data links presence. Pie slices should maintain their original order regardless of data links.	2026-01-05 12:37:34 -05:00
Abhijnya002	65919fc0bf	fix(piechart): add visible keyboard focus indicator for data links Fixes #114227 Adds visible focus indicator to data links in pie chart visualization to improve keyboard navigation accessibility. - Added keyboard focus handlers for slices with data links - Implemented highlight on focus using DataHoverEvent system - Added Enter key support to activate data links - Handled both single and multiple link cases - Ensured proper tab order by sorting slices with data links first - Added proper ARIA attributes (role, aria-label) for accessibility	2025-12-27 00:02:34 -05:00