chore: refactor types and fix broken test

chore: fix broken tests
chore: preload plugins from new api
2025-12-03 13:42:58 +01:00 · 2025-12-03 13:16:30 +01:00 · 2025-12-03 11:32:11 +01:00 · 2025-11-27 15:04:20 +00:00 · 2025-11-27 10:40:45 +00:00 · 2025-11-26 16:08:53 +00:00
219 changed files with 2613 additions and 6137 deletions
@@ -110,7 +110,7 @@ If you believe you've found a security vulnerability, please read our [security

 ### Suggest features

-If you have an idea of how to improve Grafana, submit a [feature request](https://github.com/grafana/grafana/issues/new?template=1-feature_requests.md). To learn how to write an effective feature request, refer to [Create a feature request](contribute/create-feature-request.md).
+If you have an idea of how to improve Grafana, submit a [feature request](https://github.com/grafana/grafana/issues/new?template=1-feature_requests.md).

 We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?template=2-accessibility.md) to help us understand what we can improve.

@@ -22,6 +22,8 @@ require (
 )

 require (
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/apache/arrow-go/v18 v18.4.1 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.39.1 // indirect
@@ -32,15 +34,20 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.8 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.38.5 // indirect
 	github.com/aws/smithy-go v1.23.1 // indirect
+	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
 	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	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-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/diegoholiveira/jsonlogic/v3 v3.7.4 // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/fatih/color v1.18.0 // indirect
@@ -121,11 +128,15 @@ require (
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/nikunjy/rules v1.5.0 // indirect
 	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
 	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/open-feature/go-sdk v1.16.0 // indirect
+	github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.6 // indirect
+	github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.6 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
@@ -142,6 +153,7 @@ require (
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/thomaspoignant/go-feature-flag v1.42.0 // indirect
 	github.com/tjhop/slog-gokit v0.1.5 // indirect
 	github.com/woodsbury/decimal128 v1.3.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
@@ -159,6 +171,8 @@ require (
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/mock v0.6.0 // 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
@@ -1,7 +1,11 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -9,6 +13,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
+github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/apache/arrow-go/v18 v18.4.1 h1:q/jVkBWCJOB9reDgaIZIdruLQUb1kbkvOnOFezVH1C4=
 github.com/apache/arrow-go/v18 v18.4.1/go.mod h1:tLyFubsAl17bvFdUAy24bsSvA/6ww95Iqi67fTpGu3E=
 github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
@@ -31,12 +37,18 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.38.5 h1:+LVB0xBqEgjQoqr9bGZbRzvg212B
 github.com/aws/aws-sdk-go-v2/service/sts v1.38.5/go.mod h1:xoaxeqnnUaZjPjaICgIy5B+MHCSb/ZSOn4MvkFNOUA0=
 github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
 github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
+github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0=
+github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
+github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
+github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
@@ -52,12 +64,16 @@ github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitf
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/diegoholiveira/jsonlogic/v3 v3.7.4 h1:92HSmB9bwM/o0ZvrCpcvTP2EsPXSkKtAniIr2W/dcIM=
+github.com/diegoholiveira/jsonlogic/v3 v3.7.4/go.mod h1:OYRb6FSTVmMM+MNQ7ElmMsczyNSepw+OU4Z8emDSi4w=
 github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
 github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
@@ -310,6 +326,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nikunjy/rules v1.5.0 h1:KJDSLOsFhwt7kcXUyZqwkgrQg5YoUwj+TVu6ItCQShw=
+github.com/nikunjy/rules v1.5.0/go.mod h1:TlZtZdBChrkqi8Lr2AXocme8Z7EsbxtFdDoKeI6neBQ=
 github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY=
 github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
 github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
@@ -324,6 +342,12 @@ github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU
 github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
+github.com/open-feature/go-sdk v1.16.0 h1:5NCHYv5slvNBIZhYXAzAufo0OI59OACZ5tczVqSE+Tg=
+github.com/open-feature/go-sdk v1.16.0/go.mod h1:EIF40QcoYT1VbQkMPy2ZJH4kvZeY+qGUXAorzSWgKSo=
+github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.6 h1:megzzlQGjsRVWDX8oJnLaa5eEcsAHekiL4Uvl3jSAcY=
+github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.6/go.mod h1:K1gDKvt76CGFLSUMHUydd5ba2V5Cv69gQZsdbnXhAm8=
+github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.6 h1:WinefYxeVx5rV0uQmuWbxQf8iACu/JiRubo5w0saToc=
+github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.6/go.mod h1:Dwcaoma6lZVqYwyfVlY7eB6RXbG+Ju3b9cnpTlUN+Hc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -397,6 +421,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/thejerf/slogassert v0.3.4 h1:VoTsXixRbXMrRSSxDjYTiEDCM4VWbsYPW5rB/hX24kM=
+github.com/thejerf/slogassert v0.3.4/go.mod h1:0zn9ISLVKo1aPMTqcGfG1o6dWwt+Rk574GlUxHD4rs8=
+github.com/thomaspoignant/go-feature-flag v1.42.0 h1:C7embmOTzaLyRki+OoU2RvtVjJE9IrvgBA2C1mRN1lc=
+github.com/thomaspoignant/go-feature-flag v1.42.0/go.mod h1:y0QiWH7chHWhGATb/+XqwAwErORmPSH2MUsQlCmmWlM=
 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/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -446,8 +474,12 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
 go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
 go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -1,12 +1,29 @@
 package plugins

 pluginMetaV0Alpha1: {
-	kind: "PluginMeta"
+	kind:   "PluginMeta"
 	plural: "pluginsmeta"
-	scope: "Namespaced"
+	scope:  "Namespaced"
 	schema: {
 		spec: {
-			pluginJSON: #JSONData,
+			pluginJson: #JSONData
+			module?: {
+				path:             string
+				hash?:            string
+				loadingStrategy?: "fetch" | "script"
+			}
+			baseURL?: string
+			signature?: {
+				status: "internal" | "valid" | "invalid" | "modified" | "unsigned"
+				type?:  "grafana" | "commercial" | "community" | "private" | "private-glob"
+				org?:   string
+			}
+			angular?: {
+				detected: bool
+			}
+			translations?: [string]: string
+			// +listType=atomic
+			children?: [...string]
 		}
 	}
 }
@@ -207,13 +207,20 @@ func NewPluginMetaExtensions() *PluginMetaExtensions {

 // +k8s:openapi-gen=true
 type PluginMetaSpec struct {
-	PluginJSON PluginMetaJSONData `json:"pluginJSON"`
+	PluginJson   PluginMetaJSONData               `json:"pluginJson"`
+	Module       *PluginMetaV0alpha1SpecModule    `json:"module,omitempty"`
+	BaseURL      *string                          `json:"baseURL,omitempty"`
+	Signature    *PluginMetaV0alpha1SpecSignature `json:"signature,omitempty"`
+	Angular      *PluginMetaV0alpha1SpecAngular   `json:"angular,omitempty"`
+	Translations map[string]string                `json:"translations,omitempty"`
+	// +listType=atomic
+	Children []string `json:"children,omitempty"`
 }

 // NewPluginMetaSpec creates a new PluginMetaSpec object.
 func NewPluginMetaSpec() *PluginMetaSpec {
 	return &PluginMetaSpec{
-		PluginJSON: *NewPluginMetaJSONData(),
+		PluginJson: *NewPluginMetaJSONData(),
 	}
 }

@@ -411,6 +418,40 @@ func NewPluginMetaV0alpha1ExtensionsExtensionPoints() *PluginMetaV0alpha1Extensi
 	return &PluginMetaV0alpha1ExtensionsExtensionPoints{}
 }

+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecModule struct {
+	Path            string                                       `json:"path"`
+	Hash            *string                                      `json:"hash,omitempty"`
+	LoadingStrategy *PluginMetaV0alpha1SpecModuleLoadingStrategy `json:"loadingStrategy,omitempty"`
+}
+
+// NewPluginMetaV0alpha1SpecModule creates a new PluginMetaV0alpha1SpecModule object.
+func NewPluginMetaV0alpha1SpecModule() *PluginMetaV0alpha1SpecModule {
+	return &PluginMetaV0alpha1SpecModule{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecSignature struct {
+	Status PluginMetaV0alpha1SpecSignatureStatus `json:"status"`
+	Type   *PluginMetaV0alpha1SpecSignatureType  `json:"type,omitempty"`
+	Org    *string                               `json:"org,omitempty"`
+}
+
+// NewPluginMetaV0alpha1SpecSignature creates a new PluginMetaV0alpha1SpecSignature object.
+func NewPluginMetaV0alpha1SpecSignature() *PluginMetaV0alpha1SpecSignature {
+	return &PluginMetaV0alpha1SpecSignature{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecAngular struct {
+	Detected bool `json:"detected"`
+}
+
+// NewPluginMetaV0alpha1SpecAngular creates a new PluginMetaV0alpha1SpecAngular object.
+func NewPluginMetaV0alpha1SpecAngular() *PluginMetaV0alpha1SpecAngular {
+	return &PluginMetaV0alpha1SpecAngular{}
+}
+
 // +k8s:openapi-gen=true
 type PluginMetaJSONDataType string

@@ -471,3 +512,33 @@ const (
 	PluginMetaV0alpha1DependenciesPluginsTypeDatasource PluginMetaV0alpha1DependenciesPluginsType = "datasource"
 	PluginMetaV0alpha1DependenciesPluginsTypePanel      PluginMetaV0alpha1DependenciesPluginsType = "panel"
 )
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecModuleLoadingStrategy string
+
+const (
+	PluginMetaV0alpha1SpecModuleLoadingStrategyFetch  PluginMetaV0alpha1SpecModuleLoadingStrategy = "fetch"
+	PluginMetaV0alpha1SpecModuleLoadingStrategyScript PluginMetaV0alpha1SpecModuleLoadingStrategy = "script"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecSignatureStatus string
+
+const (
+	PluginMetaV0alpha1SpecSignatureStatusInternal PluginMetaV0alpha1SpecSignatureStatus = "internal"
+	PluginMetaV0alpha1SpecSignatureStatusValid    PluginMetaV0alpha1SpecSignatureStatus = "valid"
+	PluginMetaV0alpha1SpecSignatureStatusInvalid  PluginMetaV0alpha1SpecSignatureStatus = "invalid"
+	PluginMetaV0alpha1SpecSignatureStatusModified PluginMetaV0alpha1SpecSignatureStatus = "modified"
+	PluginMetaV0alpha1SpecSignatureStatusUnsigned PluginMetaV0alpha1SpecSignatureStatus = "unsigned"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1SpecSignatureType string
+
+const (
+	PluginMetaV0alpha1SpecSignatureTypeGrafana     PluginMetaV0alpha1SpecSignatureType = "grafana"
+	PluginMetaV0alpha1SpecSignatureTypeCommercial  PluginMetaV0alpha1SpecSignatureType = "commercial"
+	PluginMetaV0alpha1SpecSignatureTypeCommunity   PluginMetaV0alpha1SpecSignatureType = "community"
+	PluginMetaV0alpha1SpecSignatureTypePrivate     PluginMetaV0alpha1SpecSignatureType = "private"
+	PluginMetaV0alpha1SpecSignatureTypePrivateGlob PluginMetaV0alpha1SpecSignatureType = "private-glob"
+)
@@ -87,8 +87,47 @@ func (p *CloudProvider) GetMeta(ctx context.Context, pluginID, version string) (
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}

+	spec := pluginsv0alpha1.PluginMetaSpec{
+		PluginJson: gcomMeta.JSON,
+	}
+
+	if gcomMeta.VersionSignatureType != "" {
+		signature := &pluginsv0alpha1.PluginMetaV0alpha1SpecSignature{
+			Status: pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusValid,
+		}
+
+		switch gcomMeta.VersionSignatureType {
+		case "grafana":
+			sigType := pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeGrafana
+			signature.Type = &sigType
+		case "commercial":
+			sigType := pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeCommercial
+			signature.Type = &sigType
+		case "community":
+			sigType := pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeCommunity
+			signature.Type = &sigType
+		case "private":
+			sigType := pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypePrivate
+			signature.Type = &sigType
+		case "private-glob":
+			sigType := pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypePrivateGlob
+			signature.Type = &sigType
+		}
+
+		if gcomMeta.VersionSignedByOrg != "" {
+			signature.Org = &gcomMeta.VersionSignedByOrg
+		}
+
+		spec.Signature = signature
+	}
+
+	// Set angular info
+	spec.Angular = &pluginsv0alpha1.PluginMetaV0alpha1SpecAngular{
+		Detected: gcomMeta.AngularDetected,
+	}
+
 	return &Result{
-		Meta: gcomMeta.JSON,
+		Meta: spec,
 		TTL:  p.ttl,
 	}, nil
 }
@@ -96,25 +135,25 @@ func (p *CloudProvider) GetMeta(ctx context.Context, pluginID, version string) (
 // grafanaComPluginVersionMeta represents the response from grafana.com API
 // GET /api/plugins/{pluginId}/versions/{version}
 type grafanaComPluginVersionMeta struct {
-	PluginID        string                             `json:"pluginSlug"`
-	Version         string                             `json:"version"`
-	URL             string                             `json:"url"`
-	Commit          string                             `json:"commit"`
-	Description     string                             `json:"description"`
-	Keywords        []string                           `json:"keywords"`
-	CreatedAt       time.Time                          `json:"createdAt"`
-	UpdatedAt       time.Time                          `json:"updatedAt"`
-	JSON            pluginsv0alpha1.PluginMetaJSONData `json:"json"`
-	Readme          string                             `json:"readme"`
-	Downloads       int                                `json:"downloads"`
-	Verified        bool                               `json:"verified"`
-	Status          string                             `json:"status"`
-	StatusContext   string                             `json:"statusContext"`
-	DownloadSlug    string                             `json:"downloadSlug"`
-	SignatureType   string                             `json:"signatureType"`
-	SignedByOrg     string                             `json:"signedByOrg"`
-	SignedByOrgName string                             `json:"signedByOrgName"`
-	Packages        struct {
+	PluginID               string                             `json:"pluginSlug"`
+	Version                string                             `json:"version"`
+	URL                    string                             `json:"url"`
+	Commit                 string                             `json:"commit"`
+	Description            string                             `json:"description"`
+	Keywords               []string                           `json:"keywords"`
+	CreatedAt              time.Time                          `json:"createdAt"`
+	UpdatedAt              time.Time                          `json:"updatedAt"`
+	JSON                   pluginsv0alpha1.PluginMetaJSONData `json:"json"`
+	Readme                 string                             `json:"readme"`
+	Downloads              int                                `json:"downloads"`
+	Verified               bool                               `json:"verified"`
+	Status                 string                             `json:"status"`
+	StatusContext          string                             `json:"statusContext"`
+	DownloadSlug           string                             `json:"downloadSlug"`
+	VersionSignatureType   string                             `json:"versionSignatureType"`
+	VersionSignedByOrg     string                             `json:"versionSignedByOrg"`
+	VersionSignedByOrgName string                             `json:"versionSignedByOrgName"`
+	Packages               struct {
 		Any struct {
 			Md5         string `json:"md5"`
 			Sha256      string `json:"sha256"`
@@ -49,7 +49,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {

 		require.NoError(t, err)
 		require.NotNil(t, result)
-		assert.Equal(t, expectedMeta, result.Meta)
+		assert.Equal(t, expectedMeta, result.Meta.PluginJson)
 		assert.Equal(t, defaultCloudTTL, result.TTL)
 	})

@@ -0,0 +1,585 @@
+package meta
+
+import (
+	"encoding/json"
+
+	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+)
+
+// jsonDataToPluginMetaJSONData converts a plugins.JSONData to a pluginsv0alpha1.PluginMetaJSONData.
+// nolint:gocyclo
+func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.PluginMetaJSONData {
+	meta := pluginsv0alpha1.PluginMetaJSONData{
+		Id:   jsonData.ID,
+		Name: jsonData.Name,
+	}
+
+	// Map plugin type
+	switch jsonData.Type {
+	case plugins.TypeApp:
+		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeApp
+	case plugins.TypeDataSource:
+		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeDatasource
+	case plugins.TypePanel:
+		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypePanel
+	case plugins.TypeRenderer:
+		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeRenderer
+	}
+
+	// Map Info
+	meta.Info = pluginsv0alpha1.PluginMetaInfo{
+		Keywords: jsonData.Info.Keywords,
+		Logos: pluginsv0alpha1.PluginMetaV0alpha1InfoLogos{
+			Small: jsonData.Info.Logos.Small,
+			Large: jsonData.Info.Logos.Large,
+		},
+		Updated: jsonData.Info.Updated,
+		Version: jsonData.Info.Version,
+	}
+
+	if jsonData.Info.Description != "" {
+		meta.Info.Description = &jsonData.Info.Description
+	}
+
+	if jsonData.Info.Author.Name != "" || jsonData.Info.Author.URL != "" {
+		author := &pluginsv0alpha1.PluginMetaV0alpha1InfoAuthor{}
+		if jsonData.Info.Author.Name != "" {
+			author.Name = &jsonData.Info.Author.Name
+		}
+		if jsonData.Info.Author.URL != "" {
+			author.Url = &jsonData.Info.Author.URL
+		}
+		meta.Info.Author = author
+	}
+
+	if len(jsonData.Info.Links) > 0 {
+		meta.Info.Links = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoLinks, 0, len(jsonData.Info.Links))
+		for _, link := range jsonData.Info.Links {
+			v0Link := pluginsv0alpha1.PluginMetaV0alpha1InfoLinks{}
+			if link.Name != "" {
+				v0Link.Name = &link.Name
+			}
+			if link.URL != "" {
+				v0Link.Url = &link.URL
+			}
+			meta.Info.Links = append(meta.Info.Links, v0Link)
+		}
+	}
+
+	if len(jsonData.Info.Screenshots) > 0 {
+		meta.Info.Screenshots = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots, 0, len(jsonData.Info.Screenshots))
+		for _, screenshot := range jsonData.Info.Screenshots {
+			v0Screenshot := pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots{}
+			if screenshot.Name != "" {
+				v0Screenshot.Name = &screenshot.Name
+			}
+			if screenshot.Path != "" {
+				v0Screenshot.Path = &screenshot.Path
+			}
+			meta.Info.Screenshots = append(meta.Info.Screenshots, v0Screenshot)
+		}
+	}
+
+	// Map Dependencies
+	meta.Dependencies = pluginsv0alpha1.PluginMetaDependencies{
+		GrafanaDependency: jsonData.Dependencies.GrafanaDependency,
+	}
+
+	if jsonData.Dependencies.GrafanaVersion != "" {
+		meta.Dependencies.GrafanaVersion = &jsonData.Dependencies.GrafanaVersion
+	}
+
+	if len(jsonData.Dependencies.Plugins) > 0 {
+		meta.Dependencies.Plugins = make([]pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins, 0, len(jsonData.Dependencies.Plugins))
+		for _, dep := range jsonData.Dependencies.Plugins {
+			var depType pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsType
+			switch dep.Type {
+			case "app":
+				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeApp
+			case "datasource":
+				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeDatasource
+			case "panel":
+				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypePanel
+			}
+			meta.Dependencies.Plugins = append(meta.Dependencies.Plugins, pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins{
+				Id:   dep.ID,
+				Type: depType,
+				Name: dep.Name,
+			})
+		}
+	}
+
+	if len(jsonData.Dependencies.Extensions.ExposedComponents) > 0 {
+		meta.Dependencies.Extensions = &pluginsv0alpha1.PluginMetaV0alpha1DependenciesExtensions{
+			ExposedComponents: jsonData.Dependencies.Extensions.ExposedComponents,
+		}
+	}
+
+	// Map optional boolean fields
+	if jsonData.Alerting {
+		meta.Alerting = &jsonData.Alerting
+	}
+	if jsonData.Annotations {
+		meta.Annotations = &jsonData.Annotations
+	}
+	if jsonData.AutoEnabled {
+		meta.AutoEnabled = &jsonData.AutoEnabled
+	}
+	if jsonData.Backend {
+		meta.Backend = &jsonData.Backend
+	}
+	if jsonData.BuiltIn {
+		meta.BuiltIn = &jsonData.BuiltIn
+	}
+	if jsonData.HideFromList {
+		meta.HideFromList = &jsonData.HideFromList
+	}
+	if jsonData.Logs {
+		meta.Logs = &jsonData.Logs
+	}
+	if jsonData.Metrics {
+		meta.Metrics = &jsonData.Metrics
+	}
+	if jsonData.MultiValueFilterOperators {
+		meta.MultiValueFilterOperators = &jsonData.MultiValueFilterOperators
+	}
+	if jsonData.Preload {
+		meta.Preload = &jsonData.Preload
+	}
+	if jsonData.SkipDataQuery {
+		meta.SkipDataQuery = &jsonData.SkipDataQuery
+	}
+	if jsonData.Streaming {
+		meta.Streaming = &jsonData.Streaming
+	}
+	if jsonData.Tracing {
+		meta.Tracing = &jsonData.Tracing
+	}
+
+	// Map category
+	if jsonData.Category != "" {
+		var category pluginsv0alpha1.PluginMetaJSONDataCategory
+		switch jsonData.Category {
+		case "tsdb":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTsdb
+		case "logging":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryLogging
+		case "cloud":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryCloud
+		case "tracing":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTracing
+		case "profiling":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryProfiling
+		case "sql":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategorySql
+		case "enterprise":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryEnterprise
+		case "iot":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryIot
+		case "other":
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
+		default:
+			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
+		}
+		meta.Category = &category
+	}
+
+	// Map state
+	if jsonData.State != "" {
+		var state pluginsv0alpha1.PluginMetaJSONDataState
+		switch jsonData.State {
+		case plugins.ReleaseStateAlpha:
+			state = pluginsv0alpha1.PluginMetaJSONDataStateAlpha
+		case plugins.ReleaseStateBeta:
+			state = pluginsv0alpha1.PluginMetaJSONDataStateBeta
+		default:
+		}
+		if state != "" {
+			meta.State = &state
+		}
+	}
+
+	// Map executable
+	if jsonData.Executable != "" {
+		meta.Executable = &jsonData.Executable
+	}
+
+	// Map QueryOptions
+	if len(jsonData.QueryOptions) > 0 {
+		queryOptions := &pluginsv0alpha1.PluginMetaQueryOptions{}
+		if val, ok := jsonData.QueryOptions["maxDataPoints"]; ok {
+			queryOptions.MaxDataPoints = &val
+		}
+		if val, ok := jsonData.QueryOptions["minInterval"]; ok {
+			queryOptions.MinInterval = &val
+		}
+		if val, ok := jsonData.QueryOptions["cacheTimeout"]; ok {
+			queryOptions.CacheTimeout = &val
+		}
+		meta.QueryOptions = queryOptions
+	}
+
+	// Map Includes
+	if len(jsonData.Includes) > 0 {
+		meta.Includes = make([]pluginsv0alpha1.PluginMetaInclude, 0, len(jsonData.Includes))
+		for _, include := range jsonData.Includes {
+			v0Include := pluginsv0alpha1.PluginMetaInclude{}
+			if include.UID != "" {
+				v0Include.Uid = &include.UID
+			}
+			if include.Type != "" {
+				var includeType pluginsv0alpha1.PluginMetaIncludeType
+				switch include.Type {
+				case "dashboard":
+					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDashboard
+				case "page":
+					includeType = pluginsv0alpha1.PluginMetaIncludeTypePage
+				case "panel":
+					includeType = pluginsv0alpha1.PluginMetaIncludeTypePanel
+				case "datasource":
+					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDatasource
+				}
+				v0Include.Type = &includeType
+			}
+			if include.Name != "" {
+				v0Include.Name = &include.Name
+			}
+			if include.Component != "" {
+				v0Include.Component = &include.Component
+			}
+			if include.Role != "" {
+				var role pluginsv0alpha1.PluginMetaIncludeRole
+				switch include.Role {
+				case "Admin":
+					role = pluginsv0alpha1.PluginMetaIncludeRoleAdmin
+				case "Editor":
+					role = pluginsv0alpha1.PluginMetaIncludeRoleEditor
+				case "Viewer":
+					role = pluginsv0alpha1.PluginMetaIncludeRoleViewer
+				}
+				v0Include.Role = &role
+			}
+			if include.Action != "" {
+				v0Include.Action = &include.Action
+			}
+			if include.Path != "" {
+				v0Include.Path = &include.Path
+			}
+			if include.AddToNav {
+				v0Include.AddToNav = &include.AddToNav
+			}
+			if include.DefaultNav {
+				v0Include.DefaultNav = &include.DefaultNav
+			}
+			if include.Icon != "" {
+				v0Include.Icon = &include.Icon
+			}
+			meta.Includes = append(meta.Includes, v0Include)
+		}
+	}
+
+	// Map Routes
+	if len(jsonData.Routes) > 0 {
+		meta.Routes = make([]pluginsv0alpha1.PluginMetaRoute, 0, len(jsonData.Routes))
+		for _, route := range jsonData.Routes {
+			v0Route := pluginsv0alpha1.PluginMetaRoute{}
+			if route.Path != "" {
+				v0Route.Path = &route.Path
+			}
+			if route.Method != "" {
+				v0Route.Method = &route.Method
+			}
+			if route.URL != "" {
+				v0Route.Url = &route.URL
+			}
+			if route.ReqRole != "" {
+				reqRole := string(route.ReqRole)
+				v0Route.ReqRole = &reqRole
+			}
+			if route.ReqAction != "" {
+				v0Route.ReqAction = &route.ReqAction
+			}
+			if len(route.Headers) > 0 {
+				headers := make([]string, 0, len(route.Headers))
+				for _, header := range route.Headers {
+					headers = append(headers, header.Name+": "+header.Content)
+				}
+				v0Route.Headers = headers
+			}
+			if len(route.URLParams) > 0 {
+				v0Route.UrlParams = make([]pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams, 0, len(route.URLParams))
+				for _, param := range route.URLParams {
+					v0Param := pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams{}
+					if param.Name != "" {
+						v0Param.Name = &param.Name
+					}
+					if param.Content != "" {
+						v0Param.Content = &param.Content
+					}
+					v0Route.UrlParams = append(v0Route.UrlParams, v0Param)
+				}
+			}
+			if route.TokenAuth != nil {
+				v0Route.TokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteTokenAuth{}
+				if route.TokenAuth.Url != "" {
+					v0Route.TokenAuth.Url = &route.TokenAuth.Url
+				}
+				if len(route.TokenAuth.Scopes) > 0 {
+					v0Route.TokenAuth.Scopes = route.TokenAuth.Scopes
+				}
+				if len(route.TokenAuth.Params) > 0 {
+					v0Route.TokenAuth.Params = make(map[string]interface{})
+					for k, v := range route.TokenAuth.Params {
+						v0Route.TokenAuth.Params[k] = v
+					}
+				}
+			}
+			if route.JwtTokenAuth != nil {
+				v0Route.JwtTokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteJwtTokenAuth{}
+				if route.JwtTokenAuth.Url != "" {
+					v0Route.JwtTokenAuth.Url = &route.JwtTokenAuth.Url
+				}
+				if len(route.JwtTokenAuth.Scopes) > 0 {
+					v0Route.JwtTokenAuth.Scopes = route.JwtTokenAuth.Scopes
+				}
+				if len(route.JwtTokenAuth.Params) > 0 {
+					v0Route.JwtTokenAuth.Params = make(map[string]interface{})
+					for k, v := range route.JwtTokenAuth.Params {
+						v0Route.JwtTokenAuth.Params[k] = v
+					}
+				}
+			}
+			if len(route.Body) > 0 {
+				var bodyMap map[string]interface{}
+				if err := json.Unmarshal(route.Body, &bodyMap); err == nil {
+					v0Route.Body = bodyMap
+				}
+			}
+			meta.Routes = append(meta.Routes, v0Route)
+		}
+	}
+
+	// Map Extensions
+	if len(jsonData.Extensions.AddedLinks) > 0 || len(jsonData.Extensions.AddedComponents) > 0 ||
+		len(jsonData.Extensions.ExposedComponents) > 0 || len(jsonData.Extensions.ExtensionPoints) > 0 {
+		extensions := &pluginsv0alpha1.PluginMetaExtensions{}
+
+		if len(jsonData.Extensions.AddedLinks) > 0 {
+			extensions.AddedLinks = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks, 0, len(jsonData.Extensions.AddedLinks))
+			for _, link := range jsonData.Extensions.AddedLinks {
+				v0Link := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks{
+					Targets: link.Targets,
+					Title:   link.Title,
+				}
+				if link.Description != "" {
+					v0Link.Description = &link.Description
+				}
+				extensions.AddedLinks = append(extensions.AddedLinks, v0Link)
+			}
+		}
+
+		if len(jsonData.Extensions.AddedComponents) > 0 {
+			extensions.AddedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents, 0, len(jsonData.Extensions.AddedComponents))
+			for _, comp := range jsonData.Extensions.AddedComponents {
+				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents{
+					Targets: comp.Targets,
+					Title:   comp.Title,
+				}
+				if comp.Description != "" {
+					v0Comp.Description = &comp.Description
+				}
+				extensions.AddedComponents = append(extensions.AddedComponents, v0Comp)
+			}
+		}
+
+		if len(jsonData.Extensions.ExposedComponents) > 0 {
+			extensions.ExposedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
+			for _, comp := range jsonData.Extensions.ExposedComponents {
+				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents{
+					Id: comp.Id,
+				}
+				if comp.Title != "" {
+					v0Comp.Title = &comp.Title
+				}
+				if comp.Description != "" {
+					v0Comp.Description = &comp.Description
+				}
+				extensions.ExposedComponents = append(extensions.ExposedComponents, v0Comp)
+			}
+		}
+
+		if len(jsonData.Extensions.ExtensionPoints) > 0 {
+			extensions.ExtensionPoints = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints, 0, len(jsonData.Extensions.ExtensionPoints))
+			for _, point := range jsonData.Extensions.ExtensionPoints {
+				v0Point := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints{
+					Id: point.Id,
+				}
+				if point.Title != "" {
+					v0Point.Title = &point.Title
+				}
+				if point.Description != "" {
+					v0Point.Description = &point.Description
+				}
+				extensions.ExtensionPoints = append(extensions.ExtensionPoints, v0Point)
+			}
+		}
+
+		meta.Extensions = extensions
+	}
+
+	// Map Roles
+	if len(jsonData.Roles) > 0 {
+		meta.Roles = make([]pluginsv0alpha1.PluginMetaRole, 0, len(jsonData.Roles))
+		for _, role := range jsonData.Roles {
+			v0Role := pluginsv0alpha1.PluginMetaRole{
+				Grants: role.Grants,
+			}
+			if role.Role.Name != "" || role.Role.Description != "" || len(role.Role.Permissions) > 0 {
+				v0RoleRole := &pluginsv0alpha1.PluginMetaV0alpha1RoleRole{}
+				if role.Role.Name != "" {
+					v0RoleRole.Name = &role.Role.Name
+				}
+				if role.Role.Description != "" {
+					v0RoleRole.Description = &role.Role.Description
+				}
+				if len(role.Role.Permissions) > 0 {
+					v0RoleRole.Permissions = make([]pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions, 0, len(role.Role.Permissions))
+					for _, perm := range role.Role.Permissions {
+						v0Perm := pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions{}
+						if perm.Action != "" {
+							v0Perm.Action = &perm.Action
+						}
+						if perm.Scope != "" {
+							v0Perm.Scope = &perm.Scope
+						}
+						v0RoleRole.Permissions = append(v0RoleRole.Permissions, v0Perm)
+					}
+				}
+				v0Role.Role = v0RoleRole
+			}
+			meta.Roles = append(meta.Roles, v0Role)
+		}
+	}
+
+	// Map IAM
+	if jsonData.IAM != nil && len(jsonData.IAM.Permissions) > 0 {
+		iam := &pluginsv0alpha1.PluginMetaIAM{
+			Permissions: make([]pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions, 0, len(jsonData.IAM.Permissions)),
+		}
+		for _, perm := range jsonData.IAM.Permissions {
+			v0Perm := pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions{}
+			if perm.Action != "" {
+				v0Perm.Action = &perm.Action
+			}
+			if perm.Scope != "" {
+				v0Perm.Scope = &perm.Scope
+			}
+			iam.Permissions = append(iam.Permissions, v0Perm)
+		}
+		meta.Iam = iam
+	}
+
+	return meta
+}
+
+// pluginStorePluginToPluginMetaSpec converts a pluginstore.Plugin to a pluginsv0alpha1.PluginMetaSpec.
+// This is similar to pluginToPluginMetaSpec but works with the plugin store DTO.
+// loadingStrategy and moduleHash are optional calculated values that can be provided.
+func pluginStorePluginToPluginMetaSpec(plugin pluginstore.Plugin, loadingStrategy plugins.LoadingStrategy, moduleHash string) pluginsv0alpha1.PluginMetaSpec {
+	spec := pluginsv0alpha1.PluginMetaSpec{
+		PluginJson: jsonDataToPluginMetaJSONData(plugin.JSONData),
+	}
+
+	if plugin.Module != "" {
+		module := &pluginsv0alpha1.PluginMetaV0alpha1SpecModule{
+			Path: plugin.Module,
+		}
+		if moduleHash != "" {
+			module.Hash = &moduleHash
+		}
+		if loadingStrategy != "" {
+			var ls pluginsv0alpha1.PluginMetaV0alpha1SpecModuleLoadingStrategy
+			switch loadingStrategy {
+			case plugins.LoadingStrategyFetch:
+				ls = pluginsv0alpha1.PluginMetaV0alpha1SpecModuleLoadingStrategyFetch
+			case plugins.LoadingStrategyScript:
+				ls = pluginsv0alpha1.PluginMetaV0alpha1SpecModuleLoadingStrategyScript
+			}
+			module.LoadingStrategy = &ls
+		}
+		spec.Module = module
+	}
+
+	if plugin.BaseURL != "" {
+		spec.BaseURL = &plugin.BaseURL
+	}
+
+	if plugin.Signature != "" {
+		signature := &pluginsv0alpha1.PluginMetaV0alpha1SpecSignature{
+			Status: convertSignatureStatus(plugin.Signature),
+		}
+
+		if plugin.SignatureType != "" {
+			sigType := convertSignatureType(plugin.SignatureType)
+			signature.Type = &sigType
+		}
+
+		if plugin.SignatureOrg != "" {
+			signature.Org = &plugin.SignatureOrg
+		}
+
+		spec.Signature = signature
+	}
+
+	if len(plugin.Children) > 0 {
+		spec.Children = plugin.Children
+	}
+
+	spec.Angular = &pluginsv0alpha1.PluginMetaV0alpha1SpecAngular{
+		Detected: plugin.Angular.Detected,
+	}
+
+	if len(plugin.Translations) > 0 {
+		spec.Translations = plugin.Translations
+	}
+
+	return spec
+}
+
+// convertSignatureStatus converts plugins.SignatureStatus to pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatus.
+func convertSignatureStatus(status plugins.SignatureStatus) pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatus {
+	switch status {
+	case plugins.SignatureStatusInternal:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusInternal
+	case plugins.SignatureStatusValid:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusValid
+	case plugins.SignatureStatusInvalid:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusInvalid
+	case plugins.SignatureStatusModified:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusModified
+	case plugins.SignatureStatusUnsigned:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusUnsigned
+	default:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureStatusUnsigned
+	}
+}
+
+// convertSignatureType converts plugins.SignatureType to pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureType.
+func convertSignatureType(sigType plugins.SignatureType) pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureType {
+	switch sigType {
+	case plugins.SignatureTypeGrafana:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeGrafana
+	case plugins.SignatureTypeCommercial:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeCommercial
+	case plugins.SignatureTypeCommunity:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeCommunity
+	case plugins.SignatureTypePrivate:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypePrivate
+	case plugins.SignatureTypePrivateGlob:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypePrivateGlob
+	default:
+		return pluginsv0alpha1.PluginMetaV0alpha1SpecSignatureTypeGrafana
+	}
+}
@@ -2,7 +2,6 @@ package meta

 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"os"
 	"path/filepath"
@@ -23,7 +22,7 @@ const (
 // CoreProvider retrieves plugin metadata for core plugins.
 type CoreProvider struct {
 	mu            sync.RWMutex
-	loadedPlugins map[string]pluginsv0alpha1.PluginMetaJSONData
+	loadedPlugins map[string]pluginsv0alpha1.PluginMetaSpec
 	initialized   bool
 	ttl           time.Duration
 }
@@ -36,7 +35,7 @@ func NewCoreProvider() *CoreProvider {
 // NewCoreProviderWithTTL creates a new CoreProvider with a custom TTL.
 func NewCoreProviderWithTTL(ttl time.Duration) *CoreProvider {
 	return &CoreProvider{
-		loadedPlugins: make(map[string]pluginsv0alpha1.PluginMetaJSONData),
+		loadedPlugins: make(map[string]pluginsv0alpha1.PluginMetaSpec),
 		ttl:           ttl,
 	}
 }
@@ -76,9 +75,9 @@ func (p *CoreProvider) GetMeta(ctx context.Context, pluginID, _ string) (*Result
 		p.initialized = true
 	}

-	if meta, found := p.loadedPlugins[pluginID]; found {
+	if spec, found := p.loadedPlugins[pluginID]; found {
 		return &Result{
-			Meta: meta,
+			Meta: spec,
 			TTL:  p.ttl,
 		}, nil
 	}
@@ -119,485 +118,11 @@ func (p *CoreProvider) loadPlugins(ctx context.Context) error {
 	}

 	for _, bundle := range ps {
-		meta := jsonDataToPluginMetaJSONData(bundle.Primary.JSONData)
-		p.loadedPlugins[bundle.Primary.JSONData.ID] = meta
+		spec := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: jsonDataToPluginMetaJSONData(bundle.Primary.JSONData),
+		}
+		p.loadedPlugins[bundle.Primary.JSONData.ID] = spec
 	}

 	return nil
 }
-
-// jsonDataToPluginMetaJSONData converts a plugins.JSONData to a pluginsv0alpha1.PluginMetaJSONData.
-// nolint:gocyclo
-func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.PluginMetaJSONData {
-	meta := pluginsv0alpha1.PluginMetaJSONData{
-		Id:   jsonData.ID,
-		Name: jsonData.Name,
-	}
-
-	// Map plugin type
-	switch jsonData.Type {
-	case plugins.TypeApp:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeApp
-	case plugins.TypeDataSource:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeDatasource
-	case plugins.TypePanel:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypePanel
-	case plugins.TypeRenderer:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeRenderer
-	}
-
-	// Map Info
-	meta.Info = pluginsv0alpha1.PluginMetaInfo{
-		Keywords: jsonData.Info.Keywords,
-		Logos: pluginsv0alpha1.PluginMetaV0alpha1InfoLogos{
-			Small: jsonData.Info.Logos.Small,
-			Large: jsonData.Info.Logos.Large,
-		},
-		Updated: jsonData.Info.Updated,
-		Version: jsonData.Info.Version,
-	}
-
-	if jsonData.Info.Description != "" {
-		meta.Info.Description = &jsonData.Info.Description
-	}
-
-	if jsonData.Info.Author.Name != "" || jsonData.Info.Author.URL != "" {
-		author := &pluginsv0alpha1.PluginMetaV0alpha1InfoAuthor{}
-		if jsonData.Info.Author.Name != "" {
-			author.Name = &jsonData.Info.Author.Name
-		}
-		if jsonData.Info.Author.URL != "" {
-			author.Url = &jsonData.Info.Author.URL
-		}
-		meta.Info.Author = author
-	}
-
-	if len(jsonData.Info.Links) > 0 {
-		meta.Info.Links = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoLinks, 0, len(jsonData.Info.Links))
-		for _, link := range jsonData.Info.Links {
-			v0Link := pluginsv0alpha1.PluginMetaV0alpha1InfoLinks{}
-			if link.Name != "" {
-				v0Link.Name = &link.Name
-			}
-			if link.URL != "" {
-				v0Link.Url = &link.URL
-			}
-			meta.Info.Links = append(meta.Info.Links, v0Link)
-		}
-	}
-
-	if len(jsonData.Info.Screenshots) > 0 {
-		meta.Info.Screenshots = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots, 0, len(jsonData.Info.Screenshots))
-		for _, screenshot := range jsonData.Info.Screenshots {
-			v0Screenshot := pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots{}
-			if screenshot.Name != "" {
-				v0Screenshot.Name = &screenshot.Name
-			}
-			if screenshot.Path != "" {
-				v0Screenshot.Path = &screenshot.Path
-			}
-			meta.Info.Screenshots = append(meta.Info.Screenshots, v0Screenshot)
-		}
-	}
-
-	// Map Dependencies
-	meta.Dependencies = pluginsv0alpha1.PluginMetaDependencies{
-		GrafanaDependency: jsonData.Dependencies.GrafanaDependency,
-	}
-
-	if jsonData.Dependencies.GrafanaVersion != "" {
-		meta.Dependencies.GrafanaVersion = &jsonData.Dependencies.GrafanaVersion
-	}
-
-	if len(jsonData.Dependencies.Plugins) > 0 {
-		meta.Dependencies.Plugins = make([]pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins, 0, len(jsonData.Dependencies.Plugins))
-		for _, dep := range jsonData.Dependencies.Plugins {
-			var depType pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsType
-			switch dep.Type {
-			case "app":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeApp
-			case "datasource":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeDatasource
-			case "panel":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypePanel
-			}
-			meta.Dependencies.Plugins = append(meta.Dependencies.Plugins, pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins{
-				Id:   dep.ID,
-				Type: depType,
-				Name: dep.Name,
-			})
-		}
-	}
-
-	if len(jsonData.Dependencies.Extensions.ExposedComponents) > 0 {
-		meta.Dependencies.Extensions = &pluginsv0alpha1.PluginMetaV0alpha1DependenciesExtensions{
-			ExposedComponents: jsonData.Dependencies.Extensions.ExposedComponents,
-		}
-	}
-
-	// Map optional boolean fields
-	if jsonData.Alerting {
-		meta.Alerting = &jsonData.Alerting
-	}
-	if jsonData.Annotations {
-		meta.Annotations = &jsonData.Annotations
-	}
-	if jsonData.AutoEnabled {
-		meta.AutoEnabled = &jsonData.AutoEnabled
-	}
-	if jsonData.Backend {
-		meta.Backend = &jsonData.Backend
-	}
-	if jsonData.BuiltIn {
-		meta.BuiltIn = &jsonData.BuiltIn
-	}
-	if jsonData.HideFromList {
-		meta.HideFromList = &jsonData.HideFromList
-	}
-	if jsonData.Logs {
-		meta.Logs = &jsonData.Logs
-	}
-	if jsonData.Metrics {
-		meta.Metrics = &jsonData.Metrics
-	}
-	if jsonData.MultiValueFilterOperators {
-		meta.MultiValueFilterOperators = &jsonData.MultiValueFilterOperators
-	}
-	if jsonData.Preload {
-		meta.Preload = &jsonData.Preload
-	}
-	if jsonData.SkipDataQuery {
-		meta.SkipDataQuery = &jsonData.SkipDataQuery
-	}
-	if jsonData.Streaming {
-		meta.Streaming = &jsonData.Streaming
-	}
-	if jsonData.Tracing {
-		meta.Tracing = &jsonData.Tracing
-	}
-
-	// Map category
-	if jsonData.Category != "" {
-		var category pluginsv0alpha1.PluginMetaJSONDataCategory
-		switch jsonData.Category {
-		case "tsdb":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTsdb
-		case "logging":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryLogging
-		case "cloud":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryCloud
-		case "tracing":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTracing
-		case "profiling":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryProfiling
-		case "sql":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategorySql
-		case "enterprise":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryEnterprise
-		case "iot":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryIot
-		case "other":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
-		default:
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
-		}
-		meta.Category = &category
-	}
-
-	// Map state
-	if jsonData.State != "" {
-		var state pluginsv0alpha1.PluginMetaJSONDataState
-		switch jsonData.State {
-		case plugins.ReleaseStateAlpha:
-			state = pluginsv0alpha1.PluginMetaJSONDataStateAlpha
-		case plugins.ReleaseStateBeta:
-			state = pluginsv0alpha1.PluginMetaJSONDataStateBeta
-		default:
-		}
-		if state != "" {
-			meta.State = &state
-		}
-	}
-
-	// Map executable
-	if jsonData.Executable != "" {
-		meta.Executable = &jsonData.Executable
-	}
-
-	// Map QueryOptions
-	if len(jsonData.QueryOptions) > 0 {
-		queryOptions := &pluginsv0alpha1.PluginMetaQueryOptions{}
-		if val, ok := jsonData.QueryOptions["maxDataPoints"]; ok {
-			queryOptions.MaxDataPoints = &val
-		}
-		if val, ok := jsonData.QueryOptions["minInterval"]; ok {
-			queryOptions.MinInterval = &val
-		}
-		if val, ok := jsonData.QueryOptions["cacheTimeout"]; ok {
-			queryOptions.CacheTimeout = &val
-		}
-		meta.QueryOptions = queryOptions
-	}
-
-	// Map Includes
-	if len(jsonData.Includes) > 0 {
-		meta.Includes = make([]pluginsv0alpha1.PluginMetaInclude, 0, len(jsonData.Includes))
-		for _, include := range jsonData.Includes {
-			v0Include := pluginsv0alpha1.PluginMetaInclude{}
-			if include.UID != "" {
-				v0Include.Uid = &include.UID
-			}
-			if include.Type != "" {
-				var includeType pluginsv0alpha1.PluginMetaIncludeType
-				switch include.Type {
-				case "dashboard":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDashboard
-				case "page":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypePage
-				case "panel":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypePanel
-				case "datasource":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDatasource
-				}
-				v0Include.Type = &includeType
-			}
-			if include.Name != "" {
-				v0Include.Name = &include.Name
-			}
-			if include.Component != "" {
-				v0Include.Component = &include.Component
-			}
-			if include.Role != "" {
-				var role pluginsv0alpha1.PluginMetaIncludeRole
-				switch include.Role {
-				case "Admin":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleAdmin
-				case "Editor":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleEditor
-				case "Viewer":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleViewer
-				}
-				v0Include.Role = &role
-			}
-			if include.Action != "" {
-				v0Include.Action = &include.Action
-			}
-			if include.Path != "" {
-				v0Include.Path = &include.Path
-			}
-			if include.AddToNav {
-				v0Include.AddToNav = &include.AddToNav
-			}
-			if include.DefaultNav {
-				v0Include.DefaultNav = &include.DefaultNav
-			}
-			if include.Icon != "" {
-				v0Include.Icon = &include.Icon
-			}
-			meta.Includes = append(meta.Includes, v0Include)
-		}
-	}
-
-	// Map Routes
-	if len(jsonData.Routes) > 0 {
-		meta.Routes = make([]pluginsv0alpha1.PluginMetaRoute, 0, len(jsonData.Routes))
-		for _, route := range jsonData.Routes {
-			v0Route := pluginsv0alpha1.PluginMetaRoute{}
-			if route.Path != "" {
-				v0Route.Path = &route.Path
-			}
-			if route.Method != "" {
-				v0Route.Method = &route.Method
-			}
-			if route.URL != "" {
-				v0Route.Url = &route.URL
-			}
-			if route.ReqRole != "" {
-				reqRole := string(route.ReqRole)
-				v0Route.ReqRole = &reqRole
-			}
-			if route.ReqAction != "" {
-				v0Route.ReqAction = &route.ReqAction
-			}
-			if len(route.Headers) > 0 {
-				headers := make([]string, 0, len(route.Headers))
-				for _, header := range route.Headers {
-					headers = append(headers, header.Name+": "+header.Content)
-				}
-				v0Route.Headers = headers
-			}
-			if len(route.URLParams) > 0 {
-				v0Route.UrlParams = make([]pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams, 0, len(route.URLParams))
-				for _, param := range route.URLParams {
-					v0Param := pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams{}
-					if param.Name != "" {
-						v0Param.Name = &param.Name
-					}
-					if param.Content != "" {
-						v0Param.Content = &param.Content
-					}
-					v0Route.UrlParams = append(v0Route.UrlParams, v0Param)
-				}
-			}
-			if route.TokenAuth != nil {
-				v0Route.TokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteTokenAuth{}
-				if route.TokenAuth.Url != "" {
-					v0Route.TokenAuth.Url = &route.TokenAuth.Url
-				}
-				if len(route.TokenAuth.Scopes) > 0 {
-					v0Route.TokenAuth.Scopes = route.TokenAuth.Scopes
-				}
-				if len(route.TokenAuth.Params) > 0 {
-					v0Route.TokenAuth.Params = make(map[string]interface{})
-					for k, v := range route.TokenAuth.Params {
-						v0Route.TokenAuth.Params[k] = v
-					}
-				}
-			}
-			if route.JwtTokenAuth != nil {
-				v0Route.JwtTokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteJwtTokenAuth{}
-				if route.JwtTokenAuth.Url != "" {
-					v0Route.JwtTokenAuth.Url = &route.JwtTokenAuth.Url
-				}
-				if len(route.JwtTokenAuth.Scopes) > 0 {
-					v0Route.JwtTokenAuth.Scopes = route.JwtTokenAuth.Scopes
-				}
-				if len(route.JwtTokenAuth.Params) > 0 {
-					v0Route.JwtTokenAuth.Params = make(map[string]interface{})
-					for k, v := range route.JwtTokenAuth.Params {
-						v0Route.JwtTokenAuth.Params[k] = v
-					}
-				}
-			}
-			if len(route.Body) > 0 {
-				var bodyMap map[string]interface{}
-				if err := json.Unmarshal(route.Body, &bodyMap); err == nil {
-					v0Route.Body = bodyMap
-				}
-			}
-			meta.Routes = append(meta.Routes, v0Route)
-		}
-	}
-
-	// Map Extensions
-	if len(jsonData.Extensions.AddedLinks) > 0 || len(jsonData.Extensions.AddedComponents) > 0 ||
-		len(jsonData.Extensions.ExposedComponents) > 0 || len(jsonData.Extensions.ExtensionPoints) > 0 {
-		extensions := &pluginsv0alpha1.PluginMetaExtensions{}
-
-		if len(jsonData.Extensions.AddedLinks) > 0 {
-			extensions.AddedLinks = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks, 0, len(jsonData.Extensions.AddedLinks))
-			for _, link := range jsonData.Extensions.AddedLinks {
-				v0Link := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks{
-					Targets: link.Targets,
-					Title:   link.Title,
-				}
-				if link.Description != "" {
-					v0Link.Description = &link.Description
-				}
-				extensions.AddedLinks = append(extensions.AddedLinks, v0Link)
-			}
-		}
-
-		if len(jsonData.Extensions.AddedComponents) > 0 {
-			extensions.AddedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents, 0, len(jsonData.Extensions.AddedComponents))
-			for _, comp := range jsonData.Extensions.AddedComponents {
-				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents{
-					Targets: comp.Targets,
-					Title:   comp.Title,
-				}
-				if comp.Description != "" {
-					v0Comp.Description = &comp.Description
-				}
-				extensions.AddedComponents = append(extensions.AddedComponents, v0Comp)
-			}
-		}
-
-		if len(jsonData.Extensions.ExposedComponents) > 0 {
-			extensions.ExposedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
-			for _, comp := range jsonData.Extensions.ExposedComponents {
-				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents{
-					Id: comp.Id,
-				}
-				if comp.Title != "" {
-					v0Comp.Title = &comp.Title
-				}
-				if comp.Description != "" {
-					v0Comp.Description = &comp.Description
-				}
-				extensions.ExposedComponents = append(extensions.ExposedComponents, v0Comp)
-			}
-		}
-
-		if len(jsonData.Extensions.ExtensionPoints) > 0 {
-			extensions.ExtensionPoints = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints, 0, len(jsonData.Extensions.ExtensionPoints))
-			for _, point := range jsonData.Extensions.ExtensionPoints {
-				v0Point := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints{
-					Id: point.Id,
-				}
-				if point.Title != "" {
-					v0Point.Title = &point.Title
-				}
-				if point.Description != "" {
-					v0Point.Description = &point.Description
-				}
-				extensions.ExtensionPoints = append(extensions.ExtensionPoints, v0Point)
-			}
-		}
-
-		meta.Extensions = extensions
-	}
-
-	// Map Roles
-	if len(jsonData.Roles) > 0 {
-		meta.Roles = make([]pluginsv0alpha1.PluginMetaRole, 0, len(jsonData.Roles))
-		for _, role := range jsonData.Roles {
-			v0Role := pluginsv0alpha1.PluginMetaRole{
-				Grants: role.Grants,
-			}
-			if role.Role.Name != "" || role.Role.Description != "" || len(role.Role.Permissions) > 0 {
-				v0RoleRole := &pluginsv0alpha1.PluginMetaV0alpha1RoleRole{}
-				if role.Role.Name != "" {
-					v0RoleRole.Name = &role.Role.Name
-				}
-				if role.Role.Description != "" {
-					v0RoleRole.Description = &role.Role.Description
-				}
-				if len(role.Role.Permissions) > 0 {
-					v0RoleRole.Permissions = make([]pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions, 0, len(role.Role.Permissions))
-					for _, perm := range role.Role.Permissions {
-						v0Perm := pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions{}
-						if perm.Action != "" {
-							v0Perm.Action = &perm.Action
-						}
-						if perm.Scope != "" {
-							v0Perm.Scope = &perm.Scope
-						}
-						v0RoleRole.Permissions = append(v0RoleRole.Permissions, v0Perm)
-					}
-				}
-				v0Role.Role = v0RoleRole
-			}
-			meta.Roles = append(meta.Roles, v0Role)
-		}
-	}
-
-	// Map IAM
-	if jsonData.IAM != nil && len(jsonData.IAM.Permissions) > 0 {
-		iam := &pluginsv0alpha1.PluginMetaIAM{
-			Permissions: make([]pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions, 0, len(jsonData.IAM.Permissions)),
-		}
-		for _, perm := range jsonData.IAM.Permissions {
-			v0Perm := pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions{}
-			if perm.Action != "" {
-				v0Perm.Action = &perm.Action
-			}
-			if perm.Scope != "" {
-				v0Perm.Scope = &perm.Scope
-			}
-			iam.Permissions = append(iam.Permissions, v0Perm)
-		}
-		meta.Iam = iam
-	}
-
-	return meta
-}
@@ -22,14 +22,16 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 	t.Run("returns cached plugin when available", func(t *testing.T) {
 		provider := NewCoreProvider()

-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedSpec := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider.mu.Lock()
-		provider.loadedPlugins["test-plugin"] = expectedMeta
+		provider.loadedPlugins["test-plugin"] = expectedSpec
 		provider.initialized = true
 		provider.mu.Unlock()

@@ -37,7 +39,7 @@ func TestCoreProvider_GetMeta(t *testing.T) {

 		require.NoError(t, err)
 		require.NotNil(t, result)
-		assert.Equal(t, expectedMeta, result.Meta)
+		assert.Equal(t, expectedSpec, result.Meta)
 		assert.Equal(t, defaultCoreTTL, result.TTL)
 	})

@@ -58,14 +60,16 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 	t.Run("ignores version parameter", func(t *testing.T) {
 		provider := NewCoreProvider()

-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedSpec := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider.mu.Lock()
-		provider.loadedPlugins["test-plugin"] = expectedMeta
+		provider.loadedPlugins["test-plugin"] = expectedSpec
 		provider.initialized = true
 		provider.mu.Unlock()

@@ -81,14 +85,16 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 		customTTL := 2 * time.Hour
 		provider := NewCoreProviderWithTTL(customTTL)

-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedSpec := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider.mu.Lock()
-		provider.loadedPlugins["test-plugin"] = expectedMeta
+		provider.loadedPlugins["test-plugin"] = expectedSpec
 		provider.initialized = true
 		provider.mu.Unlock()

@@ -226,8 +232,8 @@ func TestCoreProvider_loadPlugins(t *testing.T) {
 		if loaded {
 			result, err := provider.GetMeta(ctx, "test-datasource", "1.0.0")
 			require.NoError(t, err)
-			assert.Equal(t, "test-datasource", result.Meta.Id)
-			assert.Equal(t, "Test Datasource", result.Meta.Name)
+			assert.Equal(t, "test-datasource", result.Meta.PluginJson.Id)
+			assert.Equal(t, "Test Datasource", result.Meta.PluginJson.Name)
 		}
 	})
 }
@@ -0,0 +1,53 @@
+package meta
+
+import (
+	"context"
+	"time"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
+)
+
+const (
+	defaultLocalTTL = 1 * time.Hour
+)
+
+// PluginAssetsCalculator is an interface for calculating plugin asset information.
+// LocalProvider requires this to calculate loading strategy and module hash.
+type PluginAssetsCalculator interface {
+	LoadingStrategy(ctx context.Context, p pluginstore.Plugin) plugins.LoadingStrategy
+	ModuleHash(ctx context.Context, p pluginstore.Plugin) string
+}
+
+// LocalProvider retrieves plugin metadata for locally installed plugins.
+// It uses the plugin store to access plugins that have already been loaded.
+type LocalProvider struct {
+	store        pluginstore.Store
+	pluginAssets PluginAssetsCalculator
+}
+
+// NewLocalProvider creates a new LocalProvider for locally installed plugins.
+// pluginAssets is required for calculating loading strategy and module hash.
+func NewLocalProvider(pluginStore pluginstore.Store, pluginAssets PluginAssetsCalculator) *LocalProvider {
+	return &LocalProvider{
+		store:        pluginStore,
+		pluginAssets: pluginAssets,
+	}
+}
+
+// GetMeta retrieves plugin metadata for locally installed plugins.
+func (p *LocalProvider) GetMeta(ctx context.Context, pluginID, version string) (*Result, error) {
+	plugin, exists := p.store.Plugin(ctx, pluginID)
+	if !exists {
+		return nil, ErrMetaNotFound
+	}
+
+	loadingStrategy := p.pluginAssets.LoadingStrategy(ctx, plugin)
+	moduleHash := p.pluginAssets.ModuleHash(ctx, plugin)
+
+	spec := pluginStorePluginToPluginMetaSpec(plugin, loadingStrategy, moduleHash)
+	return &Result{
+		Meta: spec,
+		TTL:  defaultLocalTTL,
+	}, nil
+}
@@ -16,7 +16,7 @@ const (

 // cachedMeta represents a cached metadata entry with expiration time
 type cachedMeta struct {
-	meta      pluginsv0alpha1.PluginMetaJSONData
+	meta      pluginsv0alpha1.PluginMetaSpec
 	ttl       time.Duration
 	expiresAt time.Time
 }
@@ -84,7 +84,7 @@ func (pm *ProviderManager) GetMeta(ctx context.Context, pluginID, version string
 		if err == nil {
 			// Don't cache results with a zero TTL
 			if result.TTL == 0 {
-				continue
+				return result, nil
 			}

 			pm.cacheMu.Lock()
@@ -35,10 +35,12 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	ctx := context.Background()

 	t.Run("returns cached result when available and not expired", func(t *testing.T) {
-		cachedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		cachedMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider := &mockProvider{
@@ -60,8 +62,10 @@ func TestProviderManager_GetMeta(t *testing.T) {

 		provider.getMetaFunc = func(ctx context.Context, pluginID, version string) (*Result, error) {
 			return &Result{
-				Meta: pluginsv0alpha1.PluginMetaJSONData{Id: "different"},
-				TTL:  time.Hour,
+				Meta: pluginsv0alpha1.PluginMetaSpec{
+					PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "different"},
+				},
+				TTL: time.Hour,
 			}, nil
 		}

@@ -73,10 +77,12 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})

 	t.Run("fetches from provider when not cached", func(t *testing.T) {
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}
 		expectedTTL := 2 * time.Hour

@@ -107,19 +113,16 @@ func TestProviderManager_GetMeta(t *testing.T) {
 		assert.Equal(t, expectedTTL, cached.ttl)
 	})

-	t.Run("does not cache result with zero TTL and tries next provider", func(t *testing.T) {
-		zeroTTLMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Zero TTL Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
-		}
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+	t.Run("does not cache result with zero TTL", func(t *testing.T) {
+		zeroTTLMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Zero TTL Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

-		provider1 := &mockProvider{
+		provider := &mockProvider{
 			getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {
 				return &Result{
 					Meta: zeroTTLMeta,
@@ -127,37 +130,30 @@ func TestProviderManager_GetMeta(t *testing.T) {
 				}, nil
 			},
 		}
-		provider2 := &mockProvider{
-			getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {
-				return &Result{
-					Meta: expectedMeta,
-					TTL:  time.Hour,
-				}, nil
-			},
-		}

-		pm := NewProviderManager(provider1, provider2)
+		pm := NewProviderManager(provider)

 		result, err := pm.GetMeta(ctx, "test-plugin", "1.0.0")

 		require.NoError(t, err)
 		require.NotNil(t, result)
-		assert.Equal(t, expectedMeta, result.Meta)
+		assert.Equal(t, zeroTTLMeta, result.Meta)
+		assert.Equal(t, time.Duration(0), result.TTL)

 		pm.cacheMu.RLock()
-		cached, exists := pm.cache["test-plugin:1.0.0"]
+		_, exists := pm.cache["test-plugin:1.0.0"]
 		pm.cacheMu.RUnlock()

-		assert.True(t, exists)
-		assert.Equal(t, expectedMeta, cached.meta)
-		assert.Equal(t, time.Hour, cached.ttl)
+		assert.False(t, exists, "zero TTL results should not be cached")
 	})

 	t.Run("tries next provider when first returns ErrMetaNotFound", func(t *testing.T) {
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider1 := &mockProvider{
@@ -229,15 +225,19 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})

 	t.Run("skips expired cache entries", func(t *testing.T) {
-		expiredMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Expired Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expiredMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Expired Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedMeta := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Test Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		callCount := 0
@@ -272,15 +272,19 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})

 	t.Run("uses first successful provider", func(t *testing.T) {
-		expectedMeta1 := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Provider 1 Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedMeta1 := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Provider 1 Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}
-		expectedMeta2 := pluginsv0alpha1.PluginMetaJSONData{
-			Id:   "test-plugin",
-			Name: "Provider 2 Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+		expectedMeta2 := pluginsv0alpha1.PluginMetaSpec{
+			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
+				Id:   "test-plugin",
+				Name: "Provider 2 Plugin",
+				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			},
 		}

 		provider1 := &mockProvider{
@@ -331,9 +335,9 @@ func TestProviderManager_Run(t *testing.T) {

 func TestProviderManager_cleanupExpired(t *testing.T) {
 	t.Run("removes expired entries", func(t *testing.T) {
-		validMeta := pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}
-		expiredMeta1 := pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}
-		expiredMeta2 := pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}
+		validMeta := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}}
+		expiredMeta1 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}}
+		expiredMeta2 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}}

 		provider := &mockProvider{
 			getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {
@@ -14,14 +14,14 @@ var (

 // Result contains plugin metadata along with its recommended TTL.
 type Result struct {
-	Meta pluginsv0alpha1.PluginMetaJSONData
+	Meta pluginsv0alpha1.PluginMetaSpec
 	TTL  time.Duration
 }

 // Provider is used for retrieving plugin metadata.
 type Provider interface {
 	// GetMeta retrieves plugin metadata for the given plugin ID and version.
-	// Returns the Result containing the PluginMetaJSONData and its recommended TTL.
+	// Returns the Result containing the PluginMetaSpec and its recommended TTL.
 	// If the plugin is not found, returns ErrMetaNotFound.
 	GetMeta(ctx context.Context, pluginID, version string) (*Result, error)
 }
@@ -126,7 +126,7 @@ func (s *PluginMetaStorage) List(ctx context.Context, options *internalversion.L
 			continue
 		}

-		pluginMeta := createPluginMetaFromPluginMetaJSONData(result.Meta, plugin.Name, plugin.Namespace)
+		pluginMeta := createPluginMetaFromSpec(result.Meta, plugin.Name, plugin.Namespace)
 		metaItems = append(metaItems, *pluginMeta)
 	}

@@ -174,19 +174,17 @@ func (s *PluginMetaStorage) Get(ctx context.Context, name string, options *metav
 		return nil, apierrors.NewInternalError(fmt.Errorf("failed to fetch plugin metadata: %w", err))
 	}

-	return createPluginMetaFromPluginMetaJSONData(result.Meta, name, ns.Value), nil
+	return createPluginMetaFromSpec(result.Meta, name, ns.Value), nil
 }

-// createPluginMetaFromPluginMetaJSONData creates a PluginMeta k8s object from PluginMetaJSONData and plugin metadata.
-func createPluginMetaFromPluginMetaJSONData(pluginJSON pluginsv0alpha1.PluginMetaJSONData, name, namespace string) *pluginsv0alpha1.PluginMeta {
+// createPluginMetaFromSpec creates a PluginMeta k8s object from PluginMetaSpec and plugin metadata.
+func createPluginMetaFromSpec(spec pluginsv0alpha1.PluginMetaSpec, name, namespace string) *pluginsv0alpha1.PluginMeta {
 	pluginMeta := &pluginsv0alpha1.PluginMeta{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
 		},
-		Spec: pluginsv0alpha1.PluginMetaSpec{
-			PluginJSON: pluginJSON,
-		},
+		Spec: spec,
 	}

 	// Set the GroupVersionKind
@@ -43,12 +43,6 @@ type RepositoryView struct {
 	// For git, this is the target branch
 	Branch string `json:"branch,omitempty"`

-	// For git, this is the target URL
-	URL string `json:"url,omitempty"`
-
-	// For git, this is the target path
-	Path string `json:"path,omitempty"`
-
 	// The supported workflows
 	Workflows []Workflow `json:"workflows"`
 }
@@ -1690,20 +1690,6 @@ func schema_pkg_apis_provisioning_v0alpha1_RepositoryView(ref common.ReferenceCa
 							Format:      "",
 						},
 					},
-					"url": {
-						SchemaProps: spec.SchemaProps{
-							Description: "For git, this is the target URL",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"path": {
-						SchemaProps: spec.SchemaProps{
-							Description: "For git, this is the target path",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
 					"workflows": {
 						SchemaProps: spec.SchemaProps{
 							Description: "The supported workflows",
@@ -5,7 +5,6 @@ We're excited that you're considering making a contribution to the Grafana proje
 These are some good resources to explore for developers:

 - [Create a pull request](create-pull-request.md)
- [Create a feature request](create-feature-request.md)
 - [Developer guide](developer-guide.md)
 - [Triage issues](triage-issues.md)
 - [Merge a pull request](merge-pull-request.md)
@@ -1,160 +0,0 @@
-# Create a feature request
-
-Feature requests help us understand what you need from Grafana. This document guides you through writing effective feature requests that help maintainers understand your needs and prioritize improvements.
-
-## Before you begin
-
-We're excited to hear your ideas! Before you submit a feature request, consider these resources:
-
- Read the [Code of Conduct](../CODE_OF_CONDUCT.md) to understand our community guidelines.
- Search [existing feature requests](https://github.com/grafana/grafana/issues?q=is%3Aissue+is%3Aopen+label%3Atype%2Ffeature-request) to see if someone already suggested something similar.
- Discuss your idea in the [Grafana community forums](https://community.grafana.com/) to refine it and gather feedback.
-
-## Your first feature request
-
-When you're ready to submit a feature request, use the [feature request template](https://github.com/grafana/grafana/issues/new?template=1-feature_requests.md). The template has three sections that help maintainers understand what you need and why.
-
-Here's an [example of how all three sections work together in an actual feature request](https://github.com/grafana/grafana/issues/105298) from the Grafana community. We'll analyze each section based on this example feature request.
-
-### Why is this needed
-
-This section describes the real problem or limitation you're facing.
-
-Explain what's difficult, inefficient, or impossible with the current implementation. Focus on the problem rather than proposing a solution. This helps maintainers understand your use case and potentially find better solutions.
-
-**What to include:**
-
- The specific problem or pain point you're experiencing
- How the current behavior falls short for your workflow
- Why this matters to you and your work
- A concrete example that clarifies the issue (optional but helpful)
-
-**What to avoid:**
-
- Jumping directly to the solution (save that for the next section)
- Vague statements like "it would be nice if..."
- Assuming maintainers know your context or workflow
-
-**Example of a strong answer:**
-
-```
-When using a datasource variable in dashboards and using the "Export" feature in a dashboard,
-this will automatically create an input for the datasource(s) being used, but it will also
-effectively override the use of the datasource variable in all panels.
-
-This makes a confusing
-experience when importing the dashboard, because users are prompted for an input, but the
-selected datasource won't be reflected in the datasource variable, and any changes to the
-datasource variable will not have any effect on the dashboard.
-```
-
-**Example of a weak answer:**
-
-```
-Dashboard export doesn't work well with variables.
-```
-
-The first example clearly explains what's broken, why it's confusing, and what the specific consequences are. The second example is too vague and doesn't explain the actual problem.
-
-### What would you like to be added
-
-This section describes what you want Grafana to do differently.
-
-Be specific and concrete about the expected behavior. If you're suggesting a UI change, describe the interaction or include a screenshot or sketch. If it's data or API related, provide an example query or expected output.
-
-**What to include:**
-
- Exactly what behavior you expect
- How the feature should work in practice
- Examples, screenshots, or code snippets that illustrate your idea
- Expected output or results
-
-**What to avoid:**
-
- Vague or abstract descriptions
- Multiple unrelated features in one request (create separate requests instead)
- Implementation details unless they're critical to your request
-
-**Example of a strong answer:**
-
-```
-Ideal behavior here would be that when using the export feature, either:
-
-1. No inputs section is created for datasource types that are used as datasource variables.
-2. IF an input is created, it should only be used to replace the currently selected value of
-   the datasource variable, rather than override the datasource in panels.
-```
-
-**Example of a weak answer:**
-
-```
-Fix the dashboard export feature.
-```
-
-The first example provides clear, actionable options for how the feature should work. The second example is too vague and doesn't specify what the fix should do.
-
-### Who is this feature for?
-
-This section describes who benefits from this feature and in what context.
-
-Help maintainers understand the scope and impact of your request. Be specific about user types, workflows, or scenarios where this feature matters.
-
-**What to include:**
-
- The type of user who needs this (for example, Tempo users, dashboard editors, plugin developers)
- Whether this affects all Grafana users or only those using specific features or data sources
- The workflow or use case this feature improves (optional but helpful)
-
-**What to avoid:**
-
- Saying "everyone" without clarifying who actually needs it
- Being overly narrow if the feature has broader appeal
-
-**Example of a strong answer:**
-
-```
-Any Grafana Dashboard users or authors that use datasource variables.
-```
-
-**Example of a weak answer:**
-
-```
-Dashboard users.
-```
-
-The first example identifies the specific users and the feature they use (datasource variables). The second example is too generic and doesn't clarify which users or workflow are affected.
-
-## Best practices for feature requests
-
-Follow these guidelines to increase the chances of your feature request being accepted:
-
-### Keep it focused
-
-Request one feature at a time. If you have multiple ideas, create separate feature requests for each one. This makes it easier to discuss, prioritize, and implement each feature independently.
-
-### Research first
-
-Before submitting, search for similar requests. If you find an existing request that's close to your idea, add your use case and context to that discussion instead of creating a duplicate.
-
-### Provide context
-
-The more context you provide, the better maintainers can understand your needs. Include:
-
- Your environment or setup (which data sources, plugins, or features you're using)
- Your workflow or process
- Why this matters to you
- Any workarounds you've tried
-
-### Be open to alternatives
-
-Maintainers might suggest different approaches to solve your problem. Be open to these alternatives as they might be easier to implement or more maintainable in the long term.
-
-### Stay engaged
-
-After submitting your feature request, monitor the discussion. Answer questions from maintainers and provide clarification when needed. This helps move your request forward.
-
-## Contributing the feature yourself
-
-If you want to implement the feature yourself, feel free to create a pull request following the [pull request guidelines](create-pull-request.md).
-
-We welcome community contributions and appreciate your help making Grafana better!
@@ -1,6 +1,6 @@
 ---
 aliases:
-  - ../../../panels-visualizations/query-transform-data/sql-expressions/ # /docs/grafana/next/panels-visualizations/query-transform-data/sql-expressions/
+  - ../../panels-visualizations/query-transform-data/sql-expressions/ # /docs/grafana/next/panels-visualizations/query-transform-data/sql-expressions/
 labels:
  products:
    - cloud
@@ -4,8 +4,6 @@ import { test, expect, E2ESelectorGroups, DashboardPage, DashboardPageArgs } fro

 import testDashboard from '../dashboards/DashboardWithAllConditionalRendering.json';

-import { checkRepeatedPanelTitles } from './utils';
-
 test.use({
  featureToggles: {
    kubernetesDashboards: true,
@@ -95,7 +93,7 @@ test.describe('Dashboard - Conditional Rendering - Load and Change', { tag: ['@d

  test.afterAll(async ({ request }) => {
    if (uid) {
-      await request.delete(`/apis/dashboard.grafana.app/v1beta1/namespaces/stacks-12345/dashboards/${uid}`);
+      await request.delete(`/apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/${uid}`);
    }
  });

@@ -409,52 +407,4 @@ test.describe('Dashboard - Conditional Rendering - Load and Change', { tag: ['@d
    await expect(getTabShowNotMatches(dashboardPage, selectors)).toBeVisible();
    await expect(getTabHideNotMatches(dashboardPage, selectors)).not.toBeVisible();
  });
-
-  test.describe('Variable repeat', () => {
-    const repeatOptions = ['a', 'b', 'c'];
-
-    async function failTestDataRequestForOption(page: Page, option: string) {
-      await page.route(/\/api\/ds\/query\?.*\bds_type=grafana-testdata-datasource/, async (route) => {
-        const rawPostData = route.request().postData();
-        if (!rawPostData) {
-          return;
-        }
-
-        // the first panel query has a label set to the current variable value
-        if (JSON.parse(rawPostData).queries[0].labels === `key=${option}`) {
-          await route.fulfill({ status: 500, body: '{}' });
-        } else {
-          await route.continue();
-        }
-      });
-    }
-
-    test('Hide when equals, hide when no data', async ({ page, gotoDashboardPage, selectors }) => {
-      const dashboardPage = await loadDashboard(page, gotoDashboardPage);
-
-      await getTab(dashboardPage, selectors, 'repeated items').click();
-
-      const optionForHiddenPanels = repeatOptions[0];
-
-      await failTestDataRequestForOption(page, optionForHiddenPanels);
-
-      await checkRepeatedPanelTitles(
-        dashboardPage,
-        selectors,
-        'Hide panel - ',
-        [
-          `custom variable equals ${optionForHiddenPanels} (current = ${optionForHiddenPanels})`,
-          `no data (current = ${optionForHiddenPanels})`,
-        ],
-        true
-      );
-
-      const optionsForVisiblePanels = repeatOptions.slice(1);
-
-      await checkRepeatedPanelTitles(dashboardPage, selectors, 'Hide panel - ', [
-        ...optionsForVisiblePanels.map((o) => `custom variable equals ${optionForHiddenPanels} (current = ${o})`),
-        ...optionsForVisiblePanels.map((o) => `no data (current = ${o})`),
-      ]);
-    });
-  });
 });
@@ -97,18 +97,12 @@ export async function checkRepeatedPanelTitles(
  dashboardPage: DashboardPage,
  selectors: E2ESelectorGroups,
  title: string,
-  options: Array<string | number>,
-  expectHidden = false
+  options: Array<string | number>
 ) {
  for (const option of options) {
-    const titleLocator = dashboardPage.getByGrafanaSelector(
-      selectors.components.Panels.Panel.title(`${title}${option}`)
-    );
-    if (expectHidden) {
-      await expect(titleLocator).toBeHidden();
-    } else {
-      await expect(titleLocator).toBeVisible();
-    }
+    await expect(
+      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(`${title}${option}`))
+    ).toBeVisible();
  }
 }

@@ -9,8 +9,7 @@ const NUM_NESTED_DASHBOARDS = 60;

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ import testDashboard from '../dashboards/TestDashboard.json';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -6,8 +6,7 @@ test.use({
  featureToggles: {
    scenes: true,
    sharingDashboardImage: true, // Enable the export image feature
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -2,8 +2,7 @@ import { test, expect } from '@grafana/plugin-e2e';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -2,8 +2,7 @@ import { test, expect } from '@grafana/plugin-e2e';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ import testDashboard from '../dashboards/DataLinkWithoutSlugTest.json';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ import testDashboard from '../dashboards/DashboardLiveTest.json';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -2,8 +2,7 @@ import { test, expect } from '@grafana/plugin-e2e';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -2,8 +2,7 @@ import { test, expect } from '@grafana/plugin-e2e';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -3,8 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    scenes: true,
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -3,8 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    scenes: true,
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ import { SnapshotCreateResponse } from '../../public/app/features/dashboard/serv
 test.use({
  featureToggles: {
    scenes: true,
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ const DASHBOARD_UID = 'HYaGDGIMk';
 test.use({
  timezoneId: 'Pacific/Easter',
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -7,8 +7,7 @@ const TIMEZONE_DASHBOARD_UID = 'd41dbaa2-a39e-4536-ab2b-caca52f1a9c8';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -16,8 +16,7 @@ test.use({
    origins: [],
  },
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -2,8 +2,7 @@ import { test, expect } from '@grafana/plugin-e2e';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = 'edediimbjhdz4b/a-tall-dashboard';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ import testDashboard from '../dashboards/TestDashboard.json';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -52,8 +52,7 @@ async function assertPreviewValues(

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -18,8 +18,7 @@ async function assertPreviewValues(

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ const DASHBOARD_NAME = 'Templating - Nested Template Variables';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -5,8 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -4,8 +4,7 @@ const DASHBOARD_UID = 'ZqZnVvFZz';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -4,8 +4,7 @@ const DASHBOARD_UID = 'yBCC3aKGk';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -6,8 +6,7 @@ const PAGE_UNDER_TEST = 'AejrN1AMz';

 test.use({
  featureToggles: {
-    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboards: process.env.KUBERNETES_DASHBOARDS === 'true',
  },
 });

@@ -3308,170 +3308,6 @@
          }
        }
      },
-      "panel-37": {
-        "kind": "Panel",
-        "spec": {
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "hidden": false,
-                    "query": {
-                      "group": "",
-                      "kind": "DataQuery",
-                      "spec": {},
-                      "version": "v0"
-                    },
-                    "refId": "A"
-                  }
-                }
-              ],
-              "queryOptions": {},
-              "transformations": []
-            }
-          },
-          "description": "",
-          "id": 37,
-          "links": [],
-          "title": "Hide panel - custom variable equals a (current = ${myCustomVariable})",
-          "vizConfig": {
-            "group": "text",
-            "kind": "VizConfig",
-            "spec": {
-              "fieldConfig": {
-                "defaults": {},
-                "overrides": []
-              },
-              "options": {
-                "code": {
-                  "language": "plaintext",
-                  "showLineNumbers": false,
-                  "showMiniMap": false
-                },
-                "content": "",
-                "mode": "markdown"
-              }
-            },
-            "version": "12.2.0-pre"
-          }
-        }
-      },
-      "panel-38": {
-        "kind": "Panel",
-        "spec": {
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "hidden": false,
-                    "query": {
-                      "datasource": {
-                        "name": "PD8C576611E62080A"
-                      },
-                      "group": "grafana-testdata-datasource",
-                      "kind": "DataQuery",
-                      "spec": {
-                        "labels": "key=$myCustomVariable",
-                        "scenarioId": "random_walk",
-                        "seriesCount": 1
-                      },
-                      "version": "v0"
-                    },
-                    "refId": "A"
-                  }
-                }
-              ],
-              "queryOptions": {},
-              "transformations": []
-            }
-          },
-          "description": "",
-          "id": 38,
-          "links": [],
-          "title": "Hide panel - no data (current = ${myCustomVariable})",
-          "vizConfig": {
-            "group": "timeseries",
-            "kind": "VizConfig",
-            "spec": {
-              "fieldConfig": {
-                "defaults": {
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  },
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": 0
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                },
-                "overrides": []
-              },
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              }
-            },
-            "version": "12.2.0-pre"
-          }
-        }
-      },
      "panel-4": {
        "kind": "Panel",
        "spec": {
@@ -5255,80 +5091,6 @@
              },
              "title": "Tab - hide - time range <7d"
            }
-          },
-          {
-            "kind": "TabsLayoutTab",
-            "spec": {
-              "layout": {
-                "kind": "AutoGridLayout",
-                "spec": {
-                  "columnWidthMode": "standard",
-                  "items": [
-                    {
-                      "kind": "AutoGridLayoutItem",
-                      "spec": {
-                        "conditionalRendering": {
-                          "kind": "ConditionalRenderingGroup",
-                          "spec": {
-                            "condition": "and",
-                            "items": [
-                              {
-                                "kind": "ConditionalRenderingVariable",
-                                "spec": {
-                                  "operator": "equals",
-                                  "value": "a",
-                                  "variable": "myCustomVariable"
-                                }
-                              }
-                            ],
-                            "visibility": "hide"
-                          }
-                        },
-                        "element": {
-                          "kind": "ElementReference",
-                          "name": "panel-37"
-                        },
-                        "repeat": {
-                          "mode": "variable",
-                          "value": "myCustomVariable"
-                        }
-                      }
-                    },
-                    {
-                      "kind": "AutoGridLayoutItem",
-                      "spec": {
-                        "conditionalRendering": {
-                          "kind": "ConditionalRenderingGroup",
-                          "spec": {
-                            "condition": "and",
-                            "items": [
-                              {
-                                "kind": "ConditionalRenderingData",
-                                "spec": {
-                                  "value": false
-                                }
-                              }
-                            ],
-                            "visibility": "hide"
-                          }
-                        },
-                        "element": {
-                          "kind": "ElementReference",
-                          "name": "panel-38"
-                        },
-                        "repeat": {
-                          "mode": "variable",
-                          "value": "myCustomVariable"
-                        }
-                      }
-                    }
-                  ],
-                  "maxColumnCount": 3,
-                  "rowHeightMode": "standard"
-                }
-              },
-              "title": "Tab - repeated items"
-            }
          }
        ]
      }
@@ -5360,39 +5122,6 @@
          "query": "",
          "skipUrlSync": false
        }
-      },
-      {
-        "kind": "CustomVariable",
-        "spec": {
-          "allowCustomValue": false,
-          "current": {
-            "text": "All",
-            "value": "$__all"
-          },
-          "hide": "dontHide",
-          "includeAll": true,
-          "multi": false,
-          "name": "myCustomVariable",
-          "options": [
-            {
-              "selected": false,
-              "text": "a",
-              "value": "a"
-            },
-            {
-              "selected": false,
-              "text": "b",
-              "value": "b"
-            },
-            {
-              "selected": false,
-              "text": "c",
-              "value": "c"
-            }
-          ],
-          "query": "a, b, c",
-          "skipUrlSync": false
-        }
      }
    ]
  },
@@ -1,5 +1,4 @@
-// TODO: Migrate to Typescript.
-// @ts-nocheck
+// @ts-check
 const emotionPlugin = require('@emotion/eslint-plugin');
 const restrictedGlobals = require('confusing-browser-globals');
 const importPlugin = require('eslint-plugin-import');
@@ -66,7 +66,6 @@
    "themes-generate": "yarn themes-schema && esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --platform=node --tsconfig=./scripts/cli/tsconfig.json | node",
    "themes:usage": "eslint . --ignore-pattern '*.test.ts*' --ignore-pattern '*.spec.ts*' --cache --plugin '@grafana' --rule '{ @grafana/theme-token-usage: \"error\" }'",
    "typecheck": "tsc --noEmit && yarn run packages:typecheck",
-    "typecheck:tsgo": "tsgo --noEmit",
    "plugins:build-bundled": "echo 'bundled plugins are no longer supported'",
    "watch": "yarn start -d watch,start core:start --watchTheme",
    "i18n:stats": "node ./scripts/cli/reportI18nStats.mjs",
@@ -167,7 +166,6 @@
    "@types/yargs": "17.0.33",
    "@typescript-eslint/eslint-plugin": "8.38.0",
    "@typescript-eslint/parser": "8.38.0",
-    "@typescript/native-preview": "^7.0.0-dev.20251128.1",
    "autoprefixer": "10.4.21",
    "babel-loader": "10.0.0",
    "blob-polyfill": "9.0.20240710",
@@ -110,9 +110,10 @@ export function getInheritedProperties<T extends Route>(
    ...propertiesParentInherited,
  } as const;

+  // @ts-expect-error we're using "keyof" for the property so the type checker can help us out but this makes the
+  // reduce function signature unhappy
  const inherited = reduce(
    inheritableProperties,
-    // @ts-expect-error we're using "keyof" for the property so the type checker can help us out but this makes the
    (inheritedProperties: InheritableProperties, parentValue, property: keyof InheritableProperties) => {
      const parentHasValue = parentValue != null;

@@ -1,7 +1,4 @@
 {
  "exclude": ["dist", "node_modules", "tests", "**/*.test.ts*", "**/*.story.tsx"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -1581,8 +1581,6 @@ export type RepositoryView = {
  branch?: string;
  /** The k8s name for this repository */
  name: string;
-  /** For git, this is the target path */
-  path?: string;
  /** When syncing, where values are saved
    
    Possible enum values:
@@ -1600,8 +1598,6 @@ export type RepositoryView = {
     - `"gitlab"`
     - `"local"` */
  type: 'bitbucket' | 'git' | 'github' | 'gitlab' | 'local';
-  /** For git, this is the target URL */
-  url?: string;
  /** The supported workflows */
  workflows: ('branch' | 'write')[];
 };
@@ -1,7 +1,4 @@
 {
  "extends": "./tsconfig.json",
-  "exclude": ["dist", "node_modules", "**/*.test.ts*"],
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "exclude": ["dist", "node_modules", "**/*.test.ts*"]
 }
@@ -84,6 +84,7 @@
    "xss": "^1.0.14"
  },
  "devDependencies": {
+    "@grafana/plugin-types": "^0.0.48",
    "@grafana/scenes": "6.38.0",
    "@rollup/plugin-node-resolve": "16.0.1",
    "@testing-library/react": "16.3.0",
@@ -91,10 +91,8 @@ describe('EventBus', () => {
    it('Supports legacy events', () => {
      const bus = new EventBusSrv();
      const events: LegacyEventPayload[] = [];
-      const handler = (event?: LegacyEventPayload) => {
-        if (event) {
-          events.push(event);
-        }
+      const handler = (event: LegacyEventPayload) => {
+        events.push(event);
      };

      bus.on(legacyEvent, handler);
@@ -113,9 +111,7 @@ describe('EventBus', () => {
      const newEvents: AlertSuccessEvent[] = [];

      bus.on(legacyEvent, (event) => {
-        if (event) {
-          legacyEvents.push(event);
-        }
+        legacyEvents.push(event);
      });

      bus.subscribe(AlertSuccessEvent, (event) => {
@@ -133,12 +133,12 @@ export interface LegacyEmitter {
  /**
   * @deprecated use $on
   */
-  off<T>(event: AppEvent<T> | string, handler: LegacyEventHandler<T>): void;
+  off<T>(event: AppEvent<T> | string, handler: (payload?: T) => void): void;
 }

 /** @public */
 export interface LegacyEventHandler<T> {
-  (payload?: T): void;
+  (payload: T): void;
  wrapper?: (event: BusEvent) => void;
 }

@@ -921,3 +921,4 @@ export {
 } from './rbac/rbac';

 export { type UserStorage } from './types/userStorage';
+export { type PluginMetasResponse, type PluginMetasSpec } from './types/plugin';
@@ -896,42 +896,6 @@ describe('getHistogramFields', () => {
      }
    `);
  });
-
-  it('should prevent excessive densification when sparse histogram has large gaps', () => {
-    const result = getHistogramFields(
-      toDataFrame({
-        meta: {
-          type: DataFrameType.HeatmapCells,
-        },
-        fields: [
-          { name: 'yMin', type: FieldType.number, values: [0.001, 1000] },
-          { name: 'yMax', type: FieldType.number, values: [0.00101, 1010] },
-          { name: 'count', type: FieldType.number, values: [10, 20] },
-        ],
-      })
-    );
-
-    expect(result).toBeDefined();
-    expect(result!.counts[0].values.length).toBeLessThanOrEqual(1001);
-  });
-
-  it('should handle multiple observed buckets when hitting densification limit', () => {
-    const result = getHistogramFields(
-      toDataFrame({
-        meta: {
-          type: DataFrameType.HeatmapCells,
-        },
-        fields: [
-          { name: 'yMin', type: FieldType.number, values: [0.001, 1000, 2000] },
-          { name: 'yMax', type: FieldType.number, values: [0.00101, 1010, 2020] },
-          { name: 'count', type: FieldType.number, values: [10, 20, 30] },
-        ],
-      })
-    );
-
-    expect(result).toBeDefined();
-    expect(result!.counts[0].values.every((v) => !isNaN(v))).toBe(true);
-  });
 });

 describe('joinHistograms', () => {
@@ -210,8 +210,6 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
    let denseMins: number[] = [];
    let denseMaxs: number[] = [];

-    const MAX_DENSIFIED_BUCKETS = 1000;
-
    for (let i = 0; i < uniqueMaxs.length; i++) {
      let curMax = uniqueMaxs[i];
      let curMin = uniqueMins[i];
@@ -225,17 +223,13 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
        curMax = curMax * bucketFactor;
        curMin = curMin * bucketFactor;

-        while (curMax < nextMax * 0.999999 && denseMaxs.length < MAX_DENSIFIED_BUCKETS) {
+        while (curMax < nextMax * 0.999999) {
          denseMaxs.push(curMax);
          denseMins.push(curMin);

          curMax = curMax * bucketFactor;
          curMin = curMin * bucketFactor;
        }
-
-        if (denseMaxs.length >= MAX_DENSIFIED_BUCKETS) {
-          break;
-        }
      }
    }

@@ -244,10 +238,7 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine

    for (let i = 0; i < yMaxField.values.length; i++) {
      let max = yMaxField.values[i];
-      let currentCount = countsByMax.get(max);
-      if (currentCount !== undefined) {
-        countsByMax.set(max, currentCount + countField.values[i]);
-      }
+      countsByMax.set(max, countsByMax.get(max) + countField.values[i]);
    }

    let fields = {
@@ -643,7 +643,6 @@ export interface MetricFindValue {
  value?: string | number;
  group?: string;
  expandable?: boolean;
-  properties?: Record<string, string>;
 }

 export interface DataSourceGetDrilldownsApplicabilityOptions<TQuery extends DataQuery = DataQuery> {
@@ -361,10 +361,6 @@ export interface FeatureToggles {
  */
  dashboardNewLayouts?: boolean;
  /**
-  * Use the v2 kubernetes API in the frontend for dashboards
-  */
-  kubernetesDashboardsV2?: boolean;
-  /**
  * Enables undo/redo in dynamic dashboards
  */
  dashboardUndoRedo?: boolean;
@@ -1193,8 +1189,4 @@ export interface FeatureToggles {
  * @default false
  */
  rudderstackUpgrade?: boolean;
-  /**
-  * Adds support for Kubernetes alerting historian APIs
-  */
-  kubernetesAlertingHistorian?: boolean;
 }
@@ -1,5 +1,7 @@
 import { ComponentType } from 'react';

+import { PluginSchema } from '@grafana/plugin-types/plugin-schema';
+
 import { KeyValue } from './data';
 import { IconName } from './icon';

@@ -266,3 +268,32 @@ export class GrafanaPlugin<T extends PluginMeta = PluginMeta> {
    this.meta = {} as T;
  }
 }
+export interface PluginMetasResponse {
+  items: PluginMetasItem[];
+}
+
+export interface PluginMetasItem {
+  spec: PluginMetasSpec;
+}
+
+export interface PluginMetasSpec {
+  pluginJson: PluginSchema;
+  module: PluginMetasModule;
+  baseURL: string;
+  signature: PluginMetasSignature;
+  angular: PluginMetasAngular;
+  translations?: PluginSchema['languages'];
+}
+
+export interface PluginMetasAngular {
+  detected: boolean;
+}
+
+export interface PluginMetasModule {
+  path: string;
+  loadingStrategy: PluginLoadingStrategy;
+}
+
+export interface PluginMetasSignature {
+  status: PluginSignatureStatus;
+}
@@ -1,7 +1,4 @@
 {
  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -1,7 +1,4 @@
 {
  "exclude": ["dist", "node_modules", "**/*.test.ts*"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -2,8 +2,7 @@
  "compilerOptions": {
    "paths": {
      "@emotion/core": ["./src/types/emotion-core-stub.d.ts"]
-    },
-    "rootDir": "./src"
+    }
  },
  "exclude": ["**/*.test.ts*"],
  "extends": "./tsconfig.json"
@@ -1,7 +1,4 @@
 {
  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -8,8 +8,7 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "allowJs": true,
-    "rootDirs": ["."],
-    "rootDir": "../.."
+    "rootDirs": ["."]
  },
  "exclude": ["dist/**/*"],
  "include": [
@@ -8,8 +8,5 @@
    "src/querybuilder/testUtils.ts",
    "../../public/test/setupTests.ts"
  ],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -26,6 +26,7 @@ import {
  UnifiedAlertingConfig,
  GrafanaConfig,
  CurrentUserDTO,
+  PluginMetasSpec,
 } from '@grafana/data';

 /**
@@ -266,6 +267,11 @@ export class GrafanaBootConfig {
  listScopesEndpoint = '';

  openFeatureContext: Record<string, unknown> = {};
+  plugins: Record<'apps' | 'panels' | 'datasources', Record<string, PluginMetasSpec>> = {
+    apps: {},
+    datasources: {},
+    panels: {},
+  };

  constructor(
    options: BootData['settings'] & {
@@ -1,7 +1,4 @@
 {
  "exclude": ["dist", "node_modules", "**/*.test.ts*", "../../public/test/setupTests.ts"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -312,7 +312,18 @@ export const handyTestingSchema: Spec = {
        label: 'Custom Variable',
        multi: true,
        name: 'customVar',
-        options: [],
+        options: [
+          {
+            selected: true,
+            text: 'option1',
+            value: 'option1',
+          },
+          {
+            selected: false,
+            text: 'option2',
+            value: 'option2',
+          },
+        ],
        query: 'option1, option2',
        skipUrlSync: false,
        allowCustomValue: true,
@@ -479,18 +490,5 @@ export const handyTestingSchema: Spec = {
        allowCustomValue: true,
      },
    },
-    {
-      kind: 'SwitchVariable',
-      spec: {
-        name: 'switchVar',
-        label: 'Switch Variable',
-        description: 'A switch variable',
-        current: 'false',
-        enabledValue: 'true',
-        disabledValue: 'false',
-        hide: 'dontHide',
-        skipUrlSync: false,
-      },
-    },
  ],
 };
@@ -1,7 +1,4 @@
 {
  "exclude": ["dist/**/*", "**/*.test.ts*"],
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src"
-  }
+  "extends": "./tsconfig.json"
 }
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { useMemo, useState } from 'react';
 import { useMeasure } from 'react-use';
-import AutoSizer, { type Size } from 'react-virtualized-auto-sizer';
+import AutoSizer from 'react-virtualized-auto-sizer';

 import { GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
@@ -61,7 +61,7 @@ export function RawEditor({ db, query, onChange, onRunQuery, onValidate, queryTo
  const renderEditor = (standalone = false) => {
    return standalone ? (
      <AutoSizer>
-        {({ width, height }: Size) => {
+        {({ width, height }) => {
          return renderQueryEditor(width, height);
        }}
      </AutoSizer>
@@ -8,8 +8,7 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "strict": true,
-    "rootDirs": ["."],
-    "rootDir": "./src"
+    "rootDirs": ["."]
  },
  "exclude": ["dist/**/*"],
  "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"]
@@ -7,8 +7,7 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "rootDirs": ["."],
-    "moduleResolution": "bundler",
-    "rootDir": "./src"
+    "moduleResolution": "bundler"
  },
  "ts-node": {
    "compilerOptions": {
@@ -3,8 +3,7 @@
    "paths": {
      "@emotion/core": ["./src/types/emotion-core-stub.d.ts"],
      "@grafana/ui": ["."]
-    },
-    "rootDir": "./src"
+    }
  },
  "exclude": [
    "**/*.story.tsx",
@@ -198,7 +198,7 @@ func NewAPIService(ac authlib.AccessClient, features featuremgmt.FeatureToggles,
 }

 func (b *DashboardsAPIBuilder) GetGroupVersions() []schema.GroupVersion {
-	if featuremgmt.AnyEnabled(b.features, featuremgmt.FlagDashboardNewLayouts, featuremgmt.FlagKubernetesDashboardsV2) {
+	if featuremgmt.AnyEnabled(b.features, featuremgmt.FlagDashboardNewLayouts) {
 		// If dashboards v2 is enabled, we want to use v2beta1 as the default API version.
 		return []schema.GroupVersion{
 			dashv2beta1.DashboardResourceInfo.GroupVersion(),
@@ -346,12 +346,6 @@ func (b *IdentityAccessManagementAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *ge
 		if err != nil {
 			return err
 		}
-		if enableZanzanaSync {
-			b.logger.Info("Enabling hooks for RoleBinding to sync to Zanzana")
-			roleBindingStore.AfterCreate = b.AfterRoleBindingCreate
-			roleBindingStore.AfterDelete = b.AfterRoleBindingDelete
-			roleBindingStore.BeginUpdate = b.BeginRoleBindingUpdate
-		}
 		storage[iamv0.RoleBindingInfo.StoragePath()] = roleBindingStore
 	}
 	//nolint:staticcheck // not yet migrated to OpenFeature
@@ -1,302 +0,0 @@
-package iam
-
-import (
-	"context"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/registry/generic/registry"
-
-	iamv0 "github.com/grafana/grafana/apps/iam/pkg/apis/iam/v0alpha1"
-	v1 "github.com/grafana/grafana/pkg/services/authz/proto/v1"
-)
-
-const resourceType = "rolebinding"
-
-// AfterRoleBindingCreate is a post-create hook that writes the role binding to Zanzana (openFGA)
-func (b *IdentityAccessManagementAPIBuilder) AfterRoleBindingCreate(obj runtime.Object, _ *metav1.CreateOptions) {
-	if b.zClient == nil {
-		return
-	}
-
-	rb, ok := obj.(*iamv0.RoleBinding)
-	if !ok {
-		b.logger.Error("failed to convert object to RoleBinding type", "object", obj)
-		return
-	}
-
-	operation := "create"
-
-	// Grab a ticket to write to Zanzana
-	// This limits the amount of concurrent connections to Zanzana
-	wait := time.Now()
-	b.zTickets <- true
-	hooksWaitHistogram.WithLabelValues(resourceType, operation).Observe(time.Since(wait).Seconds())
-
-	go func(rb *iamv0.RoleBinding) {
-		start := time.Now()
-		status := "success"
-
-		defer func() {
-			// Release the ticket after write is done
-			<-b.zTickets
-			// Record operation duration and count
-			hooksDurationHistogram.WithLabelValues(resourceType, operation, status).Observe(time.Since(start).Seconds())
-		}()
-
-		b.logger.Debug("writing role binding to zanzana",
-			"namespace", rb.Namespace,
-			"name", rb.Name,
-			"subject", rb.Spec.Subject.Name,
-			"roleRefs", rb.Spec.RoleRefs,
-		)
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultWriteTimeout)
-		defer cancel()
-
-		operations := make([]*v1.MutateOperation, 0, len(rb.Spec.RoleRefs))
-		for _, roleRef := range rb.Spec.RoleRefs {
-			operations = append(operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_CreateRoleBinding{
-					CreateRoleBinding: &v1.CreateRoleBindingOperation{
-						SubjectKind: string(rb.Spec.Subject.Kind),
-						SubjectName: rb.Spec.Subject.Name,
-						RoleKind:    string(roleRef.Kind),
-						RoleName:    roleRef.Name,
-					},
-				},
-			})
-		}
-
-		if len(operations) == 0 {
-			return
-		}
-
-		err := b.zClient.Mutate(ctx, &v1.MutateRequest{
-			Namespace:  rb.Namespace,
-			Operations: operations,
-		})
-
-		if err != nil {
-			status = "failure"
-			b.logger.Error("failed to write role binding to zanzana",
-				"err", err,
-				"namespace", rb.Namespace,
-				"name", rb.Name,
-				"subject", rb.Spec.Subject.Name,
-				"roleRefs", rb.Spec.RoleRefs,
-			)
-		}
-	}(rb.DeepCopy()) // Pass a copy of the object
-}
-
-// AfterRoleBindingDelete is a post-delete hook that removes the role binding from Zanzana (openFGA)
-func (b *IdentityAccessManagementAPIBuilder) AfterRoleBindingDelete(obj runtime.Object, _ *metav1.DeleteOptions) {
-	if b.zClient == nil {
-		return
-	}
-
-	rb, ok := obj.(*iamv0.RoleBinding)
-	if !ok {
-		b.logger.Error("failed to convert object to RoleBinding type", "object", obj)
-		return
-	}
-
-	operation := "delete"
-
-	// Grab a ticket to write to Zanzana
-	// This limits the amount of concurrent connections to Zanzana
-	wait := time.Now()
-	b.zTickets <- true
-	hooksWaitHistogram.WithLabelValues(resourceType, operation).Observe(time.Since(wait).Seconds())
-
-	go func(rb *iamv0.RoleBinding) {
-		start := time.Now()
-		status := "success"
-
-		defer func() {
-			// Release the ticket after write is done
-			<-b.zTickets
-			// Record operation duration and count
-			hooksDurationHistogram.WithLabelValues(resourceType, operation, status).Observe(time.Since(start).Seconds())
-		}()
-
-		b.logger.Debug("deleting role binding from zanzana",
-			"namespace", rb.Namespace,
-			"name", rb.Name,
-			"subject", rb.Spec.Subject.Name,
-			"roleRefs", rb.Spec.RoleRefs,
-		)
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultWriteTimeout)
-		defer cancel()
-
-		operations := make([]*v1.MutateOperation, 0, len(rb.Spec.RoleRefs))
-		for _, roleRef := range rb.Spec.RoleRefs {
-			operations = append(operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_DeleteRoleBinding{
-					DeleteRoleBinding: &v1.DeleteRoleBindingOperation{
-						SubjectKind: string(rb.Spec.Subject.Kind),
-						SubjectName: rb.Spec.Subject.Name,
-						RoleKind:    string(roleRef.Kind),
-						RoleName:    roleRef.Name,
-					},
-				},
-			})
-		}
-
-		if len(operations) == 0 {
-			return
-		}
-
-		err := b.zClient.Mutate(ctx, &v1.MutateRequest{
-			Namespace:  rb.Namespace,
-			Operations: operations,
-		})
-
-		if err != nil {
-			status = "failure"
-			b.logger.Error("failed to delete role binding from zanzana",
-				"err", err,
-				"namespace", rb.Namespace,
-				"name", rb.Name,
-				"subject", rb.Spec.Subject.Name,
-				"roleRefs", rb.Spec.RoleRefs,
-			)
-		}
-	}(rb.DeepCopy()) // Pass a copy of the object
-}
-
-// BeginRoleBindingUpdate is a pre-update hook that prepares zanzana updates.
-// It performs the zanzana write after K8s update succeeds.
-func (b *IdentityAccessManagementAPIBuilder) BeginRoleBindingUpdate(ctx context.Context, obj, oldObj runtime.Object, options *metav1.UpdateOptions) (registry.FinishFunc, error) {
-	if b.zClient == nil {
-		return nil, nil
-	}
-
-	// Extract role bindings from both old and new objects
-	oldRB, ok := oldObj.(*iamv0.RoleBinding)
-	if !ok {
-		return nil, nil
-	}
-
-	newRB, ok := obj.(*iamv0.RoleBinding)
-	if !ok {
-		return nil, nil
-	}
-
-	if oldRB.Spec.Subject.Name == newRB.Spec.Subject.Name && roleRefsEqual(oldRB.Spec.RoleRefs, newRB.Spec.RoleRefs) {
-		return nil, nil // No changes to the role binding
-	}
-
-	if newRB.Spec.Subject.Name == "" {
-		b.logger.Error("invalid role binding",
-			"namespace", newRB.Namespace,
-			"name", newRB.Name,
-			"subject", newRB.Spec.Subject.Name,
-			"roleRefs", newRB.Spec.RoleRefs,
-		)
-		return nil, nil
-	}
-
-	// Return a finish function that performs the zanzana write only on success
-	return func(ctx context.Context, success bool) {
-		if !success {
-			return
-		}
-
-		wait := time.Now()
-		b.zTickets <- true
-		hooksWaitHistogram.WithLabelValues(resourceType, "update").Observe(time.Since(wait).Seconds())
-
-		go func() {
-			start := time.Now()
-			status := "success"
-
-			defer func() {
-				<-b.zTickets
-				// Record operation duration and count
-				hooksDurationHistogram.WithLabelValues(resourceType, "update", status).Observe(time.Since(start).Seconds())
-			}()
-
-			b.logger.Debug("updating role binding in zanzana",
-				"namespace", newRB.Namespace,
-				"name", newRB.Name,
-				"oldSubject", oldRB.Spec.Subject.Name,
-				"newSubject", newRB.Spec.Subject.Name,
-				"oldRoleRefs", oldRB.Spec.RoleRefs,
-				"newRoleRefs", newRB.Spec.RoleRefs,
-			)
-
-			ctx, cancel := context.WithTimeout(context.Background(), defaultWriteTimeout)
-			defer cancel()
-
-			operations := make([]*v1.MutateOperation, 0, len(oldRB.Spec.RoleRefs))
-			for _, roleRef := range oldRB.Spec.RoleRefs {
-				operations = append(operations, &v1.MutateOperation{
-					Operation: &v1.MutateOperation_DeleteRoleBinding{
-						DeleteRoleBinding: &v1.DeleteRoleBindingOperation{
-							SubjectKind: string(oldRB.Spec.Subject.Kind),
-							SubjectName: oldRB.Spec.Subject.Name,
-							RoleKind:    string(roleRef.Kind),
-							RoleName:    roleRef.Name,
-						},
-					},
-				})
-			}
-			for _, roleRef := range newRB.Spec.RoleRefs {
-				operations = append(operations, &v1.MutateOperation{
-					Operation: &v1.MutateOperation_CreateRoleBinding{
-						CreateRoleBinding: &v1.CreateRoleBindingOperation{
-							SubjectKind: string(newRB.Spec.Subject.Kind),
-							SubjectName: newRB.Spec.Subject.Name,
-							RoleKind:    string(roleRef.Kind),
-							RoleName:    roleRef.Name,
-						},
-					},
-				})
-			}
-
-			// Only make the request if there are deletes or writes
-			if len(operations) == 0 {
-				b.logger.Debug("no role bindings to update in zanzana", "namespace", newRB.Namespace, "name", newRB.Name)
-				return
-			}
-
-			err := b.zClient.Mutate(ctx, &v1.MutateRequest{
-				Namespace:  newRB.Namespace,
-				Operations: operations,
-			})
-			if err != nil {
-				status = "failure"
-				b.logger.Error("failed to update role binding in zanzana",
-					"err", err,
-					"namespace", newRB.Namespace,
-					"name", newRB.Name,
-				)
-			}
-		}()
-	}, nil
-}
-
-func roleRefsEqual(oldRoleRefs, newRoleRefs []iamv0.RoleBindingspecRoleRef) bool {
-	if len(oldRoleRefs) != len(newRoleRefs) {
-		return false
-	}
-
-	oldRoleRefsMap := make(map[string]string)
-	for _, roleRef := range oldRoleRefs {
-		oldRoleRefsMap[roleRef.Name] = string(roleRef.Kind)
-	}
-	for _, roleRef := range newRoleRefs {
-		refKind, ok := oldRoleRefsMap[roleRef.Name]
-		if !ok {
-			return false
-		}
-		if refKind != string(roleRef.Kind) {
-			return false
-		}
-	}
-	return true
-}
@@ -1,448 +0,0 @@
-package iam
-
-import (
-	"context"
-	"slices"
-	"sync"
-	"testing"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/stretchr/testify/require"
-
-	iamv0 "github.com/grafana/grafana/apps/iam/pkg/apis/iam/v0alpha1"
-	"github.com/grafana/grafana/pkg/infra/log"
-	v1 "github.com/grafana/grafana/pkg/services/authz/proto/v1"
-)
-
-func TestAfterRoleBindingCreate(t *testing.T) {
-	var wg sync.WaitGroup
-	b := &IdentityAccessManagementAPIBuilder{
-		logger:   log.NewNopLogger(),
-		zTickets: make(chan bool, 1),
-	}
-
-	t.Run("should create zanzana entry for role binding", func(t *testing.T) {
-		wg.Add(1)
-		roleBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-1",
-				Namespace: "org-1",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-				},
-			},
-		}
-
-		testRoleBinding := func(ctx context.Context, req *v1.MutateRequest) error {
-			defer wg.Done()
-			require.NotNil(t, req)
-			require.NotNil(t, req.Operations)
-			require.Len(t, req.Operations, 1)
-			require.Equal(t, "org-1", req.Namespace)
-
-			expectedOperation := &v1.MutateOperation{
-				Operation: &v1.MutateOperation_CreateRoleBinding{
-					CreateRoleBinding: &v1.CreateRoleBindingOperation{
-						SubjectKind: "user",
-						SubjectName: "user-1",
-						RoleKind:    "role",
-						RoleName:    "role-1",
-					},
-				},
-			}
-
-			actualCreate := req.Operations[0].Operation.(*v1.MutateOperation_CreateRoleBinding).CreateRoleBinding
-			expectedCreate := expectedOperation.Operation.(*v1.MutateOperation_CreateRoleBinding).CreateRoleBinding
-
-			require.Equal(t, expectedCreate.SubjectKind, actualCreate.SubjectKind)
-			require.Equal(t, expectedCreate.SubjectName, actualCreate.SubjectName)
-			require.Equal(t, expectedCreate.RoleKind, actualCreate.RoleKind)
-			require.Equal(t, expectedCreate.RoleName, actualCreate.RoleName)
-
-			return nil
-		}
-
-		b.zClient = &FakeZanzanaClient{mutateCallback: testRoleBinding}
-		b.AfterRoleBindingCreate(&roleBinding, nil)
-		wg.Wait()
-	})
-
-	t.Run("should not write to zanzana when zClient is nil", func(t *testing.T) {
-		builder := &IdentityAccessManagementAPIBuilder{
-			logger:   log.NewNopLogger(),
-			zTickets: make(chan bool, 1),
-			zClient:  nil,
-		}
-
-		roleBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-3",
-				Namespace: "org-3",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-3",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-3",
-					},
-				},
-			},
-		}
-
-		// Should not panic or error when zClient is nil
-		builder.AfterRoleBindingCreate(&roleBinding, nil)
-	})
-}
-
-func TestBeginRoleBindingUpdate(t *testing.T) {
-	var wg sync.WaitGroup
-	b := &IdentityAccessManagementAPIBuilder{
-		logger:   log.NewNopLogger(),
-		zTickets: make(chan bool, 1),
-	}
-
-	t.Run("should update zanzana entry when role binding changed", func(t *testing.T) {
-		wg.Add(1)
-		oldBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-1",
-				Namespace: "org-1",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-foo",
-					},
-					{
-						Kind: "role",
-						Name: "role-2",
-					},
-				},
-			},
-		}
-
-		newBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-1",
-				Namespace: "org-1",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-bar",
-					},
-				},
-			},
-		}
-
-		testRoleBindingUpdate := func(ctx context.Context, req *v1.MutateRequest) error {
-			defer wg.Done()
-			require.NotNil(t, req)
-			require.Equal(t, "org-1", req.Namespace)
-
-			require.NotNil(t, req.Operations)
-			require.Len(t, req.Operations, 3)
-
-			// Should write new binding and delete old one
-			require.True(t, containsOperation(req.Operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_DeleteRoleBinding{
-					DeleteRoleBinding: &v1.DeleteRoleBindingOperation{
-						SubjectKind: "user",
-						SubjectName: "user-1",
-						RoleKind:    "role",
-						RoleName:    "role-foo",
-					},
-				},
-			}))
-
-			require.True(t, containsOperation(req.Operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_CreateRoleBinding{
-					CreateRoleBinding: &v1.CreateRoleBindingOperation{
-						SubjectKind: "user",
-						SubjectName: "user-1",
-						RoleKind:    "role",
-						RoleName:    "role-bar",
-					},
-				},
-			}))
-
-			return nil
-		}
-
-		b.zClient = &FakeZanzanaClient{mutateCallback: testRoleBindingUpdate}
-
-		finishFunc, err := b.BeginRoleBindingUpdate(context.Background(), &newBinding, &oldBinding, nil)
-		require.NoError(t, err)
-		require.NotNil(t, finishFunc)
-
-		finishFunc(context.Background(), true)
-		wg.Wait()
-	})
-
-	t.Run("should return nil finish func when bindings are identical", func(t *testing.T) {
-		oldBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-2",
-				Namespace: "org-2",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-				},
-			},
-		}
-
-		newBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-2",
-				Namespace: "org-2",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-				},
-			},
-		}
-
-		writeCalled := false
-		testNoWriteOnNoChange := func(ctx context.Context, req *v1.MutateRequest) error {
-			writeCalled = true
-			require.Fail(t, "Write should not be called when bindings are identical")
-			return nil
-		}
-
-		b.zClient = &FakeZanzanaClient{mutateCallback: testNoWriteOnNoChange}
-
-		finishFunc, err := b.BeginRoleBindingUpdate(context.Background(), &newBinding, &oldBinding, nil)
-		require.NoError(t, err)
-		require.Nil(t, finishFunc) // Should return nil when bindings are identical
-
-		// Verify write was never called
-		time.Sleep(100 * time.Millisecond)
-		require.False(t, writeCalled, "Write callback should not be called when bindings are identical")
-	})
-
-	t.Run("should return nil finish func when new binding has empty subject name", func(t *testing.T) {
-		oldBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-8",
-				Namespace: "org-8",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-				},
-			},
-		}
-
-		newBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-8",
-				Namespace: "org-8",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "",
-					Name: "", // Empty name - should cause early return
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-				},
-			},
-		}
-
-		writeCalled := false
-		testNoWriteOnInvalidBinding := func(ctx context.Context, req *v1.MutateRequest) error {
-			writeCalled = true
-			require.Fail(t, "Write should not be called when new binding has empty subject name")
-			return nil
-		}
-
-		b.zClient = &FakeZanzanaClient{mutateCallback: testNoWriteOnInvalidBinding}
-
-		finishFunc, err := b.BeginRoleBindingUpdate(context.Background(), &newBinding, &oldBinding, nil)
-		require.NoError(t, err)
-		require.Nil(t, finishFunc) // Should return nil when new binding has empty subject name
-
-		// Verify write was never called
-		time.Sleep(100 * time.Millisecond)
-		require.False(t, writeCalled, "Write callback should not be called when new binding has empty subject name")
-	})
-}
-
-func TestAfterRoleBindingDelete(t *testing.T) {
-	var wg sync.WaitGroup
-	b := &IdentityAccessManagementAPIBuilder{
-		logger:   log.NewNopLogger(),
-		zTickets: make(chan bool, 1),
-	}
-
-	t.Run("should delete zanzana entry for team binding with member permission", func(t *testing.T) {
-		wg.Add(1)
-		roleBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-1",
-				Namespace: "org-1",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-1",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-1",
-					},
-					{
-						Kind: "role",
-						Name: "role-2",
-					},
-				},
-			},
-		}
-
-		testRoleBindingDelete := func(ctx context.Context, req *v1.MutateRequest) error {
-			defer wg.Done()
-			require.NotNil(t, req)
-			require.Equal(t, "org-1", req.Namespace)
-
-			// Should have deletes but no writes
-			require.NotNil(t, req.Operations)
-			require.Len(t, req.Operations, 2)
-			require.True(t, containsOperation(req.Operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_DeleteRoleBinding{
-					DeleteRoleBinding: &v1.DeleteRoleBindingOperation{
-						SubjectKind: "user",
-						SubjectName: "user-1",
-						RoleKind:    "role",
-						RoleName:    "role-1",
-					},
-				},
-			}))
-			require.True(t, containsOperation(req.Operations, &v1.MutateOperation{
-				Operation: &v1.MutateOperation_DeleteRoleBinding{
-					DeleteRoleBinding: &v1.DeleteRoleBindingOperation{
-						SubjectKind: "user",
-						SubjectName: "user-1",
-						RoleKind:    "role",
-						RoleName:    "role-2",
-					},
-				},
-			}))
-
-			return nil
-		}
-
-		b.zClient = &FakeZanzanaClient{mutateCallback: testRoleBindingDelete}
-		b.AfterRoleBindingDelete(&roleBinding, nil)
-		wg.Wait()
-	})
-
-	t.Run("should not delete from zanzana when zClient is nil", func(t *testing.T) {
-		builder := &IdentityAccessManagementAPIBuilder{
-			logger:   log.NewNopLogger(),
-			zTickets: make(chan bool, 1),
-			zClient:  nil,
-		}
-
-		roleBinding := iamv0.RoleBinding{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "binding-3",
-				Namespace: "org-3",
-			},
-			Spec: iamv0.RoleBindingSpec{
-				Subject: iamv0.RoleBindingspecSubject{
-					Kind: "user",
-					Name: "user-3",
-				},
-				RoleRefs: []iamv0.RoleBindingspecRoleRef{
-					{
-						Kind: "role",
-						Name: "role-3",
-					},
-				},
-			},
-		}
-
-		// Should not panic or error when zClient is nil
-		builder.AfterRoleBindingDelete(&roleBinding, nil)
-	})
-}
-
-func containsOperation(operations []*v1.MutateOperation, operation *v1.MutateOperation) bool {
-	return slices.ContainsFunc(operations, func(o *v1.MutateOperation) bool {
-		switch operation.Operation.(type) {
-		case *v1.MutateOperation_DeleteRoleBinding:
-			deleteOperation := operation.Operation.(*v1.MutateOperation_DeleteRoleBinding)
-			deleteO, ok := o.Operation.(*v1.MutateOperation_DeleteRoleBinding)
-			if !ok {
-				return false
-			}
-			return deleteO.DeleteRoleBinding.SubjectKind == deleteOperation.DeleteRoleBinding.SubjectKind &&
-				deleteO.DeleteRoleBinding.SubjectName == deleteOperation.DeleteRoleBinding.SubjectName &&
-				deleteO.DeleteRoleBinding.RoleKind == deleteOperation.DeleteRoleBinding.RoleKind &&
-				deleteO.DeleteRoleBinding.RoleName == deleteOperation.DeleteRoleBinding.RoleName
-		case *v1.MutateOperation_CreateRoleBinding:
-			createOperation := operation.Operation.(*v1.MutateOperation_CreateRoleBinding)
-			createO, ok := o.Operation.(*v1.MutateOperation_CreateRoleBinding)
-			if !ok {
-				return false
-			}
-			return createO.CreateRoleBinding.SubjectKind == createOperation.CreateRoleBinding.SubjectKind &&
-				createO.CreateRoleBinding.SubjectName == createOperation.CreateRoleBinding.SubjectName &&
-				createO.CreateRoleBinding.RoleKind == createOperation.CreateRoleBinding.RoleKind &&
-				createO.CreateRoleBinding.RoleName == createOperation.CreateRoleBinding.RoleName
-		}
-		return false
-	})
-}
@@ -172,8 +172,6 @@ func (b *APIBuilder) handleSettings(w http.ResponseWriter, r *http.Request) {

 	for i, val := range all {
 		branch := val.Branch()
-		url := val.URL()
-		path := val.Path()

 		settings.Items[i] = provisioning.RepositoryView{
 			Name:      val.Name,
@@ -181,8 +179,6 @@ func (b *APIBuilder) handleSettings(w http.ResponseWriter, r *http.Request) {
 			Type:      val.Spec.Type,
 			Target:    val.Spec.Sync.Target,
 			Branch:    branch,
-			URL:       url,
-			Path:      path,
 			Workflows: val.Spec.Workflows,
 		}
 	}
@@ -24,6 +24,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/apiserver"
 	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 )

 var (
@@ -42,6 +44,8 @@ type AppInstaller struct {
 func RegisterAppInstaller(
 	cfgProvider configprovider.ConfigProvider,
 	restConfigProvider apiserver.RestConfigProvider,
+	pluginStore pluginstore.Store,
+	pluginAssetsService *pluginassets.Service,
 ) (*AppInstaller, error) {
 	grafanaComAPIURL := os.Getenv("GRAFANA_COM_API_URL")
 	if grafanaComAPIURL == "" {
@@ -50,7 +54,8 @@ func RegisterAppInstaller(

 	coreProvider := meta.NewCoreProvider()
 	cloudProvider := meta.NewCloudProvider(grafanaComAPIURL)
-	metaProviderManager := meta.NewProviderManager(coreProvider, cloudProvider)
+	localProvider := meta.NewLocalProvider(pluginStore, pluginAssetsService)
+	metaProviderManager := meta.NewProviderManager(localProvider, coreProvider, cloudProvider)
 	specificConfig := &pluginsapp.PluginAppConfig{
 		MetaProviderManager: metaProviderManager,
 	}
@@ -788,7 +788,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	if err != nil {
 		return nil, err
 	}
-	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider)
+	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, pluginassetsService)
 	if err != nil {
 		return nil, err
 	}
@@ -1438,7 +1438,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	if err != nil {
 		return nil, err
 	}
-	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider)
+	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, pluginassetsService)
 	if err != nil {
 		return nil, err
 	}
@@ -15,9 +15,6 @@ type FakeDataSourceService struct {
 	lastID                int64
 	DataSources           []*datasources.DataSource
 	SimulatePluginFailure bool
-
-	// UID -> Headers
-	DataSourceHeaders map[string]http.Header
 }

 var _ datasources.DataSourceService = &FakeDataSourceService{}
@@ -155,5 +152,5 @@ func (s *FakeDataSourceService) DecryptedPassword(ctx context.Context, ds *datas
 }

 func (s *FakeDataSourceService) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (http.Header, error) {
-	return s.DataSourceHeaders[ds.UID], nil
+	return nil, nil
 }
@@ -579,13 +579,6 @@ var (
 			FrontendOnly: false, // The restore backend feature changes behavior based on this flag
 			Owner:        grafanaDashboardsSquad,
 		},
-		{
-			Name:         "kubernetesDashboardsV2",
-			Description:  "Use the v2 kubernetes API in the frontend for dashboards",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaDashboardsSquad,
-		},
 		{
 			Name:         "dashboardUndoRedo",
 			Description:  "Enables undo/redo in dynamic dashboards",
@@ -1322,7 +1315,7 @@ var (
 			Name:        "elasticsearchImprovedParsing",
 			Description: "Enables less memory intensive Elasticsearch result parsing",
 			Stage:       FeatureStageExperimental,
-			Owner:       grafanaPartnerPluginsSquad,
+			Owner:       awsDatasourcesSquad,
 		},
 		{
 			Name:            "datasourceConnectionsTab",
@@ -1970,13 +1963,6 @@ var (
 			RequiresRestart: false,
 			HideFromDocs:    false,
 		},
-		{
-			Name:            "kubernetesAlertingHistorian",
-			Description:     "Adds support for Kubernetes alerting historian APIs",
-			Stage:           FeatureStageExperimental,
-			Owner:           grafanaAlertingSquad,
-			RequiresRestart: true,
-		},
 	}
 )

@@ -80,7 +80,6 @@ dashboardSceneForViewers,GA,@grafana/dashboards-squad,false,false,true
 dashboardSceneSolo,GA,@grafana/dashboards-squad,false,false,true
 dashboardScene,GA,@grafana/dashboards-squad,false,false,true
 dashboardNewLayouts,experimental,@grafana/dashboards-squad,false,false,false
-kubernetesDashboardsV2,experimental,@grafana/dashboards-squad,false,false,false
 dashboardUndoRedo,experimental,@grafana/dashboards-squad,false,false,true
 unlimitedLayoutsNesting,experimental,@grafana/dashboards-squad,false,false,true
 perPanelNonApplicableDrilldowns,experimental,@grafana/dashboards-squad,false,false,true
@@ -182,7 +181,7 @@ k8SFolderMove,experimental,@grafana/search-and-storage,false,false,false
 improvedExternalSessionHandlingSAML,GA,@grafana/identity-access-team,false,false,false
 teamHttpHeadersTempo,experimental,@grafana/identity-access-team,false,false,false
 grafanaAdvisor,privatePreview,@grafana/plugins-platform-backend,false,false,false
-elasticsearchImprovedParsing,experimental,@grafana/partner-datasources,false,false,false
+elasticsearchImprovedParsing,experimental,@grafana/aws-datasources,false,false,false
 datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true
 fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false
 newLogsPanel,GA,@grafana/observability-logs,false,false,true
@@ -267,4 +266,3 @@ transformationsEmptyPlaceholder,preview,@grafana/datapro,false,false,true
 ttlPluginInstanceManager,experimental,@grafana/plugins-platform-backend,false,false,true
 lokiQueryLimitsContext,experimental,@grafana/observability-logs,false,false,true
 rudderstackUpgrade,experimental,@grafana/grafana-frontend-platform,false,false,true
-kubernetesAlertingHistorian,experimental,@grafana/alerting-squad,false,true,false
@@ -259,10 +259,6 @@ const (
 	// Enables experimental new dashboard layouts
 	FlagDashboardNewLayouts = "dashboardNewLayouts"

-	// FlagKubernetesDashboardsV2
-	// Use the v2 kubernetes API in the frontend for dashboards
-	FlagKubernetesDashboardsV2 = "kubernetesDashboardsV2"
-
 	// FlagPdfTables
 	// Enables generating table data as PDF in reporting
 	FlagPdfTables = "pdfTables"
@@ -761,8 +757,4 @@ const (
 	// FlagAwsDatasourcesHttpProxy
 	// Enables http proxy settings for aws datasources
 	FlagAwsDatasourcesHttpProxy = "awsDatasourcesHttpProxy"
-
-	// FlagKubernetesAlertingHistorian
-	// Adds support for Kubernetes alerting historian APIs
-	FlagKubernetesAlertingHistorian = "kubernetesAlertingHistorian"
 )
@@ -1214,16 +1214,13 @@
    {
      "metadata": {
        "name": "elasticsearchImprovedParsing",
-        "resourceVersion": "1764260048941",
-        "creationTimestamp": "2025-01-15T17:05:54Z",
-        "annotations": {
-          "grafana.app/updatedTimestamp": "2025-11-27 16:14:08.941633 +0000 UTC"
-        }
+        "resourceVersion": "1763734583253",
+        "creationTimestamp": "2025-01-15T17:05:54Z"
      },
      "spec": {
        "description": "Enables less memory intensive Elasticsearch result parsing",
        "stage": "experimental",
-        "codeowner": "@grafana/partner-datasources"
+        "codeowner": "@grafana/aws-datasources"
      }
    },
    {
@@ -1793,19 +1790,6 @@
        "requiresRestart": true
      }
    },
-    {
-      "metadata": {
-        "name": "kubernetesAlertingHistorian",
-        "resourceVersion": "1764257713773",
-        "creationTimestamp": "2025-11-27T15:35:13Z"
-      },
-      "spec": {
-        "description": "Adds support for Kubernetes alerting historian APIs",
-        "stage": "experimental",
-        "codeowner": "@grafana/alerting-squad",
-        "requiresRestart": true
-      }
-    },
    {
      "metadata": {
        "name": "kubernetesAlertingRules",
@@ -1927,18 +1911,6 @@
        "expression": "true"
      }
    },
-    {
-      "metadata": {
-        "name": "kubernetesDashboardsV2",
-        "resourceVersion": "1764236054307",
-        "creationTimestamp": "2025-11-27T09:34:14Z"
-      },
-      "spec": {
-        "description": "Use the v2 kubernetes API in the frontend for dashboards",
-        "stage": "experimental",
-        "codeowner": "@grafana/dashboards-squad"
-      }
-    },
    {
      "metadata": {
        "name": "kubernetesExternalGroupMapping",
@@ -3575,22 +3547,6 @@
        "expression": "true"
      }
    },
-    {
-      "metadata": {
-        "name": "v2DashboardAPIVersion",
-        "resourceVersion": "1762457740470",
-        "creationTimestamp": "2025-11-06T19:22:05Z",
-        "deletionTimestamp": "2025-11-27T09:34:14Z",
-        "annotations": {
-          "grafana.app/updatedTimestamp": "2025-11-06 19:35:40.470587 +0000 UTC"
-        }
-      },
-      "spec": {
-        "description": "Enables the v2 dashboard API version",
-        "stage": "experimental",
-        "codeowner": "@grafana/dashboards-squad"
-      }
-    },
    {
      "metadata": {
        "name": "vizActionsAuth",
@@ -239,30 +239,6 @@

        const CHECK_INTERVAL = 1 * 1000;

-        function getCookie(name) {
-          const cookies = document.cookie.split(";").map(c => c.trim());
-
-          for (const cookie of cookies) {
-            if (cookie.startsWith(name + "=")) {
-              return cookie.substring(name.length + 1);
-            }
-          }
-
-          return null;
-        }
-
-        function getSessionExpiration() {
-          const value = getCookie("grafana_session_expiry") || "0";
-          const realExpiresSeconds = parseInt(value, 10);
-          const expiresSeconds = Math.max(realExpiresSeconds - 10, 0); // Rotate 10s before the real expiration
-          const expiration = new Date(expiresSeconds * 1000);
-          return expiration;
-        }
-
-        async function rotateSession() {
-          await fetch('/api/user/auth-tokens/rotate', { method: 'POST' });
-        }
-
        /**
         * Fetches boot data from the server. If it returns undefined, it should be retried later.
         * Will return a rejected promise on unrecoverable errors.
@@ -319,19 +295,6 @@
        function loadBootData() {
          return new Promise((resolve, reject) => {
            const attemptFetch = async () => {
-              try {
-                const sessionExpiration = getSessionExpiration();
-                const now = new Date();
-
-                // If the session has expired, don't continue trying to fetch boot data
-                if (now >= sessionExpiration) {
-                  await rotateSession();
-                }
-              } catch (error) {
-                // Just ignore any errors in session rotation. The user can just log in again.
-                console.warn("Failed to rotate session", error);
-              }
-
              try {
                const bootData = await fetchBootData();

@@ -4,14 +4,11 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"net/url"
-	"strconv"
 	"strings"
 	"time"

 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/infra/log"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
@@ -27,64 +24,55 @@ type HistorySrv struct {
 	hist   Historian
 }

+const labelQueryPrefix = "labels_"
+
 func (srv *HistorySrv) RouteQueryStateHistory(c *contextmodel.ReqContext) response.Response {
-	query, err := ParseHistoryQuery(c.OrgID, c.SignedInUser, c.Req.URL.Query())
-	if err != nil {
-		return ErrResp(http.StatusBadRequest, err, "")
+	from := c.QueryInt64("from")
+	to := c.QueryInt64("to")
+	limit := c.QueryInt("limit")
+	ruleUID := c.Query("ruleUID")
+	dashUID := c.Query("dashboardUID")
+	panelID := c.QueryInt64("panelID")
+
+	previous := c.Query("previous")
+	if previous != "" {
+		_, err := eval.ParseStateString(previous)
+		if err != nil {
+			return ErrResp(http.StatusBadRequest, fmt.Errorf("invalid previous state filter: %w", err), "")
+		}
 	}

+	current := c.Query("current")
+	if current != "" {
+		_, err := eval.ParseStateString(current)
+		if err != nil {
+			return ErrResp(http.StatusBadRequest, fmt.Errorf("invalid current state filter: %w", err), "")
+		}
+	}
+
+	labels := make(map[string]string)
+	for k, v := range c.Req.URL.Query() {
+		if strings.HasPrefix(k, labelQueryPrefix) {
+			labels[k[len(labelQueryPrefix):]] = v[0]
+		}
+	}
+
+	query := models.HistoryQuery{
+		RuleUID:      ruleUID,
+		OrgID:        c.GetOrgID(),
+		DashboardUID: dashUID,
+		PanelID:      panelID,
+		Previous:     previous,
+		Current:      current,
+		SignedInUser: c.SignedInUser,
+		From:         time.Unix(from, 0),
+		To:           time.Unix(to, 0),
+		Limit:        limit,
+		Labels:       labels,
+	}
 	frame, err := srv.hist.Query(c.Req.Context(), query)
 	if err != nil {
 		return ErrResp(http.StatusInternalServerError, err, "")
 	}
 	return response.JSON(http.StatusOK, frame)
 }
-
-const labelQueryPrefix = "labels_"
-
-// ParseHistoryQuery parses a HistoryQuery from request parameters.
-func ParseHistoryQuery(orgID int64, user identity.Requester, query url.Values) (models.HistoryQuery, error) {
-	from, _ := strconv.ParseInt(query.Get("from"), 10, 64)
-	to, _ := strconv.ParseInt(query.Get("to"), 10, 64)
-	limit, _ := strconv.Atoi(query.Get("limit"))
-	ruleUID := query.Get("ruleUID")
-	dashUID := query.Get("dashboardUID")
-	panelID, _ := strconv.ParseInt(query.Get("panelID"), 10, 64)
-
-	previous := query.Get("previous")
-	if previous != "" {
-		_, err := eval.ParseStateString(previous)
-		if err != nil {
-			return models.HistoryQuery{}, fmt.Errorf("invalid previous state filter: %w", err)
-		}
-	}
-
-	current := query.Get("current")
-	if current != "" {
-		_, err := eval.ParseStateString(current)
-		if err != nil {
-			return models.HistoryQuery{}, fmt.Errorf("invalid current state filter: %w", err)
-		}
-	}
-
-	labels := make(map[string]string)
-	for k, v := range query {
-		if strings.HasPrefix(k, labelQueryPrefix) {
-			labels[k[len(labelQueryPrefix):]] = v[0]
-		}
-	}
-
-	return models.HistoryQuery{
-		RuleUID:      ruleUID,
-		OrgID:        orgID,
-		DashboardUID: dashUID,
-		PanelID:      panelID,
-		Previous:     previous,
-		Current:      current,
-		SignedInUser: user,
-		From:         time.Unix(from, 0),
-		To:           time.Unix(to, 0),
-		Limit:        limit,
-		Labels:       labels,
-	}, nil
-}
@@ -205,23 +205,11 @@ func (w *DatasourceWriter) makeWriter(ctx context.Context, orgID int64, dsUID st
 		return nil, err
 	}

-	// We need to add the writer headers (valid for any data source) and any data-source-specific headers.
 	headers := make(http.Header)
 	for k, v := range w.cfg.CustomHeaders {
 		headers.Add(k, v)
 	}

-	dsHeaders, err := w.datasources.CustomHeaders(ctx, ds)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get headers for data source: %w", err)
-	}
-
-	for k, values := range dsHeaders {
-		for _, v := range values {
-			headers.Add(k, v)
-		}
-	}
-
 	var backend backendType
 	if dsUID == string(grafanaCloudPromType) {
 		backend = grafanaCloudPromType
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hugo Häggmark	731d776a99	chore: refactor types and fix broken test	2025-12-03 13:42:58 +01:00
Hugo Häggmark	c308b3bac4	chore: fix broken tests	2025-12-03 13:16:30 +01:00
Hugo Häggmark	c154654162	chore: preload plugins from new api	2025-12-03 11:32:11 +01:00
Will Browne	1fe9a38a2a	add angular + translations	2025-11-27 15:04:20 +00:00
Will Browne	59bf7896f4	Merge branch 'main' into wb/pluginmeta-local	2025-11-27 10:40:45 +00:00
Will Browne	4b4ad544a8	Merge branch 'main' into wb/pluginmeta-local	2025-11-26 16:08:53 +00:00
Will Browne	7e3289f2c9	Merge branch 'main' into wb/pluginmeta-local	2025-11-26 12:24:17 +00:00
Will Browne	0d0b5b757b	fix test + lint issues	2025-11-26 12:14:50 +00:00
Will Browne	c49261cce2	fix another test	2025-11-26 11:54:12 +00:00
Will Browne	d5efce72f3	fix tests	2025-11-26 11:48:13 +00:00
Will Browne	881c81f0b3	flesh out local for demo	2025-11-26 11:28:16 +00:00