Gives resource server a search client so storage-api can call search

Add support for LIST with filtering on selectable fields
2026-01-14 19:51:49 -06:00 · 2025-12-15 12:10:43 +01:00
801 changed files with 8590 additions and 75036 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -208,7 +208,7 @@
 /pkg/tests/apis/shorturl @grafana/sharing-squad
 /pkg/tests/api/correlations/ @grafana/datapro
 /pkg/tsdb/grafanads/ @grafana/grafana-backend-group
-/pkg/tsdb/opentsdb/ @grafana/oss-big-tent
+/pkg/tsdb/opentsdb/ @grafana/partner-datasources
 /pkg/util/ @grafana/grafana-backend-group
 /pkg/web/ @grafana/grafana-backend-group

@@ -260,7 +260,7 @@
 /devenv/dev-dashboards/dashboards.go @grafana/dataviz-squad
 /devenv/dev-dashboards/home.json @grafana/dataviz-squad
 /devenv/dev-dashboards/datasource-elasticsearch/ @grafana/partner-datasources
-/devenv/dev-dashboards/datasource-opentsdb/ @grafana/oss-big-tent
+/devenv/dev-dashboards/datasource-opentsdb/ @grafana/partner-datasources
 /devenv/dev-dashboards/datasource-influxdb/ @grafana/partner-datasources
 /devenv/dev-dashboards/datasource-mssql/ @grafana/partner-datasources
 /devenv/dev-dashboards/datasource-loki/ @grafana/plugins-platform-frontend
@@ -307,7 +307,7 @@
 /devenv/docker/blocks/mysql_exporter/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_opendata/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_tests/ @grafana/oss-big-tent
-/devenv/docker/blocks/opentsdb/ @grafana/oss-big-tent
+/devenv/docker/blocks/opentsdb/ @grafana/partner-datasources
 /devenv/docker/blocks/postgres/ @grafana/oss-big-tent
 /devenv/docker/blocks/postgres_tests/ @grafana/oss-big-tent
 /devenv/docker/blocks/prometheus/ @grafana/oss-big-tent
@@ -520,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/dashboards-squad
 /e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform

 # Packages
@@ -956,7 +956,6 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/features/notifications/ @grafana/grafana-search-navigate-organise
 /public/app/features/org/ @grafana/grafana-search-navigate-organise
 /public/app/features/panel/ @grafana/dashboards-squad
-/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx @grafana/dataviz-squad
 /public/app/features/panel/suggestions/ @grafana/dataviz-squad
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
@@ -1101,7 +1100,7 @@ eslint-suppressions.json @grafanabot
 /public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
 /public/app/plugins/datasource/mssql/ @grafana/partner-datasources
 /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent
-/public/app/plugins/datasource/opentsdb/ @grafana/oss-big-tent
+/public/app/plugins/datasource/opentsdb/ @grafana/partner-datasources
 /public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent
 /public/app/plugins/datasource/prometheus/ @grafana/oss-big-tent
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
--- a/.github/workflows/pr-patch-check-event.yml
+++ b/.github/workflows/pr-patch-check-event.yml
@@ -12,7 +12,6 @@ on:
 permissions:
  id-token: write
  contents: read
-  statuses: write

 # Since this is run on a pull request, we want to apply the patches intended for the
 # target branch onto the source branch, to verify compatibility before merging.
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -29,10 +29,6 @@ permissions:
 # target branch onto the source branch, to verify compatibility before merging.
 jobs:
  dispatch-job:
-    # If the source is not from a fork then dispatch the job to the workflow.
-    # This will fail on forks when trying to broker a token, so instead, forks will create the required status and mark
-    # it as a success
-    if: ${{ ! github.event.pull_request.head.repo.fork }}
    env:
      HEAD_REF: ${{ inputs.head_ref }}
      BASE_REF: ${{ github.base_ref }}
@@ -80,20 +76,3 @@ jobs:
                  triggering_github_handle: SENDER
                }
            })
-  dispatch-job-fork:
-    # If the source is from a fork then use the built-in workflow token to create the same status and unconditionally
-    # mark it as a success.
-    if: ${{ github.event.pull_request.head.repo.fork }}
-    permissions:
-      statuses: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create status
-        uses: myrotvorets/set-commit-status-action@6d6905c99cd24a4a2cbccc720b62dc6ca5587141
-        with:
-          token: ${{ github.token }}
-          sha: ${{ inputs.pr_commit_sha }}
-          repo: ${{ inputs.repo }}
-          status: success
-          context: "Test Patches (event)"
-          description: "Test Patches (event) on a fork"
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -111,13 +111,12 @@ jobs:
      ownerRepo: 'grafana/grafana-enterprise'
      from: ${{ needs.setup.outputs.release_branch }}
      to: ${{ needs.create_next_release_branch_enterprise.outputs.branch }}
-  # Removed this for now since it doesn't work
-  # post_changelog_on_forum:
-  #   needs: setup
-  #   uses: grafana/grafana/.github/workflows/community-release.yml@main
-  #   with:
-  #     version: ${{ needs.setup.outputs.version }}
-  #     dry_run: ${{ needs.setup.outputs.dry_run == 'true' }}
+  post_changelog_on_forum:
+    needs: setup
+    uses: grafana/grafana/.github/workflows/community-release.yml@main
+    with:
+      version: ${{ needs.setup.outputs.version }}
+      dry_run: ${{ needs.setup.outputs.dry_run == 'true' }}
  create_github_release:
    # a github release requires a git tag
    # The github-release action retrieves the changelog using the /repos/grafana/grafana/contents/CHANGELOG.md API
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,7 +3,7 @@
 # Others can set up the YAML LSP manually, which supports schemas: https://github.com/redhat-developer/yaml-language-server

 # $schema: https://golangci-lint.run/jsonschema/golangci.jsonschema.json
-version: '2'
+version: "2"
 run:
  timeout: 15m
  concurrency: 10
@@ -83,16 +83,6 @@ linters:
          deny:
            - pkg: github.com/grafana/grafana/pkg
              desc: apps/playlist is not allowed to import grafana core
-        apps-dashboard:
-          list-mode: lax
-          files:
-            - ./apps/dashboard/*
-            - ./apps/dashboard/**/*
-          allow:
-            - github.com/grafana/grafana/pkg/apimachinery
-          deny:
-            - pkg: github.com/grafana/grafana/pkg
-              desc: apps/dashboard is not allowed to import grafana core
        apps-secret:
          list-mode: lax
          files:
@@ -291,16 +281,16 @@ linters:
        text: G306
      - linters:
          - gosec
-        text: '401'
+        text: "401"
      - linters:
          - gosec
-        text: '402'
+        text: "402"
      - linters:
          - gosec
-        text: '501'
+        text: "501"
      - linters:
          - gosec
-        text: '404'
+        text: "404"
      - linters:
          - errorlint
        text: non-wrapping format verb for fmt.Errorf
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,101 +1,3 @@
-<!-- 12.3.1 START -->
-
-# 12.3.1 (2025-12-16)
-
-### Features and enhancements
-
- **Alerting:** Update alerting dependency [#114259](https://github.com/grafana/grafana/pull/114259), [@moustafab](https://github.com/moustafab)
- **Azure:** Improved column handling in logs query builder [#114841](https://github.com/grafana/grafana/pull/114841), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Include aggregate columns in logs builder [#114835](https://github.com/grafana/grafana/pull/114835), [@aangelisc](https://github.com/aangelisc)
- **Dependencies:** Bump Go to v1.25.5 [#114751](https://github.com/grafana/grafana/pull/114751), [@macabu](https://github.com/macabu)
- **Docs:** Clarify section title for repeating rows and tabs [#115346](https://github.com/grafana/grafana/pull/115346), [@imatwawana](https://github.com/imatwawana)
- **Plugins:** Add PluginContext to plugins when scenes is disabled [#115064](https://github.com/grafana/grafana/pull/115064), [@hugohaggmark](https://github.com/hugohaggmark)
- **QueryEditorRows:** Clear hideSeriesFrom override on query edit [#114628](https://github.com/grafana/grafana/pull/114628), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
-
-### Bug fixes
-
- **Azure:** Fix `dcount` aggregation [#114907](https://github.com/grafana/grafana/pull/114907), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Fix `percentile` syntax [#114707](https://github.com/grafana/grafana/pull/114707), [@aangelisc](https://github.com/aangelisc)
- **Dashboards:** Fix empty space under time controls when a dashboard has a lot of variables [#114730](https://github.com/grafana/grafana/pull/114730), [@oscarkilhed](https://github.com/oscarkilhed)
- **Plugins:** Datasource breadcrumb link should link to settings tab [#113910](https://github.com/grafana/grafana/pull/113910), [@wbrowne](https://github.com/wbrowne)
- **Postgresql:** Fix variable interpolation logic when the variable has multiple values [#114876](https://github.com/grafana/grafana/pull/114876), [@itsmylife](https://github.com/itsmylife)
-
-<!-- 12.3.1 END -->
-<!-- 12.2.3 START -->
-
-# 12.2.3 (2025-12-16)
-
-### Features and enhancements
-
- **Alerting:** Update alerting dependency [#114256](https://github.com/grafana/grafana/pull/114256), [@moustafab](https://github.com/moustafab)
- **Azure:** Improved column handling in logs query builder [#114840](https://github.com/grafana/grafana/pull/114840), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Include aggregate columns in logs builder [#114834](https://github.com/grafana/grafana/pull/114834), [@aangelisc](https://github.com/aangelisc)
- **Dependencies:** Bump Go to v1.25.5 [#114753](https://github.com/grafana/grafana/pull/114753), [@macabu](https://github.com/macabu)
- **Plugins:** Add PluginContext to plugins when scenes is disabled [#115063](https://github.com/grafana/grafana/pull/115063), [@hugohaggmark](https://github.com/hugohaggmark)
- **QueryEditorRows:** Clear hideSeriesFrom override on query edit [#114629](https://github.com/grafana/grafana/pull/114629), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
-
-### Bug fixes
-
- **Alerting:** Fix contact points issue [#115412](https://github.com/grafana/grafana/pull/115412), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **Azure:** Fix `dcount` aggregation [#114906](https://github.com/grafana/grafana/pull/114906), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Fix `percentile` syntax [#114706](https://github.com/grafana/grafana/pull/114706), [@aangelisc](https://github.com/aangelisc)
- **Postgresql:** Fix variable interpolation logic when the variable has multiple values [#114875](https://github.com/grafana/grafana/pull/114875), [@itsmylife](https://github.com/itsmylife)
-
-<!-- 12.2.3 END -->
-<!-- 12.1.5 START -->
-
-# 12.1.5 (2025-12-16)
-
-### Features and enhancements
-
- **Alerting:** Update alerting dependency [#114254](https://github.com/grafana/grafana/pull/114254), [@moustafab](https://github.com/moustafab)
- **Dependencies:** Bump Go to v1.25.5 [#114755](https://github.com/grafana/grafana/pull/114755), [@macabu](https://github.com/macabu)
- **Docs:** Clarify section title for repeating rows and tabs [#115344](https://github.com/grafana/grafana/pull/115344), [@imatwawana](https://github.com/imatwawana)
- **Plugins:** Add PluginContext to plugins when scenes is disabled [#115062](https://github.com/grafana/grafana/pull/115062), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Bug fixes
-
- **Alerting:** Fix contact points issue [#115411](https://github.com/grafana/grafana/pull/115411), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **Azure:** Fix `dcount` aggregation [#114905](https://github.com/grafana/grafana/pull/114905), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Fix `percentile` syntax [#114705](https://github.com/grafana/grafana/pull/114705), [@aangelisc](https://github.com/aangelisc)
- **Postgresql:** Fix variable interpolation logic when the variable has multiple values [#114874](https://github.com/grafana/grafana/pull/114874), [@itsmylife](https://github.com/itsmylife)
-
-<!-- 12.1.5 END -->
-<!-- 12.0.8 START -->
-
-# 12.0.8 (2025-12-16)
-
-### Features and enhancements
-
- **Alerting:** Update alerting dependency [#114252](https://github.com/grafana/grafana/pull/114252), [@moustafab](https://github.com/moustafab)
- **Dependencies:** Bump Go to v1.25.5 [#114756](https://github.com/grafana/grafana/pull/114756), [@macabu](https://github.com/macabu)
- **Docs:** Clarify section title for repeating rows and tabs [#115343](https://github.com/grafana/grafana/pull/115343), [@imatwawana](https://github.com/imatwawana)
- **Plugins:** Add PluginContext to plugins when scenes is disabled [#115061](https://github.com/grafana/grafana/pull/115061), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Bug fixes
-
- **Alerting:** Fix contact points issue [#115410](https://github.com/grafana/grafana/pull/115410), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **Azure:** Fix `dcount` aggregation [#114904](https://github.com/grafana/grafana/pull/114904), [@aangelisc](https://github.com/aangelisc)
- **Azure:** Fix `percentile` syntax [#114704](https://github.com/grafana/grafana/pull/114704), [@aangelisc](https://github.com/aangelisc)
- **Postgresql:** Fix variable interpolation logic when the variable has multiple values [#114873](https://github.com/grafana/grafana/pull/114873), [@itsmylife](https://github.com/itsmylife)
-
-<!-- 12.0.8 END -->
-<!-- 11.6.9 START -->
-
-# 11.6.9 (2025-12-16)
-
-### Features and enhancements
-
- **Alerting:** Update alerting dependency [#114249](https://github.com/grafana/grafana/pull/114249), [@moustafab](https://github.com/moustafab)
- **Dependencies:** Bump Go to v1.25.5 [#114757](https://github.com/grafana/grafana/pull/114757), [@macabu](https://github.com/macabu)
- **PDFTables:** Dynamically shrink font to try and fit whole table in pdf page width (Enterprise)
- **Plugins:** Add PluginContext to plugins when scenes is disabled [#115060](https://github.com/grafana/grafana/pull/115060), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Bug fixes
-
- **Alerting:** Fix contacts point issues [#115409](https://github.com/grafana/grafana/pull/115409), [@yuri-tceretian](https://github.com/yuri-tceretian)
-
-<!-- 11.6.9 END -->
 <!-- 12.3.0 START -->

 # 12.3.0 (2025-11-19)
--- a/apps/advisor/go.mod
+++ b/apps/advisor/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/stretchr/testify v1.11.1
 	k8s.io/apimachinery v0.34.2
 	k8s.io/apiserver v0.34.2
-	k8s.io/client-go v0.34.2
 	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 )

@@ -44,7 +43,6 @@ replace github.com/grafana/grafana/apps/plugins => ../plugins
 replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604

 require (
-	cel.dev/expr v0.24.0 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	dario.cat/mergo v1.0.2 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
@@ -57,7 +55,6 @@ require (
 	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
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f // indirect
 	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
@@ -88,7 +85,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -105,7 +101,6 @@ require (
 	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/gchaincl/sqlhooks v1.3.0 // indirect
 	github.com/getkin/kin-openapi v0.133.0 // indirect
@@ -149,13 +144,12 @@ require (
 	github.com/golang-migrate/migrate/v4 v4.7.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cel-go v0.26.1 // indirect
 	github.com/google/flatbuffers v25.2.10+incompatible // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 // indirect
+	github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba // 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
@@ -168,7 +162,6 @@ require (
 	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
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -183,7 +176,6 @@ require (
 	github.com/hashicorp/memberlist v0.5.2 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
 	github.com/jessevdk/go-flags v1.6.1 // indirect
 	github.com/jmespath-community/go-jmespath v1.1.1 // indirect
@@ -256,9 +248,7 @@ require (
 	github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/cobra v1.10.1 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/stoewer/go-strcase v1.3.1 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tetratelabs/wazero v1.8.2 // indirect
 	github.com/thomaspoignant/go-feature-flag v1.42.0 // indirect
@@ -266,9 +256,6 @@ require (
 	github.com/woodsbury/decimal128 v1.3.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.etcd.io/etcd/api/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
 	go.mongodb.org/mongo-driver v1.17.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
@@ -287,8 +274,6 @@ require (
 	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/mock v0.6.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.1 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.45.0 // indirect
@@ -312,26 +297,23 @@ require (
 	google.golang.org/grpc v1.77.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/mail.v2 v2.3.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect
 	gopkg.in/telebot.v3 v3.3.8 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.34.2 // indirect
 	k8s.io/apiextensions-apiserver v0.34.2 // indirect
+	k8s.io/client-go v0.34.2 // indirect
 	k8s.io/component-base v0.34.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kms v0.34.2 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	modernc.org/libc v1.66.10 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 	modernc.org/sqlite v1.40.1 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
--- a/apps/advisor/go.sum
+++ b/apps/advisor/go.sum
@@ -282,7 +282,6 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
@@ -407,8 +406,6 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
-github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
 github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA=
 github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw=
 github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs=
@@ -609,10 +606,8 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba h1:psKWNETD5nGxmFAlqnWsXoRyUwSa2GHNEMSEDKGKfQ4=
+github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba/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=
@@ -754,8 +749,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
-github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -986,7 +979,6 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/pressly/goose/v3 v3.26.0 h1:KJakav68jdH0WDvoAcj8+n61WqOIaPGgH0bJWS6jpmM=
 github.com/pressly/goose/v3 v3.26.0/go.mod h1:4hC1KrritdCxtuFsqgs1R4AU5bWtTAf+cnWvfhf2DNY=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
@@ -1004,7 +996,6 @@ github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
@@ -1019,7 +1010,6 @@ github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57J
 github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
 github.com/prometheus/exporter-toolkit v0.14.0/go.mod h1:Gu5LnVvt7Nr/oqTBUC23WILZepW0nffNo10XdhQcwWA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
@@ -1046,7 +1036,6 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
 github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
@@ -1069,8 +1058,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
-github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1084,7 +1071,6 @@ github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
 github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
@@ -1110,7 +1096,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
@@ -1127,8 +1112,6 @@ github.com/thomaspoignant/go-feature-flag v1.42.0/go.mod h1:y0QiWH7chHWhGATb/+Xq
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tjhop/slog-gokit v0.1.5 h1:ayloIUi5EK2QYB8eY4DOPO95/mRtMW42lUkp3quJohc=
 github.com/tjhop/slog-gokit v0.1.5/go.mod h1:yA48zAHvV+Sg4z4VRyeFyFUNNXd3JY5Zg84u3USICq0=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
@@ -1146,8 +1129,6 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk=
-github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1158,8 +1139,6 @@ github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
-go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/api/v3 v3.6.4 h1:7F6N7toCKcV72QmoUKa23yYLiiljMrT4xCeBL9BmXdo=
 go.etcd.io/etcd/api/v3 v3.6.4/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk=
@@ -1170,12 +1149,6 @@ go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+
 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.etcd.io/etcd/client/v3 v3.6.4 h1:YOMrCfMhRzY8NgtzUsHl8hC2EBSnuqbR3dh84Uryl7A=
 go.etcd.io/etcd/client/v3 v3.6.4/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo=
-go.etcd.io/etcd/pkg/v3 v3.6.4 h1:fy8bmXIec1Q35/jRZ0KOes8vuFxbvdN0aAFqmEfJZWA=
-go.etcd.io/etcd/pkg/v3 v3.6.4/go.mod h1:kKcYWP8gHuBRcteyv6MXWSN0+bVMnfgqiHueIZnKMtE=
-go.etcd.io/etcd/server/v3 v3.6.4 h1:LsCA7CzjVt+8WGrdsnh6RhC0XqCsLkBly3ve5rTxMAU=
-go.etcd.io/etcd/server/v3 v3.6.4/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg=
-go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
-go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
 go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
@@ -1328,7 +1301,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1740,7 +1712,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1:UKgtfRM7Yh93Sya0Fo8ZzhDP4qBckrrxEr2oF5UIVb8=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
--- a/apps/advisor/pkg/app/app.go
+++ b/apps/advisor/pkg/app/app.go
@@ -8,24 +8,18 @@ import (

 	"github.com/grafana/grafana-app-sdk/app"
 	"github.com/grafana/grafana-app-sdk/k8s"
-	appsdkapiserver "github.com/grafana/grafana-app-sdk/k8s/apiserver"
 	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana-app-sdk/operator"
 	"github.com/grafana/grafana-app-sdk/resource"
 	"github.com/grafana/grafana-app-sdk/simple"
-	advisorapi "github.com/grafana/grafana/apps/advisor/pkg/apis"
 	advisorv0alpha1 "github.com/grafana/grafana/apps/advisor/pkg/apis/advisor/v0alpha1"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checkregistry"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checks"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checkscheduler"
 	"github.com/grafana/grafana/apps/advisor/pkg/app/checktyperegisterer"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
-	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/setting"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/client-go/rest"
 )

 func New(cfg app.Config) (app.App, error) {
@@ -194,45 +188,3 @@ func GetKinds() map[schema.GroupVersion][]resource.Kind {
 		},
 	}
 }
-
-func ProvideAppInstaller(
-	authorizer authorizer.Authorizer,
-	checkRegistry checkregistry.CheckService,
-	cfg *setting.Cfg,
-	orgService org.Service,
-) (*AdvisorAppInstaller, error) {
-	provider := simple.NewAppProvider(advisorapi.LocalManifest(), nil, New)
-	pluginConfig := cfg.PluginSettings["grafana-advisor-app"]
-	specificConfig := checkregistry.AdvisorAppConfig{
-		CheckRegistry: checkRegistry,
-		PluginConfig:  pluginConfig,
-		StackID:       cfg.StackID,
-		OrgService:    orgService,
-	}
-	appCfg := app.Config{
-		KubeConfig:     rest.Config{},
-		ManifestData:   *advisorapi.LocalManifest().ManifestData,
-		SpecificConfig: specificConfig,
-	}
-
-	defaultInstaller, err := appsdkapiserver.NewDefaultAppInstaller(provider, appCfg, advisorapi.NewGoTypeAssociator())
-	if err != nil {
-		return nil, err
-	}
-
-	installer := &AdvisorAppInstaller{
-		AppInstaller: defaultInstaller,
-		authorizer:   authorizer,
-	}
-
-	return installer, nil
-}
-
-type AdvisorAppInstaller struct {
-	appsdkapiserver.AppInstaller
-	authorizer authorizer.Authorizer
-}
-
-func (a *AdvisorAppInstaller) GetAuthorizer() authorizer.Authorizer {
-	return a.authorizer
-}
--- a/apps/advisor/pkg/app/authorizer.go
+++ b/apps/advisor/pkg/app/authorizer.go
@@ -0,0 +1,47 @@
+package app
+
+import (
+	"context"
+
+	claims "github.com/grafana/authlib/types"
+	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+)
+
+func GetAuthorizer() authorizer.Authorizer {
+	return authorizer.AuthorizerFunc(func(
+		ctx context.Context, attr authorizer.Attributes,
+	) (authorized authorizer.Decision, reason string, err error) {
+		if !attr.IsResourceRequest() {
+			return authorizer.DecisionNoOpinion, "", nil
+		}
+
+		// Check for service identity
+		if identity.IsServiceIdentity(ctx) {
+			return authorizer.DecisionAllow, "", nil
+		}
+
+		// Check for access policy identity
+		info, ok := claims.AuthInfoFrom(ctx)
+		if ok && claims.IsIdentityType(info.GetIdentityType(), claims.TypeAccessPolicy) {
+			// For access policy identities, we need to use ResourceAuthorizer
+			// This requires an AccessClient, which should be provided by the API server
+			// For now, we'll use the default ResourceAuthorizer from the API server
+			// This will be set up by the API server's authorization chain
+			return authorizer.DecisionNoOpinion, "", nil
+		}
+
+		// For regular Grafana users, check if they are admin
+		u, err := identity.GetRequester(ctx)
+		if err != nil {
+			return authorizer.DecisionDeny, "valid user is required", err
+		}
+
+		// check if is admin
+		if u.HasRole(identity.RoleAdmin) {
+			return authorizer.DecisionAllow, "", nil
+		}
+
+		return authorizer.DecisionDeny, "forbidden", nil
+	})
+}
--- a/apps/advisor/pkg/app/authorizer_test.go
+++ b/apps/advisor/pkg/app/authorizer_test.go
@@ -0,0 +1,91 @@
+package app
+
+import (
+	"context"
+	"testing"
+
+	claims "github.com/grafana/authlib/types"
+	"github.com/grafana/grafana/pkg/apimachinery/identity"
+	"github.com/stretchr/testify/assert"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+)
+
+func TestGetAuthorizer(t *testing.T) {
+	tests := []struct {
+		name             string
+		ctx              context.Context
+		attr             authorizer.Attributes
+		expectedDecision authorizer.Decision
+		expectedReason   string
+		expectedErr      error
+	}{
+		{
+			name:             "non-resource request",
+			ctx:              context.TODO(),
+			attr:             &mockAttributes{resourceRequest: false},
+			expectedDecision: authorizer.DecisionNoOpinion,
+			expectedReason:   "",
+			expectedErr:      nil,
+		},
+		{
+			name:             "user is admin",
+			ctx:              identity.WithRequester(context.TODO(), &mockUser{isGrafanaAdmin: true}),
+			attr:             &mockAttributes{resourceRequest: true},
+			expectedDecision: authorizer.DecisionAllow,
+			expectedReason:   "",
+			expectedErr:      nil,
+		},
+		{
+			name:             "user is not admin",
+			ctx:              identity.WithRequester(context.TODO(), &mockUser{isGrafanaAdmin: false}),
+			attr:             &mockAttributes{resourceRequest: true},
+			expectedDecision: authorizer.DecisionDeny,
+			expectedReason:   "forbidden",
+			expectedErr:      nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			auth := GetAuthorizer()
+			decision, reason, err := auth.Authorize(tt.ctx, tt.attr)
+			assert.Equal(t, tt.expectedDecision, decision)
+			assert.Equal(t, tt.expectedReason, reason)
+			assert.Equal(t, tt.expectedErr, err)
+		})
+	}
+}
+
+type mockAttributes struct {
+	authorizer.Attributes
+	resourceRequest bool
+}
+
+func (m *mockAttributes) IsResourceRequest() bool {
+	return m.resourceRequest
+}
+
+// Implement other methods of authorizer.Attributes as needed
+
+type mockUser struct {
+	identity.Requester
+	isGrafanaAdmin bool
+}
+
+func (m *mockUser) GetIsGrafanaAdmin() bool {
+	return m.isGrafanaAdmin
+}
+
+func (m *mockUser) HasRole(role identity.RoleType) bool {
+	return role == identity.RoleAdmin && m.isGrafanaAdmin
+}
+
+func (m *mockUser) GetUID() string {
+	return "test-uid"
+}
+
+func (m *mockUser) GetIdentityType() claims.IdentityType {
+	return claims.TypeUser
+}
+
+// Implement other methods of identity.Requester as needed
--- a/apps/alerting/historian/go.mod
+++ b/apps/alerting/historian/go.mod
@@ -4,7 +4,7 @@ go 1.25.5

 require (
 	github.com/go-kit/log v0.2.1
-	github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7
+	github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4
 	github.com/grafana/grafana-app-sdk v0.48.5
 	github.com/grafana/grafana-app-sdk/logging v0.48.3
--- a/apps/alerting/historian/go.sum
+++ b/apps/alerting/historian/go.sum
@@ -216,10 +216,12 @@ github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 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/grafana/grafana-app-sdk v0.48.5 h1:MS8l9fTZz+VbTfgApn09jw27GxhQ6fNOWGhC4ydvZmM=
+github.com/grafana/grafana-app-sdk v0.48.5/go.mod h1:HJsMOSBmt/D/Ihs1SvagOwmXKi0coBMVHlfvdd+qe9Y=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7 h1:ZzG/gCclEit9w0QUfQt9GURcOycAIGcsQAhY1u0AEX0=
-github.com/grafana/alerting v0.0.0-20251212143239-491433b332b7/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba h1:psKWNETD5nGxmFAlqnWsXoRyUwSa2GHNEMSEDKGKfQ4=
+github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba/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.5 h1:MS8l9fTZz+VbTfgApn09jw27GxhQ6fNOWGhC4ydvZmM=
--- a/apps/dashboard/go.mod
+++ b/apps/dashboard/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/grafana/grafana-app-sdk/logging v0.48.3
 	github.com/grafana/grafana-plugin-sdk-go v0.284.0
 	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250514132646-acbc7b54ed9e
-	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/prometheus/client_golang v1.23.2
 	github.com/stretchr/testify v1.11.1
 	k8s.io/apimachinery v0.34.2
@@ -58,6 +57,7 @@ require (
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.7.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
--- a/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue
@@ -706,10 +706,6 @@ lineage: schemas: [{

 			// Field options allow you to change how the data is displayed in your visualizations.
 			fieldConfig?: #FieldConfigSource
-
-			// When a panel is migrated from a previous version (Angular to React), this field is set to the original panel type.
-			// This is used to determine the original panel type when migrating to a new version so the plugin migration can be applied.
-			autoMigrateFrom?: string
 		} @cuetsy(kind="interface") @grafana(TSVeneer="type") @grafanamaturity(NeedsExpertReview)

 		// The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
--- a/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+++ b/apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
@@ -706,10 +706,6 @@ lineage: schemas: [{

 			// Field options allow you to change how the data is displayed in your visualizations.
 			fieldConfig?: #FieldConfigSource
-
-			// When a panel is migrated from a previous version (Angular to React), this field is set to the original panel type.
-			// This is used to determine the original panel type when migrating to a new version so the plugin migration can be applied.
-			autoMigrateFrom?: string
 		} @cuetsy(kind="interface") @grafana(TSVeneer="type") @grafanamaturity(NeedsExpertReview)

 		// The data model used in Grafana, namely the data frame, is a columnar-oriented table structure that unifies both time series and table query results.
--- a/apps/dashboard/pkg/migration/README.md
+++ b/apps/dashboard/pkg/migration/README.md
@@ -53,7 +53,6 @@ v0alpha1 (Legacy JSON) → v1beta1 (Migrated JSON) → v2alpha1/v2beta1 (Structu
 - Transforms JSON dashboards to structured dashboard format
 - v2 schema is the stable, typed schema with proper type definitions
 - Handles modern dashboard features and Kubernetes-native storage
- Preserves Angular panel migration data for frontend processing (see [Angular Panel Migrations](#angular-panel-migrations))
 - See [V2 to V1 Layout Conversion](./conversion/v2_to_v1_layout_conversion.md) for details on how V2 layouts are converted back to V1 panel arrays

 #### v2 to v0/v1 Conversion:
@@ -62,76 +61,6 @@ v0alpha1 (Legacy JSON) → v1beta1 (Migrated JSON) → v2alpha1/v2beta1 (Structu
 - v0alpha1 and v1beta1 share the same spec structure (only API version differs)
 - Enables backward compatibility when storing v2 dashboards in legacy format

-### Angular Panel Migrations
-
-When converting dashboards from v0/v1 to v2, panels with Angular types require special handling. The `autoMigrateFrom` field is used in v0 and v1 to indicate the panel was migrated from a deprecated plugin type, and the target plugin contains migration logic to transform the original panel's options and field configurations.
-
-Panel plugins define their own migration logic via `plugin.onPanelTypeChanged()`. This migration runs in the frontend when a panel type changes, transforming old options/fieldConfig to the new format. Examples:
- `singlestat.format: "short"` → `stat.fieldConfig.defaults.unit: "short"`
- `graph.legend.show: true` → `timeseries.options.legend.showLegend: true`
-
-The v2 schema doesn't include `autoMigrateFrom` as a typed field, so we need a mechanism to preserve the original panel data for the frontend to run these plugin migrations.
-
-#### `__angularMigration` Temporary Data
-
-The backend v1 → v2 conversion preserves the original panel data in a temporary field within `vizConfig.spec.options`. This works for **any** Angular panel, not just specific panel types:
-
-```json
-{
-  "vizConfig": {
-    "kind": "stat",
-    "spec": {
-      "options": {
-        "__angularMigration": {
-          "autoMigrateFrom": "singlestat",
-          "originalPanel": {
-            "type": "singlestat",
-            "format": "short",
-            "colorBackground": true,
-            "sparkline": { "show": true },
-            "fieldConfig": { ... },
-            "options": { ... }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-#### How It Works
-
-1. **Backend (v1 → v2):** The conversion detects panels that need Angular migration in two ways:
-   - If `autoMigrateFrom` is already set on the panel (from v0 → v1 migration) - panel type already converted
-   - If the panel type is a known Angular panel type (fallback for dashboards stored directly as v1 without v0 → v1 migration)
-   
-   In the second case, the conversion also transforms the panel type (e.g., `singlestat` → `stat`) and sets `autoMigrateFrom`. This replicates the same logic as the v0 → v1 migration.
-   
-   The entire original panel is stored under `options.__angularMigration` for the frontend to run plugin-specific migrations.
-
-2. **Frontend (v2 load):** When building a `VizPanel` from v2 data:
-   - Extracts `__angularMigration` from options
-   - Removes it from the options object (not persisted)
-   - Attaches a custom migration handler via `_UNSAFE_customMigrationHandler`
-
-3. **Plugin load (VizPanel activation):** When the plugin loads, the migration handler calls `plugin.onPanelTypeChanged()` with the original panel data, allowing the plugin's own migration code to run
-
-#### Key Points
-
- Works for **any** panel with `autoMigrateFrom`, not limited to specific panel types
- Each plugin defines its own migration logic - the backend just preserves the data
- The `originalPanel` contains the complete panel data to ensure no information is lost
- Migration data is removed from options after loaded in frontend
- The 0v → v1 and v1 → v2 conversions automatically detects these Angular panel types if `autoMigrateFrom` is not set.
-
-#### Implementation Files
-
-| File | Purpose |
-|------|---------|
-| `apps/dashboard/pkg/migration/conversion/v1beta1_to_v2alpha1.go` | Injects `__angularMigration` during v1 → v2 |
-| `public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts` | Extracts and consumes `__angularMigration` |
-| `public/app/features/dashboard-scene/serialization/angularMigration.ts` | Creates migration handler for v2 path |
-
 ## Conversion Matrix

 The system supports conversions between all dashboard API versions:
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.angular-migrations.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.angular-migrations.json
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.value-mapping-and-overrides.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.value-mapping-and-overrides.json
@@ -1,603 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "metadata": {
-    "name": "value-mapping-test",
-    "namespace": "default",
-    "uid": "value-mapping-test",
-    "resourceVersion": "1765384157199094",
-    "generation": 2,
-    "creationTimestamp": "2025-11-19T20:09:28Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "646372978987008"
-    },
-    "annotations": {},
-    "managedFields": []
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Test dashboard for all value mapping types and override matcher types",
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus-uid"
-        },
-        "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "critical": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Critical!"
-                  },
-                  "warning": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  },
-                  "ok": {
-                    "color": "green",
-                    "index": 2,
-                    "text": "OK"
-                  }
-                },
-                "type": "value"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 100
-                },
-                {
-                  "id": "custom.align",
-                  "value": "center"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "targets": [
-          {
-            "expr": "up",
-            "refId": "A"
-          }
-        ],
-        "title": "ValueMap Example",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus-uid"
-        },
-        "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "from": 0,
-                  "to": 50,
-                  "result": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Low"
-                  }
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 50,
-                  "to": 80,
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Medium"
-                  }
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 80,
-                  "to": 100,
-                  "result": {
-                    "color": "red",
-                    "index": 2,
-                    "text": "High"
-                  }
-                },
-                "type": "range"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^cpu_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "percent"
-                },
-                {
-                  "id": "decimals",
-                  "value": 2
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "targets": [
-          {
-            "expr": "cpu_usage_percent",
-            "refId": "A"
-          }
-        ],
-        "title": "RangeMap Example",
-        "type": "gauge"
-      },
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus-uid"
-        },
-        "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "pattern": "/^error.*/",
-                  "result": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Error"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^warn.*/",
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^info.*/",
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "Info"
-                  }
-                },
-                "type": "regex"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "string"
-              },
-              "properties": [
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-text"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 8
-        },
-        "id": 3,
-        "targets": [
-          {
-            "expr": "log_level",
-            "refId": "A"
-          }
-        ],
-        "title": "RegexMap Example",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus-uid"
-        },
-        "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 0,
-                    "text": "No Data"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 1,
-                    "text": "Not a Number"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "null+nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 2,
-                    "text": "N/A"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "true",
-                  "result": {
-                    "color": "green",
-                    "index": 3,
-                    "text": "Yes"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "false",
-                  "result": {
-                    "color": "red",
-                    "index": 4,
-                    "text": "No"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "empty",
-                  "result": {
-                    "color": "gray",
-                    "index": 5,
-                    "text": "Empty"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "A"
-              },
-              "properties": [
-                {
-                  "id": "color",
-                  "value": {
-                    "mode": "fixed",
-                    "fixedColor": "blue"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 8
-        },
-        "id": 4,
-        "targets": [
-          {
-            "expr": "some_metric",
-            "refId": "A"
-          }
-        ],
-        "title": "SpecialValueMap Example",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus-uid"
-        },
-        "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "success": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Success"
-                  },
-                  "failure": {
-                    "color": "red",
-                    "index": 1,
-                    "text": "Failure"
-                  }
-                },
-                "type": "value"
-              },
-              {
-                "options": {
-                  "from": 0,
-                  "to": 100,
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "In Range"
-                  }
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "pattern": "/^[A-Z]{3}-\\d+$/",
-                  "result": {
-                    "color": "purple",
-                    "index": 3,
-                    "text": "ID Format"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 4,
-                    "text": "Missing"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 120
-                },
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-background"
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^value_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "short"
-                },
-                {
-                  "id": "min",
-                  "value": 0
-                },
-                {
-                  "id": "max",
-                  "value": 100
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "number"
-              },
-              "properties": [
-                {
-                  "id": "decimals",
-                  "value": 2
-                },
-                {
-                  "id": "thresholds",
-                  "value": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": null
-                      },
-                      {
-                        "color": "yellow",
-                        "value": 50
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "B"
-              },
-              "properties": [
-                {
-                  "id": "displayName",
-                  "value": "Secondary Query"
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byValue",
-                "options": {
-                  "reducer": "allIsNull",
-                  "op": "gte",
-                  "value": 0
-                }
-              },
-              "properties": [
-                {
-                  "id": "custom.hidden",
-                  "value": true
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 24,
-          "x": 0,
-          "y": 16
-        },
-        "id": 5,
-        "targets": [
-          {
-            "expr": "combined_metric",
-            "refId": "A"
-          },
-          {
-            "expr": "secondary_metric",
-            "refId": "B"
-          }
-        ],
-        "title": "Combined Mappings and Overrides Example",
-        "type": "table"
-      }
-    ],
-    "schemaVersion": 42,
-    "tags": [
-      "value-mapping",
-      "overrides",
-      "test"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "Value Mapping and Overrides Test",
-    "weekStart": ""
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v0alpha1"
-    }
-  },
-  "access": {
-    "slug": "value-mapping-test",
-    "url": "/d/value-mapping-test/value-mapping-and-overrides-test",
-    "canSave": true,
-    "canEdit": true,
-    "canAdmin": true,
-    "canStar": true,
-    "canDelete": true,
-    "annotationsPermissions": {
-      "dashboard": {
-        "canAdd": true,
-        "canEdit": true,
-        "canDelete": true
-      },
-      "organization": {
-        "canAdd": true,
-        "canEdit": true,
-        "canDelete": true
-      }
-    }
-  }
-}
--- a/apps/dashboard/pkg/migration/conversion/testdata/input/v2beta1.tab-with-multiple-panels.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/input/v2beta1.tab-with-multiple-panels.json
@@ -1,715 +0,0 @@
-{
-"kind": "DashboardWithAccessInfo",
-"apiVersion": "dashboard.grafana.app/v2beta1",
-"metadata": {
-    "name": "adt885j",
-    "namespace": "default",
-    "uid": "yTWet6JgBjlRIWnqRE9ZOmUycfT0tEkr2mljaln1GWIX",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-12-16T10:44:31Z",
-    "labels": {
-    "grafana.app/deprecatedInternalID": "2409"
-    },
-    "annotations": {
-    "grafana.app/createdBy": "user:u000000001",
-    "grafana.app/updatedBy": "user:u000000001",
-    "grafana.app/updatedTimestamp": "2025-12-16T10:51:14Z"
-    }
-},
-"spec": {
-    "annotations": [
-    {
-        "kind": "AnnotationQuery",
-        "spec": {
-        "query": {
-            "kind": "DataQuery",
-            "group": "grafana",
-            "version": "v0",
-            "datasource": {
-            "name": "-- Grafana --"
-            },
-            "spec": {}
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations \u0026 Alerts",
-        "builtIn": true
-        }
-    }
-    ],
-    "cursorSync": "Off",
-    "description": "",
-    "editable": true,
-    "elements": {
-    "panel-1": {
-        "kind": "Panel",
-        "spec": {
-        "id": 1,
-        "title": "Panel1",
-        "description": "",
-        "links": [],
-        "data": {
-            "kind": "QueryGroup",
-            "spec": {
-            "queries": [
-                {
-                "kind": "PanelQuery",
-                "spec": {
-                    "query": {
-                    "kind": "DataQuery",
-                    "group": "grafana-testdata-datasource",
-                    "version": "v0",
-                    "datasource": {
-                        "name": "PD8C576611E62080A"
-                    },
-                    "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                }
-                }
-            ],
-            "transformations": [],
-            "queryOptions": {}
-            }
-        },
-        "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-            "options": {
-                "legend": {
-                "calcs": [],
-                "displayMode": "list",
-                "placement": "bottom",
-                "showLegend": true
-                },
-                "tooltip": {
-                "hideZeros": false,
-                "mode": "single",
-                "sort": "none"
-                }
-            },
-            "fieldConfig": {
-                "defaults": {
-                "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                    {
-                        "value": 0,
-                        "color": "green"
-                    },
-                    {
-                        "value": 80,
-                        "color": "red"
-                    }
-                    ]
-                },
-                "color": {
-                    "mode": "palette-classic"
-                },
-                "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                    "legend": false,
-                    "tooltip": false,
-                    "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                    "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                    "group": "A",
-                    "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                    "mode": "off"
-                    }
-                }
-                },
-                "overrides": []
-            }
-            }
-        }
-        }
-    },
-    "panel-2": {
-        "kind": "Panel",
-        "spec": {
-        "id": 2,
-        "title": "Panel2",
-        "description": "",
-        "links": [],
-        "data": {
-            "kind": "QueryGroup",
-            "spec": {
-            "queries": [
-                {
-                "kind": "PanelQuery",
-                "spec": {
-                    "query": {
-                    "kind": "DataQuery",
-                    "group": "",
-                    "version": "v0",
-                    "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                }
-                }
-            ],
-            "transformations": [],
-            "queryOptions": {}
-            }
-        },
-        "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-            "options": {
-                "legend": {
-                "calcs": [],
-                "displayMode": "list",
-                "placement": "bottom",
-                "showLegend": true
-                },
-                "tooltip": {
-                "hideZeros": false,
-                "mode": "single",
-                "sort": "none"
-                }
-            },
-            "fieldConfig": {
-                "defaults": {
-                "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                    {
-                        "value": 0,
-                        "color": "green"
-                    },
-                    {
-                        "value": 80,
-                        "color": "red"
-                    }
-                    ]
-                },
-                "color": {
-                    "mode": "palette-classic"
-                },
-                "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                    "legend": false,
-                    "tooltip": false,
-                    "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                    "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                    "group": "A",
-                    "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                    "mode": "off"
-                    }
-                }
-                },
-                "overrides": []
-            }
-            }
-        }
-        }
-    },
-    "panel-3": {
-        "kind": "Panel",
-        "spec": {
-        "id": 3,
-        "title": "Panel3",
-        "description": "",
-        "links": [],
-        "data": {
-            "kind": "QueryGroup",
-            "spec": {
-            "queries": [
-                {
-                "kind": "PanelQuery",
-                "spec": {
-                    "query": {
-                    "kind": "DataQuery",
-                    "group": "",
-                    "version": "v0",
-                    "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                }
-                }
-            ],
-            "transformations": [],
-            "queryOptions": {}
-            }
-        },
-        "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-            "options": {
-                "legend": {
-                "calcs": [],
-                "displayMode": "list",
-                "placement": "bottom",
-                "showLegend": true
-                },
-                "tooltip": {
-                "hideZeros": false,
-                "mode": "single",
-                "sort": "none"
-                }
-            },
-            "fieldConfig": {
-                "defaults": {
-                "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                    {
-                        "value": 0,
-                        "color": "green"
-                    },
-                    {
-                        "value": 80,
-                        "color": "red"
-                    }
-                    ]
-                },
-                "color": {
-                    "mode": "palette-classic"
-                },
-                "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                    "legend": false,
-                    "tooltip": false,
-                    "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                    "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                    "group": "A",
-                    "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                    "mode": "off"
-                    }
-                }
-                },
-                "overrides": []
-            }
-            }
-        }
-        }
-    },
-    "panel-4": {
-        "kind": "Panel",
-        "spec": {
-        "id": 4,
-        "title": "Panel4",
-        "description": "",
-        "links": [],
-        "data": {
-            "kind": "QueryGroup",
-            "spec": {
-            "queries": [
-                {
-                "kind": "PanelQuery",
-                "spec": {
-                    "query": {
-                    "kind": "DataQuery",
-                    "group": "",
-                    "version": "v0",
-                    "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                }
-                }
-            ],
-            "transformations": [],
-            "queryOptions": {}
-            }
-        },
-        "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-            "options": {
-                "legend": {
-                "calcs": [],
-                "displayMode": "list",
-                "placement": "bottom",
-                "showLegend": true
-                },
-                "tooltip": {
-                "hideZeros": false,
-                "mode": "single",
-                "sort": "none"
-                }
-            },
-            "fieldConfig": {
-                "defaults": {
-                "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                    {
-                        "value": 0,
-                        "color": "green"
-                    },
-                    {
-                        "value": 80,
-                        "color": "red"
-                    }
-                    ]
-                },
-                "color": {
-                    "mode": "palette-classic"
-                },
-                "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                    "legend": false,
-                    "tooltip": false,
-                    "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                    "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                    "group": "A",
-                    "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                    "mode": "off"
-                    }
-                }
-                },
-                "overrides": []
-            }
-            }
-        }
-        }
-    },
-    "panel-5": {
-        "kind": "Panel",
-        "spec": {
-        "id": 5,
-        "title": "Panel5",
-        "description": "",
-        "links": [],
-        "data": {
-            "kind": "QueryGroup",
-            "spec": {
-            "queries": [
-                {
-                "kind": "PanelQuery",
-                "spec": {
-                    "query": {
-                    "kind": "DataQuery",
-                    "group": "",
-                    "version": "v0",
-                    "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                }
-                }
-            ],
-            "transformations": [],
-            "queryOptions": {}
-            }
-        },
-        "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-            "options": {
-                "legend": {
-                "calcs": [],
-                "displayMode": "list",
-                "placement": "bottom",
-                "showLegend": true
-                },
-                "tooltip": {
-                "hideZeros": false,
-                "mode": "single",
-                "sort": "none"
-                }
-            },
-            "fieldConfig": {
-                "defaults": {
-                "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                    {
-                        "value": 0,
-                        "color": "green"
-                    },
-                    {
-                        "value": 80,
-                        "color": "red"
-                    }
-                    ]
-                },
-                "color": {
-                    "mode": "palette-classic"
-                },
-                "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                    "legend": false,
-                    "tooltip": false,
-                    "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                    "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                    "group": "A",
-                    "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                    "mode": "off"
-                    }
-                }
-                },
-                "overrides": []
-            }
-            }
-        }
-        }
-    }
-    },
-    "layout": {
-    "kind": "TabsLayout",
-    "spec": {
-        "tabs": [
-        {
-            "kind": "TabsLayoutTab",
-            "spec": {
-            "title": "Tab1",
-            "layout": {
-                "kind": "GridLayout",
-                "spec": {
-                "items": [
-                    {
-                    "kind": "GridLayoutItem",
-                    "spec": {
-                        "x": 0,
-                        "y": 0,
-                        "width": 7,
-                        "height": 8,
-                        "element": {
-                        "kind": "ElementReference",
-                        "name": "panel-1"
-                        }
-                    }
-                    },
-                    {
-                    "kind": "GridLayoutItem",
-                    "spec": {
-                        "x": 7,
-                        "y": 0,
-                        "width": 8,
-                        "height": 8,
-                        "element": {
-                        "kind": "ElementReference",
-                        "name": "panel-2"
-                        }
-                    }
-                    },
-                    {
-                    "kind": "GridLayoutItem",
-                    "spec": {
-                        "x": 15,
-                        "y": 0,
-                        "width": 9,
-                        "height": 8,
-                        "element": {
-                        "kind": "ElementReference",
-                        "name": "panel-3"
-                        }
-                    }
-                    },
-                    {
-                    "kind": "GridLayoutItem",
-                    "spec": {
-                        "x": 0,
-                        "y": 8,
-                        "width": 12,
-                        "height": 8,
-                        "element": {
-                        "kind": "ElementReference",
-                        "name": "panel-4"
-                        }
-                    }
-                    },
-                    {
-                    "kind": "GridLayoutItem",
-                    "spec": {
-                        "x": 12,
-                        "y": 8,
-                        "width": 12,
-                        "height": 8,
-                        "element": {
-                        "kind": "ElementReference",
-                        "name": "panel-5"
-                        }
-                    }
-                    }
-                ]
-                }
-            }
-            }
-        }
-        ]
-    }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-    "timezone": "browser",
-    "from": "now-6h",
-    "to": "now",
-    "autoRefresh": "",
-    "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-    ],
-    "hideTimepicker": false,
-    "fiscalYearStartMonth": 0
-    },
-    "title": "Dashboard with tabs",
-    "variables": []
-},
-"status": {},
-"access": {
-    "slug": "dashboard-with-tabs",
-    "url": "/d/adt885j/dashboard-with-tabs",
-    "isPublic": false,
-    "canSave": true,
-    "canEdit": true,
-    "canAdmin": true,
-    "canStar": true,
-    "canDelete": true,
-    "annotationsPermissions": {
-    "dashboard": {
-        "canAdd": true,
-        "canEdit": true,
-        "canDelete": true
-    },
-    "organization": {
-        "canAdd": true,
-        "canEdit": true,
-        "canDelete": true
-    }
-    }
-}
-} 
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2alpha1.json
@@ -66,29 +66,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "20",
-                          "30"
-                        ]
-                      },
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "200",
-                          "300"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -132,22 +110,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "50",
-                          "75"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -191,22 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "thresholds": [
-                          "5",
-                          "10",
-                          "15"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2beta1.json
@@ -69,29 +69,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "20",
-                          "30"
-                        ]
-                      },
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "200",
-                          "300"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -137,22 +115,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "thresholds": [
-                          "50",
-                          "75"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -198,22 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "thresholds": [
-                          "5",
-                          "10",
-                          "15"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2alpha1.json
@@ -66,18 +66,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -121,20 +110,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2beta1.json
@@ -69,18 +69,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -126,20 +115,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2alpha1.json
@@ -66,20 +66,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 200,
-                      "threshold1Color": "yellow",
-                      "threshold2": 400,
-                      "threshold2Color": "red",
-                      "thresholdLine": true
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -123,20 +110,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 100,
-                      "threshold1Color": "green",
-                      "threshold2": 300,
-                      "threshold2Color": "blue",
-                      "thresholdLine": false
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -180,18 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 150,
-                      "threshold1Color": "orange",
-                      "thresholdLine": true
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -235,25 +198,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 200,
-                      "threshold1Color": "yellow",
-                      "thresholdLine": false
-                    },
-                    "thresholds": [
-                      {
-                        "color": "purple",
-                        "colorMode": "custom",
-                        "value": 50
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -297,12 +242,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2beta1.json
@@ -69,20 +69,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 200,
-                      "threshold1Color": "yellow",
-                      "threshold2": 400,
-                      "threshold2Color": "red",
-                      "thresholdLine": true
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -128,20 +115,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 100,
-                      "threshold1Color": "green",
-                      "threshold2": 300,
-                      "threshold2Color": "blue",
-                      "thresholdLine": false
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -187,18 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 150,
-                      "threshold1Color": "orange",
-                      "thresholdLine": true
-                    }
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -244,25 +207,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "threshold1": 200,
-                      "threshold1Color": "yellow",
-                      "thresholdLine": false
-                    },
-                    "thresholds": [
-                      {
-                        "color": "purple",
-                        "colorMode": "custom",
-                        "value": 50
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -308,12 +253,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2alpha1.json
@@ -72,12 +72,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2beta1.json
@@ -75,12 +75,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2alpha1.json
@@ -68,18 +68,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -125,20 +114,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "max": 100,
-                        "min": 0,
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2beta1.json
@@ -71,18 +71,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -130,20 +119,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "max": 100,
-                        "min": 0,
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2alpha1.json
@@ -83,18 +83,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -138,20 +127,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2beta1.json
@@ -87,18 +87,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -144,20 +133,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -159,12 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -208,12 +198,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -269,14 +254,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "height": 200
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -304,14 +282,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "height": 200
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -166,12 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -217,12 +207,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -280,14 +265,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "height": 200
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -316,14 +294,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "height": 200
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -115,12 +110,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -164,12 +154,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -257,12 +242,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -394,12 +374,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -487,12 +462,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -120,12 +115,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -171,12 +161,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -268,12 +253,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -411,12 +391,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -508,12 +483,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2alpha1.json
@@ -288,10 +288,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "show": true,
                  "showLegend": true
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2beta1.json
@@ -299,10 +299,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "show": true,
                  "showLegend": true
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2alpha1.json
@@ -71,12 +71,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -317,12 +312,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2beta1.json
@@ -74,12 +74,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -330,12 +325,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json
@@ -68,20 +68,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graphite",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "short",
-                    "y_format": "percent"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -127,18 +114,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "min": 0
-                    },
-                    "legend": false,
-                    "y_format": "bytes"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -228,15 +204,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graphite",
-                  "originalOptions": {
-                    "legend": true,
-                    "y2_format": "Bps"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json
@@ -71,20 +71,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graphite",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "short",
-                    "y_format": "percent"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -132,18 +119,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "grid": {
-                      "min": 0
-                    },
-                    "legend": false,
-                    "y_format": "bytes"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -237,15 +213,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graphite",
-                  "originalOptions": {
-                    "legend": true,
-                    "y2_format": "Bps"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2alpha1.json
@@ -181,10 +181,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "dataLinks": [
                  {
                    "title": "Graph Data Link",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2beta1.json
@@ -188,10 +188,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "dataLinks": [
                  {
                    "title": "Graph Data Link",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2alpha1.json
@@ -66,25 +66,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "pattern": "Time",
-                        "type": "number"
-                      },
-                      {
-                        "align": "auto",
-                        "pattern": "Value",
-                        "type": "string"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2beta1.json
@@ -69,25 +69,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "pattern": "Time",
-                        "type": "number"
-                      },
-                      {
-                        "align": "auto",
-                        "pattern": "Value",
-                        "type": "string"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json
@@ -81,29 +81,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "legend": true,
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20",
-                          "30"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -147,31 +125,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "center",
-                        "pattern": "/.*/"
-                      },
-                      {
-                        "align": "left",
-                        "pattern": "LeftColumn"
-                      },
-                      {
-                        "align": "right",
-                        "pattern": "RightColumn"
-                      },
-                      {
-                        "align": "auto",
-                        "pattern": "AutoColumn"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -215,35 +169,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "alias": "Exact Match",
-                        "pattern": "ExactColumnName"
-                      },
-                      {
-                        "alias": "Regex Match",
-                        "pattern": "/Regex.*Pattern/"
-                      },
-                      {
-                        "alias": "Start Pattern",
-                        "pattern": "/^Start/"
-                      },
-                      {
-                        "alias": "End Pattern",
-                        "pattern": "/End$/"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -287,37 +213,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "link": true,
-                        "linkTargetBlank": true,
-                        "linkTooltip": "Click to view details",
-                        "linkUrl": "http://example.com/with-tooltip",
-                        "pattern": "LinkWithTooltip"
-                      },
-                      {
-                        "link": true,
-                        "linkTargetBlank": false,
-                        "linkUrl": "http://example.com/no-tooltip",
-                        "pattern": "LinkWithoutTooltip"
-                      },
-                      {
-                        "link": true,
-                        "linkUrl": "http://example.com/minimal",
-                        "pattern": "LinkMinimal"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -361,37 +257,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "alias": "ISO Date",
-                        "dateFormat": "YYYY-MM-DD",
-                        "pattern": "DateISO",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "Full DateTime",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "DateTime",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "Time Only",
-                        "dateFormat": "HH:mm:ss",
-                        "pattern": "TimeOnly",
-                        "type": "date"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -523,12 +389,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -572,12 +433,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -621,57 +477,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "center",
-                        "colorMode": "cell",
-                        "colors": [
-                          "green",
-                          "yellow",
-                          "red"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "100",
-                          "500"
-                        ],
-                        "unit": "bytes"
-                      },
-                      {
-                        "alias": "Current Status",
-                        "align": "left",
-                        "colorMode": "value",
-                        "decimals": 0,
-                        "pattern": "Status",
-                        "unit": "short"
-                      },
-                      {
-                        "colorMode": "row",
-                        "link": true,
-                        "linkTargetBlank": true,
-                        "linkTooltip": "View error details",
-                        "linkUrl": "http://example.com/errors",
-                        "pattern": "/Error.*/"
-                      },
-                      {
-                        "alias": "Timestamp",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "pattern": "Hidden",
-                        "type": "hidden"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -715,47 +521,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [
-                      {
-                        "text": "Average",
-                        "value": "avg"
-                      },
-                      {
-                        "text": "Maximum",
-                        "value": "max"
-                      },
-                      {
-                        "text": "Minimum",
-                        "value": "min"
-                      },
-                      {
-                        "text": "Total",
-                        "value": "total"
-                      },
-                      {
-                        "text": "Current",
-                        "value": "current"
-                      },
-                      {
-                        "text": "Count",
-                        "value": "count"
-                      }
-                    ],
-                    "styles": [
-                      {
-                        "decimals": 1,
-                        "pattern": "/.*/",
-                        "unit": "percent"
-                      }
-                    ],
-                    "transform": "timeseries_aggregations"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -799,20 +565,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "timeseries_to_rows"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -856,20 +609,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "bytes"
-                      }
-                    ],
-                    "transform": "timeseries_to_columns"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -913,20 +653,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "pattern": "/.*/"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -985,20 +712,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "timeseries_to_rows"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -1042,29 +756,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "green",
-                          "yellow",
-                          "orange",
-                          "red"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          10,
-                          "20",
-                          30.5
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -1108,31 +800,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colorMode": "cell",
-                        "pattern": "/.*/"
-                      },
-                      {
-                        "colorMode": "cell",
-                        "pattern": "CellColumn"
-                      },
-                      {
-                        "colorMode": "row",
-                        "pattern": "RowColumn"
-                      },
-                      {
-                        "colorMode": "value",
-                        "pattern": "ValueColumn"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json
@@ -85,29 +85,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "legend": true,
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20",
-                          "30"
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -153,31 +131,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "center",
-                        "pattern": "/.*/"
-                      },
-                      {
-                        "align": "left",
-                        "pattern": "LeftColumn"
-                      },
-                      {
-                        "align": "right",
-                        "pattern": "RightColumn"
-                      },
-                      {
-                        "align": "auto",
-                        "pattern": "AutoColumn"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -223,35 +177,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "alias": "Exact Match",
-                        "pattern": "ExactColumnName"
-                      },
-                      {
-                        "alias": "Regex Match",
-                        "pattern": "/Regex.*Pattern/"
-                      },
-                      {
-                        "alias": "Start Pattern",
-                        "pattern": "/^Start/"
-                      },
-                      {
-                        "alias": "End Pattern",
-                        "pattern": "/End$/"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -297,37 +223,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "link": true,
-                        "linkTargetBlank": true,
-                        "linkTooltip": "Click to view details",
-                        "linkUrl": "http://example.com/with-tooltip",
-                        "pattern": "LinkWithTooltip"
-                      },
-                      {
-                        "link": true,
-                        "linkTargetBlank": false,
-                        "linkUrl": "http://example.com/no-tooltip",
-                        "pattern": "LinkWithoutTooltip"
-                      },
-                      {
-                        "link": true,
-                        "linkUrl": "http://example.com/minimal",
-                        "pattern": "LinkMinimal"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -373,37 +269,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      },
-                      {
-                        "alias": "ISO Date",
-                        "dateFormat": "YYYY-MM-DD",
-                        "pattern": "DateISO",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "Full DateTime",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "DateTime",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "Time Only",
-                        "dateFormat": "HH:mm:ss",
-                        "pattern": "TimeOnly",
-                        "type": "date"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -541,12 +407,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -592,12 +453,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -643,57 +499,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "center",
-                        "colorMode": "cell",
-                        "colors": [
-                          "green",
-                          "yellow",
-                          "red"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "100",
-                          "500"
-                        ],
-                        "unit": "bytes"
-                      },
-                      {
-                        "alias": "Current Status",
-                        "align": "left",
-                        "colorMode": "value",
-                        "decimals": 0,
-                        "pattern": "Status",
-                        "unit": "short"
-                      },
-                      {
-                        "colorMode": "row",
-                        "link": true,
-                        "linkTargetBlank": true,
-                        "linkTooltip": "View error details",
-                        "linkUrl": "http://example.com/errors",
-                        "pattern": "/Error.*/"
-                      },
-                      {
-                        "alias": "Timestamp",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "pattern": "Hidden",
-                        "type": "hidden"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -739,47 +545,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [
-                      {
-                        "text": "Average",
-                        "value": "avg"
-                      },
-                      {
-                        "text": "Maximum",
-                        "value": "max"
-                      },
-                      {
-                        "text": "Minimum",
-                        "value": "min"
-                      },
-                      {
-                        "text": "Total",
-                        "value": "total"
-                      },
-                      {
-                        "text": "Current",
-                        "value": "current"
-                      },
-                      {
-                        "text": "Count",
-                        "value": "count"
-                      }
-                    ],
-                    "styles": [
-                      {
-                        "decimals": 1,
-                        "pattern": "/.*/",
-                        "unit": "percent"
-                      }
-                    ],
-                    "transform": "timeseries_aggregations"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -825,20 +591,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "timeseries_to_rows"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -884,20 +637,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "bytes"
-                      }
-                    ],
-                    "transform": "timeseries_to_columns"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -943,20 +683,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "align": "auto",
-                        "pattern": "/.*/"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -1017,20 +744,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "pattern": "/.*/",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "timeseries_to_rows"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -1076,29 +790,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "green",
-                          "yellow",
-                          "orange",
-                          "red"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          10,
-                          "20",
-                          30.5
-                        ]
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -1144,31 +836,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colorMode": "cell",
-                        "pattern": "/.*/"
-                      },
-                      {
-                        "colorMode": "cell",
-                        "pattern": "CellColumn"
-                      },
-                      {
-                        "colorMode": "row",
-                        "pattern": "RowColumn"
-                      },
-                      {
-                        "colorMode": "value",
-                        "pattern": "ValueColumn"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2alpha1.json
@@ -123,18 +123,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2beta1.json
@@ -130,18 +130,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -99,12 +94,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -103,12 +98,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2alpha1.json
@@ -81,24 +81,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -142,28 +125,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "gauge": {
-                      "show": true,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -222,47 +184,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      }
-                    ],
-                    "thresholds": "10,20,30",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "test",
-                        "value": "20"
-                      },
-                      {
-                        "op": "=",
-                        "text": "test1",
-                        "value": "30"
-                      },
-                      {
-                        "op": "=",
-                        "text": "50",
-                        "value": "40"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2beta1.json
@@ -85,24 +85,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -148,28 +131,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "gauge": {
-                      "show": true,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -231,47 +193,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      }
-                    ],
-                    "thresholds": "10,20,30",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "test",
-                        "value": "20"
-                      },
-                      {
-                        "op": "=",
-                        "text": "test1",
-                        "value": "30"
-                      },
-                      {
-                        "op": "=",
-                        "text": "50",
-                        "value": "40"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2alpha1.json
@@ -81,24 +81,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -157,24 +140,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": ""
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -218,28 +184,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "gauge": {
-                      "show": true,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -298,47 +243,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      }
-                    ],
-                    "thresholds": "10,20,30",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "test",
-                        "value": "20"
-                      },
-                      {
-                        "op": "=",
-                        "text": "test1",
-                        "value": "30"
-                      },
-                      {
-                        "op": "=",
-                        "text": "50",
-                        "value": "40"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -384,68 +289,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "grafana-singlestat-panel",
-                  "originalOptions": {
-                    "colorBackground": false,
-                    "colorValue": true,
-                    "colors": [
-                      "#299c46",
-                      "rgba(237, 129, 40, 0.89)",
-                      "#d44a3a"
-                    ],
-                    "format": "areaF2",
-                    "gauge": {
-                      "maxValue": 100,
-                      "minValue": 0,
-                      "show": false,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "mappingType": 1,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      },
-                      {
-                        "name": "range to text",
-                        "value": 2
-                      }
-                    ],
-                    "nullPointMode": "connected",
-                    "postfix": "b",
-                    "postfixFontSize": "50%",
-                    "prefix": "a",
-                    "prefixFontSize": "50%",
-                    "rangeMaps": [
-                      {
-                        "from": "null",
-                        "text": "N/A",
-                        "to": "null"
-                      }
-                    ],
-                    "sparkline": {
-                      "fillColor": "rgba(31, 118, 189, 0.18)",
-                      "full": false,
-                      "lineColor": "rgb(31, 120, 193)",
-                      "show": true
-                    },
-                    "tableColumn": "",
-                    "thresholds": "",
-                    "valueFontSize": "80%",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ],
-                    "valueName": "avg"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2beta1.json
@@ -85,24 +85,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -164,24 +147,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "thresholds": ""
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -227,28 +193,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "gauge": {
-                      "show": true,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "thresholds": "10,20,30"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -310,47 +255,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {
-                    "colors": [
-                      "#FF0000",
-                      "green",
-                      "orange"
-                    ],
-                    "grid": {
-                      "max": 10,
-                      "min": 1
-                    },
-                    "legend": true,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      }
-                    ],
-                    "thresholds": "10,20,30",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "test",
-                        "value": "20"
-                      },
-                      {
-                        "op": "=",
-                        "text": "test1",
-                        "value": "30"
-                      },
-                      {
-                        "op": "=",
-                        "text": "50",
-                        "value": "40"
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -398,68 +303,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "grafana-singlestat-panel",
-                  "originalOptions": {
-                    "colorBackground": false,
-                    "colorValue": true,
-                    "colors": [
-                      "#299c46",
-                      "rgba(237, 129, 40, 0.89)",
-                      "#d44a3a"
-                    ],
-                    "format": "areaF2",
-                    "gauge": {
-                      "maxValue": 100,
-                      "minValue": 0,
-                      "show": false,
-                      "thresholdLabels": false,
-                      "thresholdMarkers": true
-                    },
-                    "mappingType": 1,
-                    "mappingTypes": [
-                      {
-                        "name": "value to text",
-                        "value": 1
-                      },
-                      {
-                        "name": "range to text",
-                        "value": 2
-                      }
-                    ],
-                    "nullPointMode": "connected",
-                    "postfix": "b",
-                    "postfixFontSize": "50%",
-                    "prefix": "a",
-                    "prefixFontSize": "50%",
-                    "rangeMaps": [
-                      {
-                        "from": "null",
-                        "text": "N/A",
-                        "to": "null"
-                      }
-                    ],
-                    "sparkline": {
-                      "fillColor": "rgba(31, 118, 189, 0.18)",
-                      "full": false,
-                      "lineColor": "rgb(31, 120, 193)",
-                      "show": true
-                    },
-                    "tableColumn": "",
-                    "thresholds": "",
-                    "valueFontSize": "80%",
-                    "valueMaps": [
-                      {
-                        "op": "=",
-                        "text": "N/A",
-                        "value": "null"
-                      }
-                    ],
-                    "valueName": "avg"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2alpha1.json
@@ -280,10 +280,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "tooltip": {
                  "mode": "single"
                }
@@ -534,7 +530,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2beta1.json
@@ -289,10 +289,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "tooltip": {
                  "mode": "single"
                }
@@ -550,7 +546,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2alpha1.json
@@ -144,18 +144,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2beta1.json
@@ -151,18 +151,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "yAxes": [
-                      {
-                        "show": true
-                      }
-                    ]
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2alpha1.json
@@ -345,12 +345,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -553,7 +548,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2beta1.json
@@ -361,12 +361,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -579,7 +574,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2alpha1.json
@@ -1663,7 +1663,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2beta1.json
@@ -1727,7 +1727,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2alpha1.json
@@ -111,10 +111,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "displayMode": "list",
                  "showLegend": false
@@ -211,10 +207,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "displayMode": "list",
                  "showLegend": false
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2beta1.json
@@ -115,10 +115,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "displayMode": "list",
                  "showLegend": false
@@ -218,10 +214,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                },
                "legend": {
                  "displayMode": "list",
                  "showLegend": false
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2alpha1.json
@@ -443,12 +443,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2beta1.json
@@ -455,12 +455,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2alpha1.json
@@ -443,12 +443,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2beta1.json
@@ -455,12 +455,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2alpha1.json
@@ -217,12 +217,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -401,12 +396,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2beta1.json
@@ -222,12 +222,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -411,12 +406,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -115,12 +110,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -164,12 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -120,12 +115,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -171,12 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v42.hidefrom_tooltip.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v42.hidefrom_tooltip.v42.v2alpha1.json
@@ -94,12 +94,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": [
@@ -333,7 +328,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v42.hidefrom_tooltip.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v42.hidefrom_tooltip.v42.v2beta1.json
@@ -97,12 +97,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": [
@@ -340,7 +335,7 @@
            "kind": "RowsLayoutRow",
            "spec": {
              "title": "",
-              "collapse": false,
+              "collapse": true,
              "hideHeader": true,
              "layout": {
                "kind": "GridLayout",
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v5.no-op.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v5.no-op.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -115,12 +110,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -164,12 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v5.no-op.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v5.no-op.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -120,12 +115,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -171,12 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v6.pulldowns_and_templating.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v6.pulldowns_and_templating.v42.v2alpha1.json
@@ -108,12 +108,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -159,12 +154,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v6.pulldowns_and_templating.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v6.pulldowns_and_templating.v42.v2beta1.json
@@ -113,12 +113,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -166,12 +161,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v8.influxdb_query.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v8.influxdb_query.v42.v2alpha1.json
@@ -119,12 +119,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -182,12 +177,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v8.influxdb_query.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v8.influxdb_query.v42.v2beta1.json
@@ -122,12 +122,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -187,12 +182,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v9.no-op.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v9.no-op.v42.v2alpha1.json
@@ -66,12 +66,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -115,12 +110,7 @@
            "kind": "stat",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -164,12 +154,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v9.no-op.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v9.no-op.v42.v2beta1.json
@@ -69,12 +69,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -120,12 +115,7 @@
            "group": "stat",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "singlestat",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -171,12 +161,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {}
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-logs.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-logs.v42.v2alpha1.json
@@ -164,65 +164,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": true,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": false,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": false,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-logs.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-logs.v42.v2beta1.json
@@ -170,65 +170,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": true,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": false,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": false,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2alpha1.json
@@ -113,78 +113,7 @@
            "kind": "timeseries",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "annotate": {
-                      "enable": false
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "editable": true,
-                    "error": false,
-                    "fill": 2,
-                    "grid": {},
-                    "legend": {
-                      "alignAsTable": true,
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "rightSide": true,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "connected",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "resolution": 100,
-                    "scale": 1,
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": true,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "msResolution": false,
-                      "query_as_alias": true,
-                      "shared": false,
-                      "sort": 0,
-                      "value_type": "cumulative"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    },
-                    "zerofill": true
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2beta1.json
@@ -117,78 +117,7 @@
            "group": "timeseries",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "annotate": {
-                      "enable": false
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "editable": true,
-                    "error": false,
-                    "fill": 2,
-                    "grid": {},
-                    "legend": {
-                      "alignAsTable": true,
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "rightSide": true,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "connected",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "resolution": 100,
-                    "scale": 1,
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": true,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "msResolution": false,
-                      "query_as_alias": true,
-                      "shared": false,
-                      "sort": 0,
-                      "value_type": "cumulative"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    },
-                    "zerofill": true
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_fakedata.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_fakedata.v42.v2alpha1.json
@@ -129,74 +129,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {
-                      "total avg": "#6ed0e0"
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [
-                      {
-                        "alias": "total avg",
-                        "fill": 0,
-                        "pointradius": 3,
-                        "points": true
-                      }
-                    ],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -246,45 +178,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [],
-                    "fontSize": "100%",
-                    "scroll": true,
-                    "showHeader": true,
-                    "sort": {
-                      "col": 0,
-                      "desc": true
-                    },
-                    "styles": [
-                      {
-                        "alias": "Time",
-                        "align": "auto",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "",
-                        "align": "auto",
-                        "colors": [
-                          "rgba(245, 54, 54, 0.9)",
-                          "rgba(237, 129, 40, 0.89)",
-                          "rgba(50, 172, 45, 0.97)"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [],
-                        "type": "number",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -333,65 +227,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -461,65 +296,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_fakedata.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_fakedata.v42.v2beta1.json
@@ -138,74 +138,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {
-                      "total avg": "#6ed0e0"
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [
-                      {
-                        "alias": "total avg",
-                        "fill": 0,
-                        "pointradius": 3,
-                        "points": true
-                      }
-                    ],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -257,45 +189,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [],
-                    "fontSize": "100%",
-                    "scroll": true,
-                    "showHeader": true,
-                    "sort": {
-                      "col": 0,
-                      "desc": true
-                    },
-                    "styles": [
-                      {
-                        "alias": "Time",
-                        "align": "auto",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "",
-                        "align": "auto",
-                        "colors": [
-                          "rgba(245, 54, 54, 0.9)",
-                          "rgba(237, 129, 40, 0.89)",
-                          "rgba(50, 172, 45, 0.97)"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [],
-                        "type": "number",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
@@ -346,65 +240,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -477,65 +312,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_unittest.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_unittest.v42.v2alpha1.json
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_unittest.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mssql/v0alpha1.mssql_unittest.v42.v2beta1.json
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_fakedata.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_fakedata.v42.v2alpha1.json
@@ -128,74 +128,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {
-                      "total avg": "#6ed0e0"
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [
-                      {
-                        "alias": "total avg",
-                        "fill": 0,
-                        "pointradius": 3,
-                        "points": true
-                      }
-                    ],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -247,65 +179,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "percent",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -376,65 +249,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -485,46 +299,7 @@
            "kind": "table",
            "spec": {
              "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [],
-                    "fontSize": "100%",
-                    "scroll": true,
-                    "showHeader": true,
-                    "sort": {
-                      "col": 0,
-                      "desc": true
-                    },
-                    "styles": [
-                      {
-                        "alias": "Time",
-                        "align": "auto",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "link": false,
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "",
-                        "align": "auto",
-                        "colors": [
-                          "rgba(245, 54, 54, 0.9)",
-                          "rgba(237, 129, 40, 0.89)",
-                          "rgba(50, 172, 45, 0.97)"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [],
-                        "type": "number",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_fakedata.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_fakedata.v42.v2beta1.json
@@ -137,74 +137,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {
-                      "total avg": "#6ed0e0"
-                    },
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [
-                      {
-                        "alias": "total avg",
-                        "fill": 0,
-                        "pointradius": 3,
-                        "points": true
-                      }
-                    ],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -258,65 +190,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "percent",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -390,65 +263,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 2,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 2,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 5,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -501,46 +315,7 @@
            "group": "table",
            "version": "",
            "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table-old",
-                  "originalOptions": {
-                    "columns": [],
-                    "fontSize": "100%",
-                    "scroll": true,
-                    "showHeader": true,
-                    "sort": {
-                      "col": 0,
-                      "desc": true
-                    },
-                    "styles": [
-                      {
-                        "alias": "Time",
-                        "align": "auto",
-                        "dateFormat": "YYYY-MM-DD HH:mm:ss",
-                        "link": false,
-                        "pattern": "Time",
-                        "type": "date"
-                      },
-                      {
-                        "alias": "",
-                        "align": "auto",
-                        "colors": [
-                          "rgba(245, 54, 54, 0.9)",
-                          "rgba(237, 129, 40, 0.89)",
-                          "rgba(50, 172, 45, 0.97)"
-                        ],
-                        "decimals": 2,
-                        "pattern": "/.*/",
-                        "thresholds": [],
-                        "type": "number",
-                        "unit": "short"
-                      }
-                    ],
-                    "transform": "table"
-                  }
-                }
-              },
+              "options": {},
              "fieldConfig": {
                "defaults": {},
                "overrides": []
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_unittest.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_unittest.v42.v2alpha1.json
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_unittest.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-mysql/v0alpha1.mysql_unittest.v42.v2beta1.json
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb.v42.v2alpha1.json
@@ -68,65 +68,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -178,65 +119,6 @@
            "spec": {
              "pluginVersion": "",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb.v42.v2beta1.json
@@ -72,65 +72,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
@@ -184,65 +125,6 @@
            "version": "",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "dataLinks": []
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb_v23.v42.v2alpha1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb_v23.v42.v2alpha1.json
@@ -84,65 +84,6 @@
            "spec": {
              "pluginVersion": "8.1.0-pre",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "alertThreshold": true
              },
              "fieldConfig": {
@@ -207,65 +148,6 @@
            "spec": {
              "pluginVersion": "8.1.0-pre",
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "alertThreshold": true
              },
              "fieldConfig": {
--- a/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb_v23.v42.v2beta1.json
+++ b/apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-opentsdb/v0alpha1.opentsdb_v23.v42.v2beta1.json
@@ -88,65 +88,6 @@
            "version": "8.1.0-pre",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "alertThreshold": true
              },
              "fieldConfig": {
@@ -213,65 +154,6 @@
            "version": "8.1.0-pre",
            "spec": {
              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "graph",
-                  "originalOptions": {
-                    "aliasColors": {},
-                    "bars": false,
-                    "dashLength": 10,
-                    "dashes": false,
-                    "fill": 1,
-                    "fillGradient": 0,
-                    "hiddenSeries": false,
-                    "legend": {
-                      "avg": false,
-                      "current": false,
-                      "max": false,
-                      "min": false,
-                      "show": true,
-                      "total": false,
-                      "values": false
-                    },
-                    "lines": true,
-                    "linewidth": 1,
-                    "nullPointMode": "null",
-                    "percentage": false,
-                    "pointradius": 2,
-                    "points": false,
-                    "renderer": "flot",
-                    "seriesOverrides": [],
-                    "spaceLength": 10,
-                    "stack": false,
-                    "steppedLine": false,
-                    "thresholds": [],
-                    "timeRegions": [],
-                    "tooltip": {
-                      "shared": true,
-                      "sort": 0,
-                      "value_type": "individual"
-                    },
-                    "xaxis": {
-                      "mode": "time",
-                      "show": true,
-                      "values": []
-                    },
-                    "yaxes": [
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      },
-                      {
-                        "format": "short",
-                        "logBase": 1,
-                        "show": true
-                      }
-                    ],
-                    "yaxis": {
-                      "align": false
-                    }
-                  }
-                },
                "alertThreshold": true
              },
              "fieldConfig": {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen Smallwood	b2d14cc42b	Gives resource server a search client so storage-api can call search	2026-01-14 19:51:49 -06:00
Peter Štibraný	584287dc61	Add support for LIST with filtering on selectable fields	2025-12-15 12:10:43 +01:00