chore(tsgo): clean up some more types, disable js typechecks

chore(typescript): appease ts-go stricter type inference in callbacks
build(typescript): update tsconfigs to work with tsgo
2025-12-01 14:58:45 +01:00 · 2025-12-01 12:28:44 +01:00 · 2025-11-28 10:03:13 +01:00 · 2025-11-28 10:02:30 +01:00 · 2025-11-28 07:47:59 +02:00 · 2025-11-27 17:19:38 -08:00
219 changed files with 6135 additions and 2611 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).
+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).

 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,8 +22,6 @@ 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
@@ -34,20 +32,15 @@ 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
@@ -128,15 +121,11 @@ 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
@@ -153,7 +142,6 @@ 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
@@ -171,8 +159,6 @@ 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,11 +1,7 @@
 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=
@@ -13,8 +9,6 @@ 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=
@@ -37,18 +31,12 @@ 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=
@@ -64,16 +52,12 @@ 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=
@@ -326,8 +310,6 @@ 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=
@@ -342,12 +324,6 @@ 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=
@@ -421,10 +397,6 @@ 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=
@@ -474,12 +446,8 @@ 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,29 +1,12 @@
 package plugins

 pluginMetaV0Alpha1: {
-	kind:   "PluginMeta"
+	kind: "PluginMeta"
 	plural: "pluginsmeta"
-	scope:  "Namespaced"
+	scope: "Namespaced"
 	schema: {
 		spec: {
-			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]
+			pluginJSON: #JSONData,
 		}
 	}
 }
@@ -207,20 +207,13 @@ func NewPluginMetaExtensions() *PluginMetaExtensions {

 // +k8s:openapi-gen=true
 type PluginMetaSpec struct {
-	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"`
+	PluginJSON PluginMetaJSONData `json:"pluginJSON"`
 }

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

@@ -418,40 +411,6 @@ 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

@@ -512,33 +471,3 @@ 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,47 +87,8 @@ 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: spec,
+		Meta: gcomMeta.JSON,
 		TTL:  p.ttl,
 	}, nil
 }
@@ -135,25 +96,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"`
-	VersionSignatureType   string                             `json:"versionSignatureType"`
-	VersionSignedByOrg     string                             `json:"versionSignedByOrg"`
-	VersionSignedByOrgName string                             `json:"versionSignedByOrgName"`
-	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"`
+	SignatureType   string                             `json:"signatureType"`
+	SignedByOrg     string                             `json:"signedByOrg"`
+	SignedByOrgName string                             `json:"signedByOrgName"`
+	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.PluginJson)
+		assert.Equal(t, expectedMeta, result.Meta)
 		assert.Equal(t, defaultCloudTTL, result.TTL)
 	})

@@ -1,585 +0,0 @@
-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,6 +2,7 @@ package meta

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

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

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

 	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,16 +22,14 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 	t.Run("returns cached plugin when available", func(t *testing.T) {
 		provider := NewCoreProvider()

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

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

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

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

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

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

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

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

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

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

@@ -232,8 +226,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.PluginJson.Id)
-			assert.Equal(t, "Test Datasource", result.Meta.PluginJson.Name)
+			assert.Equal(t, "test-datasource", result.Meta.Id)
+			assert.Equal(t, "Test Datasource", result.Meta.Name)
 		}
 	})
 }
@@ -1,53 +0,0 @@
-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.PluginMetaSpec
+	meta      pluginsv0alpha1.PluginMetaJSONData
 	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 {
-				return result, nil
+				continue
 			}

 			pm.cacheMu.Lock()
@@ -35,12 +35,10 @@ 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.PluginMetaSpec{
-			PluginJson: pluginsv0alpha1.PluginMetaJSONData{
-				Id:   "test-plugin",
-				Name: "Test Plugin",
-				Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
-			},
+		cachedMeta := pluginsv0alpha1.PluginMetaJSONData{
+			Id:   "test-plugin",
+			Name: "Test Plugin",
+			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
 		}

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

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

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

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

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

-	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,
-			},
+	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,
 		}

-		provider := &mockProvider{
+		provider1 := &mockProvider{
 			getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {
 				return &Result{
 					Meta: zeroTTLMeta,
@@ -130,30 +127,37 @@ 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(provider)
+		pm := NewProviderManager(provider1, provider2)

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

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

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

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

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

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

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

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

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

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

 func TestProviderManager_cleanupExpired(t *testing.T) {
 	t.Run("removes expired entries", func(t *testing.T) {
-		validMeta := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}}
-		expiredMeta1 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}}
-		expiredMeta2 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}}
+		validMeta := pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}
+		expiredMeta1 := pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}
+		expiredMeta2 := 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.PluginMetaSpec
+	Meta pluginsv0alpha1.PluginMetaJSONData
 	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 PluginMetaSpec and its recommended TTL.
+	// Returns the Result containing the PluginMetaJSONData 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 := createPluginMetaFromSpec(result.Meta, plugin.Name, plugin.Namespace)
+		pluginMeta := createPluginMetaFromPluginMetaJSONData(result.Meta, plugin.Name, plugin.Namespace)
 		metaItems = append(metaItems, *pluginMeta)
 	}

@@ -174,17 +174,19 @@ 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 createPluginMetaFromSpec(result.Meta, name, ns.Value), nil
+	return createPluginMetaFromPluginMetaJSONData(result.Meta, name, ns.Value), nil
 }

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

 	// Set the GroupVersionKind
@@ -43,6 +43,12 @@ 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,6 +1690,20 @@ 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,6 +5,7 @@ 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)
@@ -0,0 +1,160 @@
+# 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,6 +4,8 @@ import { test, expect, E2ESelectorGroups, DashboardPage, DashboardPageArgs } fro

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

+import { checkRepeatedPanelTitles } from './utils';
+
 test.use({
  featureToggles: {
    kubernetesDashboards: true,
@@ -93,7 +95,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/default/dashboards/${uid}`);
+      await request.delete(`/apis/dashboard.grafana.app/v1beta1/namespaces/stacks-12345/dashboards/${uid}`);
    }
  });

@@ -407,4 +409,52 @@ 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,12 +97,18 @@ export async function checkRepeatedPanelTitles(
  dashboardPage: DashboardPage,
  selectors: E2ESelectorGroups,
  title: string,
-  options: Array<string | number>
+  options: Array<string | number>,
+  expectHidden = false
 ) {
  for (const option of options) {
-    await expect(
-      dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(`${title}${option}`))
-    ).toBeVisible();
+    const titleLocator = dashboardPage.getByGrafanaSelector(
+      selectors.components.Panels.Panel.title(`${title}${option}`)
+    );
+    if (expectHidden) {
+      await expect(titleLocator).toBeHidden();
+    } else {
+      await expect(titleLocator).toBeVisible();
+    }
  }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3308,6 +3308,170 @@
          }
        }
      },
+      "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": {
@@ -5091,6 +5255,80 @@
              },
              "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"
+            }
          }
        ]
      }
@@ -5122,6 +5360,39 @@
          "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,4 +1,5 @@
-// @ts-check
+// TODO: Migrate to Typescript.
+// @ts-nocheck
 const emotionPlugin = require('@emotion/eslint-plugin');
 const restrictedGlobals = require('confusing-browser-globals');
 const importPlugin = require('eslint-plugin-import');
@@ -66,6 +66,7 @@
    "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",
@@ -166,6 +167,7 @@
    "@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,10 +110,9 @@ 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,4 +1,7 @@
 {
  "exclude": ["dist", "node_modules", "tests", "**/*.test.ts*", "**/*.story.tsx"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -1581,6 +1581,8 @@ 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:
@@ -1598,6 +1600,8 @@ 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,4 +1,7 @@
 {
  "extends": "./tsconfig.json",
-  "exclude": ["dist", "node_modules", "**/*.test.ts*"]
+  "exclude": ["dist", "node_modules", "**/*.test.ts*"],
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -84,7 +84,6 @@
    "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,8 +91,10 @@ describe('EventBus', () => {
    it('Supports legacy events', () => {
      const bus = new EventBusSrv();
      const events: LegacyEventPayload[] = [];
-      const handler = (event: LegacyEventPayload) => {
-        events.push(event);
+      const handler = (event?: LegacyEventPayload) => {
+        if (event) {
+          events.push(event);
+        }
      };

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

      bus.on(legacyEvent, (event) => {
-        legacyEvents.push(event);
+        if (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: (payload?: T) => void): void;
+  off<T>(event: AppEvent<T> | string, handler: LegacyEventHandler<T>): void;
 }

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

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

 export { type UserStorage } from './types/userStorage';
-export { type PluginMetasResponse, type PluginMetasSpec } from './types/plugin';
@@ -896,6 +896,42 @@ 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,6 +210,8 @@ 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];
@@ -223,13 +225,17 @@ export function getHistogramFields(frame: DataFrame): HistogramFields | undefine
        curMax = curMax * bucketFactor;
        curMin = curMin * bucketFactor;

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

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

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

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

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

 export interface DataSourceGetDrilldownsApplicabilityOptions<TQuery extends DataQuery = DataQuery> {
@@ -361,6 +361,10 @@ 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;
@@ -1189,4 +1193,8 @@ export interface FeatureToggles {
  * @default false
  */
  rudderstackUpgrade?: boolean;
+  /**
+  * Adds support for Kubernetes alerting historian APIs
+  */
+  kubernetesAlertingHistorian?: boolean;
 }
@@ -1,7 +1,5 @@
 import { ComponentType } from 'react';

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

@@ -268,32 +266,3 @@ 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,4 +1,7 @@
 {
  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -1,4 +1,7 @@
 {
  "exclude": ["dist", "node_modules", "**/*.test.ts*"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -2,7 +2,8 @@
  "compilerOptions": {
    "paths": {
      "@emotion/core": ["./src/types/emotion-core-stub.d.ts"]
-    }
+    },
+    "rootDir": "./src"
  },
  "exclude": ["**/*.test.ts*"],
  "extends": "./tsconfig.json"
@@ -1,4 +1,7 @@
 {
  "exclude": ["dist", "node_modules", "test", "**/*.test.ts*"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -8,7 +8,8 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "allowJs": true,
-    "rootDirs": ["."]
+    "rootDirs": ["."],
+    "rootDir": "../.."
  },
  "exclude": ["dist/**/*"],
  "include": [
@@ -8,5 +8,8 @@
    "src/querybuilder/testUtils.ts",
    "../../public/test/setupTests.ts"
  ],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -26,7 +26,6 @@ import {
  UnifiedAlertingConfig,
  GrafanaConfig,
  CurrentUserDTO,
-  PluginMetasSpec,
 } from '@grafana/data';

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

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

  constructor(
    options: BootData['settings'] & {
@@ -1,4 +1,7 @@
 {
  "exclude": ["dist", "node_modules", "**/*.test.ts*", "../../public/test/setupTests.ts"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -312,18 +312,7 @@ export const handyTestingSchema: Spec = {
        label: 'Custom Variable',
        multi: true,
        name: 'customVar',
-        options: [
-          {
-            selected: true,
-            text: 'option1',
-            value: 'option1',
-          },
-          {
-            selected: false,
-            text: 'option2',
-            value: 'option2',
-          },
-        ],
+        options: [],
        query: 'option1, option2',
        skipUrlSync: false,
        allowCustomValue: true,
@@ -490,5 +479,18 @@ 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,4 +1,7 @@
 {
  "exclude": ["dist/**/*", "**/*.test.ts*"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
 }
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { useMemo, useState } from 'react';
 import { useMeasure } from 'react-use';
-import AutoSizer from 'react-virtualized-auto-sizer';
+import AutoSizer, { type Size } 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 }) => {
+        {({ width, height }: Size) => {
          return renderQueryEditor(width, height);
        }}
      </AutoSizer>
@@ -8,7 +8,8 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "strict": true,
-    "rootDirs": ["."]
+    "rootDirs": ["."],
+    "rootDir": "./src"
  },
  "exclude": ["dist/**/*"],
  "include": ["src/**/*.ts*", "../../public/app/types/*.d.ts", "../grafana-ui/src/types/*.d.ts"]
@@ -7,7 +7,8 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "rootDirs": ["."],
-    "moduleResolution": "bundler"
+    "moduleResolution": "bundler",
+    "rootDir": "./src"
  },
  "ts-node": {
    "compilerOptions": {
@@ -3,7 +3,8 @@
    "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) {
+	if featuremgmt.AnyEnabled(b.features, featuremgmt.FlagDashboardNewLayouts, featuremgmt.FlagKubernetesDashboardsV2) {
 		// If dashboards v2 is enabled, we want to use v2beta1 as the default API version.
 		return []schema.GroupVersion{
 			dashv2beta1.DashboardResourceInfo.GroupVersion(),
@@ -346,6 +346,12 @@ 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
@@ -0,0 +1,302 @@
+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
+}
@@ -0,0 +1,448 @@
+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,6 +172,8 @@ 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,
@@ -179,6 +181,8 @@ 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,8 +24,6 @@ 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 (
@@ -44,8 +42,6 @@ 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 == "" {
@@ -54,8 +50,7 @@ func RegisterAppInstaller(

 	coreProvider := meta.NewCoreProvider()
 	cloudProvider := meta.NewCloudProvider(grafanaComAPIURL)
-	localProvider := meta.NewLocalProvider(pluginStore, pluginAssetsService)
-	metaProviderManager := meta.NewProviderManager(localProvider, coreProvider, cloudProvider)
+	metaProviderManager := meta.NewProviderManager(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, pluginstoreService, pluginassetsService)
+	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider)
 	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, pluginstoreService, pluginassetsService)
+	appInstaller, err := plugins.RegisterAppInstaller(configProvider, eventualRestConfigProvider)
 	if err != nil {
 		return nil, err
 	}
@@ -15,6 +15,9 @@ type FakeDataSourceService struct {
 	lastID                int64
 	DataSources           []*datasources.DataSource
 	SimulatePluginFailure bool
+
+	// UID -> Headers
+	DataSourceHeaders map[string]http.Header
 }

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

 func (s *FakeDataSourceService) CustomHeaders(ctx context.Context, ds *datasources.DataSource) (http.Header, error) {
-	return nil, nil
+	return s.DataSourceHeaders[ds.UID], nil
 }
@@ -579,6 +579,13 @@ 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",
@@ -1315,7 +1322,7 @@ var (
 			Name:        "elasticsearchImprovedParsing",
 			Description: "Enables less memory intensive Elasticsearch result parsing",
 			Stage:       FeatureStageExperimental,
-			Owner:       awsDatasourcesSquad,
+			Owner:       grafanaPartnerPluginsSquad,
 		},
 		{
 			Name:            "datasourceConnectionsTab",
@@ -1963,6 +1970,13 @@ var (
 			RequiresRestart: false,
 			HideFromDocs:    false,
 		},
+		{
+			Name:            "kubernetesAlertingHistorian",
+			Description:     "Adds support for Kubernetes alerting historian APIs",
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaAlertingSquad,
+			RequiresRestart: true,
+		},
 	}
 )

@@ -80,6 +80,7 @@ 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
@@ -181,7 +182,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/aws-datasources,false,false,false
+elasticsearchImprovedParsing,experimental,@grafana/partner-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
@@ -266,3 +267,4 @@ 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,6 +259,10 @@ 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"
@@ -757,4 +761,8 @@ const (
 	// FlagAwsDatasourcesHttpProxy
 	// Enables http proxy settings for aws datasources
 	FlagAwsDatasourcesHttpProxy = "awsDatasourcesHttpProxy"
+
+	// FlagKubernetesAlertingHistorian
+	// Adds support for Kubernetes alerting historian APIs
+	FlagKubernetesAlertingHistorian = "kubernetesAlertingHistorian"
 )
@@ -1214,13 +1214,16 @@
    {
      "metadata": {
        "name": "elasticsearchImprovedParsing",
-        "resourceVersion": "1763734583253",
-        "creationTimestamp": "2025-01-15T17:05:54Z"
+        "resourceVersion": "1764260048941",
+        "creationTimestamp": "2025-01-15T17:05:54Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-11-27 16:14:08.941633 +0000 UTC"
+        }
      },
      "spec": {
        "description": "Enables less memory intensive Elasticsearch result parsing",
        "stage": "experimental",
-        "codeowner": "@grafana/aws-datasources"
+        "codeowner": "@grafana/partner-datasources"
      }
    },
    {
@@ -1790,6 +1793,19 @@
        "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",
@@ -1911,6 +1927,18 @@
        "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",
@@ -3547,6 +3575,22 @@
        "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,6 +239,30 @@

        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.
@@ -295,6 +319,19 @@
        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,11 +4,14 @@ 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"
@@ -24,55 +27,64 @@ type HistorySrv struct {
 	hist   Historian
 }

-const labelQueryPrefix = "labels_"
-
 func (srv *HistorySrv) RouteQueryStateHistory(c *contextmodel.ReqContext) response.Response {
-	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), "")
-		}
+	query, err := ParseHistoryQuery(c.OrgID, c.SignedInUser, c.Req.URL.Query())
+	if err != nil {
+		return ErrResp(http.StatusBadRequest, 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,11 +205,23 @@ 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
Jack Westbrook	b910e2e39e	chore(tsgo): clean up some more types, disable js typechecks	2025-12-01 14:58:45 +01:00
Jack Westbrook	8a93d5331a	chore(typescript): appease ts-go stricter type inference in callbacks	2025-12-01 12:28:44 +01:00
Jack Westbrook	eb84c5d02f	build(typescript): update tsconfigs to work with tsgo	2025-11-28 10:03:13 +01:00
Jack Westbrook	ba380fd15d	build(typescript): add tsgo and separate typecheck:tsgo npm script	2025-11-28 10:02:30 +01:00
Alex Khomenko	646fb2aa35	Provisioning: Add source link to provisioned dashboards (#114552 ) * Provisioning: Add dashboard source link * Fix type * Refactor * Simplify code * more fixes * Extract utils * Switch to object params * Fix types * Move to existing file	2025-11-28 07:47:59 +02:00
Eric Shields	34e3c20250	Chore: `tree` is never undefined, so set type to non-optional (#114518 )	2025-11-27 17:19:38 -08:00
grafana-pr-automation[bot]	48a8d54794	I18n: Download translations from Crowdin (#114565 ) New Crowdin translations by GitHub Action Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-11-28 00:40:11 +00:00
Jesse David Peterson	62d83a1ba9	Histogram: Fix runaway bucket densification with extremely sparse + large datasets (#114557 ) * test(histogram): failing test for runaway densification * fix(histogram): maximum bucket densification avoids OOM error * fix(histogram): handle multiple densified buckets	2025-11-27 19:50:47 +00:00
Georges Chaudy	5626dc50f8	feat(unified-storage): Add adaptive backoff to event notifier polling (#114401 ) * use exponential backoff in notifier * Enhance BadgerDB configuration in REST options with memory table size and number of memtables * Enhance BadgerDB configuration in REST options by adding value threshold for LSM vs value log storage	2025-11-27 18:42:01 +01:00
Kevin Yu	eea50c8e9b	Elasticsearch: Update codeowner for elasticsearchImprovedParsing feature toggle (#114556 )	2025-11-27 16:58:43 +00:00
owensmallwood	df2f528612	Unified Storage: Adds overrides service to resource server (#113794 ) * first pass of adding quotas service resource server * passes prom reg as param init quota service as part of server params * init quota service as part of server params * adds config and only creates quota service when overrides file path is defined * when quota service enabled, check quota on create and log result * update log message * adds tests for quota service * adds tests for config reloading when the file changes * fix linter errors * fix comment * use startAndAwaitRunning * Simplifies quotas service. Call manager.GetConfig() when getting quota instead of watching for changes. * adds tracing to quotas service * adds nsr attributes to traces when getting quotas and resource stats * update comment * update comment remove check for nil overrides since it will (should) never happen * fix linter error * refactors naming to overrides service checks quotas in separate function * fix quotas naming * fixes more quotas -> overrides naming * use logger from ctx * linter - remove trailing whitespace * log FromContext() when checking quotas * adds events to spans instead of create new spans updates tenant -> namespace naming few other minor fixes	2025-11-27 10:29:16 -06:00
Steve Simpson	7b8191ba42	Alerting: Add kubernetesAlertingHistorian feature toggle. (#114551 )	2025-11-27 17:14:16 +01:00
Alan Martin	ba58506ffd	Notifications: Prevent triggering duplicate notifications (#114497 ) * fix(notifications): prevent event listener re-registration on route changes * refactor(notifications): rename alert handling functions for clarity * refactor(notifications): simplify alert handling by using spread operator for payloads * refactor(events): address feedback - update LegacyEmitter and LegacyEventHandler interfaces for improved type safety * fix(events): ensure event handlers handle undefined events gracefully in tests * test(notifications): add tests for event listener registration and cleanup in AppNotificationList	2025-11-27 16:12:26 +00:00
antonio	f12cc5411d	Docs: Add feature request guide for contributors (#114538 ) * Docs: Add feature request guide for contributors * prettier * redo self contrib section * all pretty no pity * removed duplicate li	2025-11-27 16:09:04 +00:00
Marc M.	8daa228083	MetricFindValue: add missing "properties" field to the TS interface (#114486 )	2025-11-27 16:38:42 +01:00
Steve Simpson	cd797b6789	Alerting: Refactor api_ruler_history.go to allow code re-use. (#114548 )	2025-11-27 16:37:09 +01:00
Isabel Matwawana	c7ea3d17cc	Docs: Fix alias for next and latest docs (#114547 )	2025-11-27 10:09:33 -05:00
Daniele Stefano Ferru	8e4be891c5	Provisioning: add URL and Path in setting response (#114534 ) * Provisioning: add URL and Path in setting response * linting * marking fields as non-required	2025-11-27 16:06:03 +01:00
Haris Rozajac	763067f8e1	Dashboard Schema V2: Force v2 when dashboardNewLayouts or v2DashboardAPI are enabled (#113548 ) * SchemaV2: Convertion from v1beta1 to v2beta1 * Compare backend-frontend v1 convertion * Compare backend-frontend v1 convertion * Fix fe be diff * Resolve DS issues * Fix ds inconsistecnies * fix legacy string value issues * fix ds test * fix layout issue * update test * Fix tests and issue with defaultConfig * Update output * Fix viz config convertion * wip * Fix v1 to v2 dashboard transformation differences Major fixes implemented: - Backend function names in conversion.go - Backend group field logic for queries, annotations, and vizConfig - Backend datasource resolution with map-based lookup - Backend timezone handling (empty string vs browser) - Backend annotation processing (empty array vs default annotation) - Backend default values (editable, liveNow) - Backend variable processing (definition, defaultKeys, refresh, refId) - Backend panel layout (y position calculations) - Backend VizConfig (Kind and Group fields, default values) - Frontend snapshot issue (annotations not processing) - Frontend datasource references (only when original has valid datasource) Test results: - annotation-conversions: PASSING (0 differences) - dashboard-properties: 3 expected architectural differences - panel-conversions: Multiple expected architectural differences - variable-conversions: 7 expected architectural differences All remaining differences are expected architectural choices between backend persistence optimization and frontend UI consumption optimization. * fix issues with panel and annotation queries with no datasource * definition and regex * Use proper v1beta1 resource when testing * remove misc file * fix ds provider test * fix def ds test in response transformer * fix remaining ResponseTransformers test * timesettings, variable refresh, editable, liveNow, definition * fix transformSceneToSaveModelSchemaV2 test * revert legacyRow changes * fix go lint issues * normalize y coordinates when serializing a row * clean up * update tests * use GetStringValue from schemaversion * fix go lint - cyclomatic complexity * update open api snapshot * add migrated dashboards * fix default panel type when panel type is not provided * revert dash link changes for now * fix * fix nested panel issue and default ref in v1 * apply defaults to nested panels too * update snapshots * fix issues with annotations * matchers, showLegend, annotations * when converting also don't process queries that have only a refId * fix issues with text var * fix dash links * default to collapse: false when serializing * fix: filter refId from variable query specs in backend migration - Add buildDataQueryKindForVariable function to filter refId for variables - Remove default refId "A" in transformSingleQuery - Only include __legacyStringValue for non-empty string queries - Remove refId addition in transformSaveModelSchemaV2ToScene.getDataQueryForVariable - Handle undefined queries gracefully in frontend and backend - Ensure backend matches frontend behavior for query variable serialization * fix: default variable refresh to 'never' to match frontend behavior Change backend default for missing refresh field from 'onDashboardLoad' to 'never' to match frontend defaultVariableRefresh() schema default * fix: only include iconColor in annotations when it exists - Frontend: Use defaultAnnotationQuerySpec().iconColor as fallback to match schema defaults - Backend: Only set iconColor if it exists in v1 input (not using GetStringValue) - Ensures iconColor is only included when present in original dashboard * fix: use schema defaults for annotation enable, hide, and iconColor - Use defaultAnnotationQuerySpec() to get schema defaults instead of hardcoded values - Default enable to false (schema default) to match frontend behavior - Use schema default for iconColor and hide fields - Ensures consistency with frontend which uses defaultAnnotationQuerySpec() defaults * fix: set collapse for hidden-header rows to match first explicit row - When panels appear before the first explicit row, the hidden-header row's collapse should match the first explicit row's collapsed value - Matches frontend behavior where collapse: panel.collapsed uses the next row panel's collapsed value - Ensures consistency between frontend and backend when converting rows layout * fix: handle constant variables with missing query value - Frontend: Fix bug where undefined value was converted to string 'undefined' - Now defaults to empty string when value is undefined: value ? String(value) : '' - Backend: Match frontend fix - default to empty string for text/value when query is missing - Ensures consistency when constant variable query is missing from v1 dashboard * Fix interval variable handling when query is missing - Extract intervals from options when query is missing/empty (matches backend behavior) - Handle undefined/null query in getIntervalsFromQueryString - Handle missing current object/value in getCurrentValueForOldIntervalModel - Update interval variable refresh to use literal 'onTimeRangeChanged' in schema - Use defaultIntervalVariableSpec() for interval variable serialization - Backend: Generate query string from options when query is missing * Fix corrupted dashboard with systemRef override * don't resolve types for template variables in datasource refs on the backend * fix annotation and ds issues * fix range and special mappings * fix datasource var pluginId and regex * add __systemRef to schema * update v15 migration annotation to have a ds type because v2 keeps track of if type is in the initial save model, and if it's not it removes it, but for frontendOuput we are running transformSaveModelToScene which will then assign the type * add migration fields since the backend applies automigrations in collapsed rows * filter out queries in ResponseTransformer that only have refId field * lint * v2: add default query if queries are empty to match v1 behavior * fix single migration test * tracking test should have a defined spec otherwise datasource is removed and won't be tracked * initialize default with default ds ref * wip * Do not assign DS if ds group is empty * cleanup * revert change in setupTests.ts * clean up TODO * query with only refId should not expect to have a group * refactor: extract v0alpha1 to v1beta1 conversion logic into atomic function - Extract ConvertDashboard_V0_to_V1beta1 into v0alpha1_to_v1beta1.go - Extract prepareV0ConversionContext and migrateV0Dashboard helper functions - Standardize v0.go to match v1.go pattern with inline multi-step conversions - Implement Convert_V0_to_V2alpha1 using atomic functions (v0->v1beta1->v2alpha1) - Implement Convert_V0_to_V2beta1 using atomic functions (v0->v1beta1->v2alpha1->v2beta1) - Remove non-atomic v0alpha1_to_v2alpha1.go file * test: add version-specific test files for conversion error handling - Extract v0 conversion tests into v0_test.go - Extract v1 conversion tests into v1_test.go - Add v2 conversion tests in v2_test.go - Ensure all error handling paths in conversion functions are covered - Add tests for Convert_V0_to_V2alpha1 and Convert_V0_to_V2beta1 error paths - Add tests for Convert_V1beta1_to_V2alpha1 and Convert_V1beta1_to_V2beta1 error paths - Add tests for Convert_V2alpha1_to_V2beta1 error handling * Fix tests * Fix linter * Clean up * feat(dashboard): Add automatic data loss detection for dashboard conversions Implements comprehensive data loss detection for all dashboard API version conversions. Components Tracked: • Panels (visualization + library panels) • Queries (data source queries, excludes row panel queries) • Annotations • Links • Variables (template variables) Features: • Automatic detection via withConversionMetrics wrapper (zero code changes) • Error type: 'conversion_data_loss_error' • Logs: panelsLost, queriesLost, annotationsLost, linksLost, variablesLost Bugs Found: • Fixed critical bug: metrics.go was silently swallowing ALL errors (return nil → return err) Testing: • TestDataLossDetectionOnAllInputFiles - runs all conversions with detailed logging • V2→V0/V1 downgrades write output for debugging then skip (not yet implemented) • All tests passing * Run dashboards on schema v2 E2Es * reveret unintended changes * cleanup * Reset active manager correctly according to toggles config * Fix new dashboard being serialized as v1 * Rename toggle --------- Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com> Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>	2025-11-27 15:52:42 +01:00
Marc M.	eedb613a5e	Dashboards: Don't store options when saving a dashboard with Query/Custom variables (#114540 )	2025-11-27 15:41:38 +01:00
Alexander Akhmetov	42d3673d04	Alerting: Add rule_limits to rule list requests (#114176 ) * Alerting: Add rule_limits to rule list requests * Unify pagination limits calculation for GMA and DMA rules * Fix limits, add tests * Alerting: Rename filter functions and limit properties for clarity - hasClientSideFilters → hasGrafanaClientSideFilters - hasDatasourceFilters → hasDatasourceClientSideFilters - gmaLimit → grafanaManagedLimit - dmaLimit → datasourceManagedLimit --------- Co-authored-by: Konrad Lalik <konradlalik@gmail.com>	2025-11-27 14:19:38 +00:00
Levente Balogh	8e73cc2f70	Dashboards: Cover the Switch variable in schema transformations - part 1. (#114293 ) fix: cover the switch variable when transforming betwen v1 and v2 schemas	2025-11-27 15:14:42 +01:00
Alexander Zobnin	80fc87339a	Zanzana: Role binding hooks (#114470 ) * Zanzana: Role bindings hooks WIP * Empty hooks for role bindings * implement hooks for role bindings * add tests * apply review suggestions	2025-11-27 15:11:34 +01:00
Santiago	8515bcc6b0	Alerting: Use data source headers when remote writing (#114528 )	2025-11-27 14:57:54 +01:00
Laura Fernández	f872fd7f2f	Chore: Update `body-parser` to v2.2.1 (#114539 )	2025-11-27 14:06:27 +01:00
Rafael Bortolon Paulovic	4c869a21a4	feat(unified): data migration integration tests (#114418 ) * feat: unified storage migrations integration tests * chore: add comment and adjust db path name * chore: refactor test cases into interface	2025-11-27 13:35:49 +01:00
Josh Hunt	cffca37999	FS: Check session expiration and rotate if needed (#114433 ) * FS: Check session expiration and rotate if needed * Remove unused return values	2025-11-27 12:30:48 +00:00
Marc M.	95174454e3	ConditionalRendering: Fix for repeated items (#114160 )	2025-11-27 12:05:15 +01:00
renovate-sh-app[bot]	1c8f4a745f	chore(deps): update dependency node-forge to v1.3.2 [security] (#114522 )	2025-11-27 11:47:52 +01:00
Alex Khomenko	fe3e2bf9cb	Provisioning: Unify resource and file list pages (#114508 ) * Provisioning: Unify resources and files view * Use interactive table * Add tests * Show status * Omit root * Fix status * Fix link * Tab spacing * Cleanup * Move funciton outside * Add source link * Hide source link for unsynced files * Show folders sync status * refactor * Fix sync folder logic * refactor * fix unsynced files type * Show external source link * tweaks * SHow pending for unsynced files	2025-11-27 12:45:25 +02:00