do ds lookup instead of trusting the uid

Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr
Fix based on PR feedback
2026-01-13 21:07:17 -06:00 · 2026-01-12 20:48:08 -06:00 · 2026-01-12 20:48:01 -06:00 · 2026-01-09 10:30:39 -06:00 · 2026-01-07 13:36:29 -06:00 · 2026-01-07 07:37:09 -06:00
179 changed files with 2312 additions and 3851 deletions
@@ -135,7 +135,7 @@ i18n-extract-enterprise:
 	@echo "Skipping i18n extract for Enterprise: not enabled"
 else
 i18n-extract-enterprise:
-	@echo "Extracting i18n strings for Enterprise"
+	@echo "Extracting i18n strings for Enterprise"	
 	cd public/locales/enterprise && yarn run i18next-cli extract --sync-primary
 endif

@@ -227,10 +227,6 @@ fix-cue:
 gen-jsonnet:
 	go generate ./devenv/jsonnet

-.PHONY: gen-themes
-gen-themes:
-	go generate ./pkg/services/preference
-
 .PHONY: update-workspace
 update-workspace: gen-go
 	@echo "updating workspace"
@@ -248,7 +244,6 @@ build-go-fast: ## Build all Go binaries without updating workspace.
 .PHONY: build-backend
 build-backend: ## Build Grafana backend.
 	@echo "build backend"
-	$(MAKE) gen-themes
 	$(GO) run build.go $(GO_BUILD_FLAGS) build-backend

 .PHONY: build-air
@@ -1,10 +1,18 @@
 include ../sdk.mk

 .PHONY: generate # Run Grafana App SDK code generation
-generate: install-app-sdk update-app-sdk
+generate: do-generate post-generate-cleanup
+
+.PHONY: do-generate
+do-generate: install-app-sdk update-app-sdk
 	@$(APP_SDK_BIN) generate \
 		--source=./kinds/ \
 		--gogenpath=./pkg/apis \
 		--grouping=group \
 		--genoperatorstate=false \
-		--defencoding=none
+		--defencoding=none
+
+.PHONY: post-generate-cleanup
+post-generate-cleanup: ## Fix TargetSpec OpenAPI schema
+	# Fix the TargetSpec schema in manifest - remove nested additionalProperties
+	@sed -i.bak 's|"TargetSpec":{"additionalProperties":{"additionalProperties":{},"type":"object"},"type":"object"}|"TargetSpec":{"additionalProperties":{},"type":"object"}|g' ./pkg/apis/correlation_manifest.go && rm ./pkg/apis/correlation_manifest.go.bak
@@ -31,7 +31,9 @@ ConfigSpec: {
 	transformations?: [...TransformationSpec]
 }

-TargetSpec:  [string]: _
+TargetSpec: {
+	...
+}

 TransformationSpec: {
 	type: "regex" | "logfmt"
@@ -20,7 +20,7 @@ import (
 )

 var (
-	rawSchemaCorrelationv0alpha1     = []byte(`{"ConfigSpec":{"additionalProperties":false,"description":"there was a deprecated field here called type, we will need to move that for conversion and provisioning","properties":{"field":{"type":"string"},"target":{"$ref":"#/components/schemas/TargetSpec"},"transformations":{"items":{"$ref":"#/components/schemas/TransformationSpec"},"type":"array"}},"required":["field","target"],"type":"object"},"Correlation":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"CorrelationType":{"enum":["query","external"],"type":"string"},"DataSourceRef":{"additionalProperties":false,"properties":{"group":{"description":"same as pluginId","type":"string"},"name":{"description":"same as grafana uid","type":"string"}},"required":["group","name"],"type":"object"},"TargetSpec":{"additionalProperties":{"additionalProperties":{},"type":"object"},"type":"object"},"TransformationSpec":{"additionalProperties":false,"properties":{"expression":{"type":"string"},"field":{"type":"string"},"mapValue":{"type":"string"},"type":{"enum":["regex","logfmt"],"type":"string"}},"required":["type","expression","field","mapValue"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"config":{"$ref":"#/components/schemas/ConfigSpec"},"description":{"type":"string"},"label":{"type":"string"},"source":{"$ref":"#/components/schemas/DataSourceRef"},"target":{"$ref":"#/components/schemas/DataSourceRef"},"type":{"$ref":"#/components/schemas/CorrelationType"}},"required":["type","source","label","config"],"type":"object"}}`)
+	rawSchemaCorrelationv0alpha1     = []byte(`{"ConfigSpec":{"additionalProperties":false,"description":"there was a deprecated field here called type, we will need to move that for conversion and provisioning","properties":{"field":{"type":"string"},"target":{"$ref":"#/components/schemas/TargetSpec"},"transformations":{"items":{"$ref":"#/components/schemas/TransformationSpec"},"type":"array"}},"required":["field","target"],"type":"object"},"Correlation":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"CorrelationType":{"enum":["query","external"],"type":"string"},"DataSourceRef":{"additionalProperties":false,"properties":{"group":{"description":"same as pluginId","type":"string"},"name":{"description":"same as grafana uid","type":"string"}},"required":["group","name"],"type":"object"},"TargetSpec":{"additionalProperties":{},"type":"object"},"TransformationSpec":{"additionalProperties":false,"properties":{"expression":{"type":"string"},"field":{"type":"string"},"mapValue":{"type":"string"},"type":{"enum":["regex","logfmt"],"type":"string"}},"required":["type","expression","field","mapValue"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"config":{"$ref":"#/components/schemas/ConfigSpec"},"description":{"type":"string"},"label":{"type":"string"},"source":{"$ref":"#/components/schemas/DataSourceRef"},"target":{"$ref":"#/components/schemas/DataSourceRef"},"type":{"$ref":"#/components/schemas/CorrelationType"}},"required":["type","source","label","config"],"type":"object"}}`)
 	versionSchemaCorrelationv0alpha1 app.VersionSchema
 	_                                = json.Unmarshal(rawSchemaCorrelationv0alpha1, &versionSchemaCorrelationv0alpha1)
 )
@@ -66,18 +66,17 @@ Please refer to plugin documentation to see what RBAC permissions the plugin has

 The following list contains app plugins that have fine-grained RBAC support.

-| App plugin                                                                                                                                                                            | App plugin ID                      | App plugin permission documentation                                                                                                                                                              |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [Access policies](https://grafana.com/docs/grafana-cloud/account-management/authentication-and-permissions/access-policies/)                                                          | `grafana-auth-app`                 | [RBAC actions for Access Policies](ref:cloud-access-policies-action-definitions)                                                                                                                 |
-| [Adaptive Metrics](https://grafana.com/docs/grafana-cloud/cost-management-and-billing/reduce-costs/metrics-costs/control-metrics-usage-via-adaptive-metrics/adaptive-metrics-plugin/) | `grafana-adaptive-metrics-app`     | [RBAC actions for Adaptive Metrics](ref:adaptive-metrics-permissions)                                                                                                                            |
-| [Cloud Provider](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/monitor-cloud-provider/)                                                                               | `grafana-csp-app`                  | [Cloud Provider Observability role-based access control](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/monitor-cloud-provider/rbac/)                                             |
-| [Incident](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/incident/)                                                                                                     | `grafana-incident-app`             | n/a                                                                                                                                                                                              |
-| [Kubernetes Monitoring](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/)                                                                                            | `grafana-k8s-app`                  | [Kubernetes Monitoring role-based access control](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/control-access/#precision-access-with-rbac-custom-plugin-roles) |
-| [OnCall](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/oncall/)                                                                                                         | `grafana-oncall-app`               | [Configure RBAC for OnCall](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/oncall/manage/user-and-team-management/#manage-users-and-teams-for-grafana-oncall)                       |
-| [Performance Testing (K6)](https://grafana.com/docs/grafana-cloud/testing/k6/)                                                                                                        | `k6-app`                           | [Configure RBAC for K6](https://grafana.com/docs/grafana-cloud/testing/k6/projects-and-users/configure-rbac/)                                                                                    |
-| [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/)                                                    | `grafana-pdc-app`                  | n/a                                                                                                                                                                                              |
-| [Service Level Objective (SLO)](https://grafana.com/docs/grafana-cloud/alerting-and-irm/slo/)                                                                                         | `grafana-slo-app`                  | [Configure RBAC for SLO](https://grafana.com/docs/grafana-cloud/alerting-and-irm/slo/set-up/rbac/)                                                                                               |
-| [Synthetic Monitoring](https://grafana.com/docs/grafana-cloud/testing/synthetic-monitoring/)                                                                                          | `grafana-synthetic-monitoring-app` | [Configure RBAC for Synthetic Monitoring](https://grafana.com/docs/grafana-cloud/testing/synthetic-monitoring/user-and-team-management/)                                                         |
+| App plugin                                                                                                                                                                            | App plugin ID                  | App plugin permission documentation                                                                                                                                                              |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [Access policies](https://grafana.com/docs/grafana-cloud/account-management/authentication-and-permissions/access-policies/)                                                          | `grafana-auth-app`             | [RBAC actions for Access Policies](ref:cloud-access-policies-action-definitions)                                                                                                                 |
+| [Adaptive Metrics](https://grafana.com/docs/grafana-cloud/cost-management-and-billing/reduce-costs/metrics-costs/control-metrics-usage-via-adaptive-metrics/adaptive-metrics-plugin/) | `grafana-adaptive-metrics-app` | [RBAC actions for Adaptive Metrics](ref:adaptive-metrics-permissions)                                                                                                                            |
+| [Cloud Provider](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/monitor-cloud-provider/)                                                                               | `grafana-csp-app`              | [Cloud Provider Observability role-based access control](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/monitor-cloud-provider/rbac/)                                             |
+| [Incident](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/incident/)                                                                                                     | `grafana-incident-app`         | n/a                                                                                                                                                                                              |
+| [Kubernetes Monitoring](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/)                                                                                            | `grafana-k8s-app`              | [Kubernetes Monitoring role-based access control](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/control-access/#precision-access-with-rbac-custom-plugin-roles) |
+| [OnCall](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/oncall/)                                                                                                         | `grafana-oncall-app`           | [Configure RBAC for OnCall](https://grafana.com/docs/grafana-cloud/alerting-and-irm/irm/oncall/manage/user-and-team-management/#manage-users-and-teams-for-grafana-oncall)                       |
+| [Performance Testing (K6)](https://grafana.com/docs/grafana-cloud/testing/k6/)                                                                                                        | `k6-app`                       | [Configure RBAC for K6](https://grafana.com/docs/grafana-cloud/testing/k6/projects-and-users/configure-rbac/)                                                                                    |
+| [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/)                                                    | `grafana-pdc-app`              | n/a                                                                                                                                                                                              |
+| [Service Level Objective (SLO)](https://grafana.com/docs/grafana-cloud/alerting-and-irm/slo/)                                                                                         | `grafana-slo-app`              | [Configure RBAC for SLO](https://grafana.com/docs/grafana-cloud/alerting-and-irm/slo/set-up/rbac/)                                                                                               |

 ### Revoke fine-grained access from app plugins

@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = false
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -3,6 +3,7 @@
 [feature_toggles]
 unifiedStorageSearchUI = true
 grafanaAPIServerWithExperimentalAPIs = true
+unifiedStorageSearchSprinkles = true

 [unified_storage]
 enable_search = true
@@ -1156,6 +1156,11 @@
      "count": 2
    }
  },
+  "public/app/core/config.ts": {
+    "no-barrel-files/no-barrel-files": {
+      "count": 2
+    }
+  },
  "public/app/core/navigation/types.ts": {
    "@typescript-eslint/no-explicit-any": {
      "count": 1
@@ -1735,11 +1740,6 @@
      "count": 2
    }
  },
-  "public/app/features/correlations/CorrelationsPage.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/correlations/Forms/ConfigureCorrelationBasicInfoForm.tsx": {
    "no-restricted-syntax": {
      "count": 2
@@ -31,16 +31,16 @@ require (
 	github.com/apache/arrow-go/v18 v18.4.1 // @grafana/plugins-platform-backend
 	github.com/armon/go-radix v1.0.0 // @grafana/grafana-app-platform-squad
 	github.com/aws/aws-sdk-go v1.55.7 // @grafana/aws-datasources
-	github.com/aws/aws-sdk-go-v2 v1.41.0 // @grafana/aws-datasources
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect; @grafana/grafana-operator-experience-squad
+	github.com/aws/aws-sdk-go-v2 v1.40.0 // @grafana/aws-datasources
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // @grafana/grafana-operator-experience-squad
 	github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/oam v1.18.3 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 // @grafana/grafana-operator-experience-squad
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect; @grafana/grafana-operator-experience-squad
-	github.com/aws/smithy-go v1.24.0 // @grafana/aws-datasources
+	github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // @grafana/grafana-operator-experience-squad
+	github.com/aws/smithy-go v1.23.2 // @grafana/aws-datasources
 	github.com/beevik/etree v1.4.1 // @grafana/grafana-backend-group
 	github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-backend
 	github.com/blang/semver/v4 v4.0.0 // indirect; @grafana/grafana-developer-enablement-squad
@@ -82,7 +82,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // @grafana/grafana-backend-group
 	github.com/golang/snappy v1.0.0 // @grafana/alerting-backend
 	github.com/google/go-cmp v0.7.0 // @grafana/grafana-backend-group
-	github.com/google/go-github/v70 v70.0.0 // @grafana/grafana-git-ui-sync-team
+	github.com/google/go-github/v70 v70.0.0 // indirect; @grafana/grafana-git-ui-sync-team
 	github.com/google/go-querystring v1.1.0 // indirect; @grafana/oss-big-tent
 	github.com/google/uuid v1.6.0 // @grafana/grafana-backend-group
 	github.com/google/wire v0.7.0 // @grafana/grafana-backend-group
@@ -113,7 +113,6 @@ require (
 	github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // @grafana/observability-traces-and-profiling
 	github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f // @grafana/observability-traces-and-profiling
-	github.com/grafana/tempo v1.5.1-0.20250529124718-87c2dc380cec // @grafana/observability-traces-and-profiling
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/grafana-search-and-storage
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // @grafana/plugins-platform-backend
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // @grafana/grafana-backend-group
@@ -161,9 +160,9 @@ require (
 	github.com/prometheus/alertmanager v0.28.2 // @grafana/alerting-backend
 	github.com/prometheus/client_golang v1.23.2 // @grafana/alerting-backend
 	github.com/prometheus/client_model v0.6.2 // @grafana/grafana-backend-group
-	github.com/prometheus/common v0.67.5 // @grafana/alerting-backend
+	github.com/prometheus/common v0.67.4 // @grafana/alerting-backend
 	github.com/prometheus/prometheus v0.303.1 // @grafana/alerting-backend
-	github.com/prometheus/sigv4 v0.4.0 // @grafana/alerting-backend
+	github.com/prometheus/sigv4 v0.1.2 // @grafana/alerting-backend
 	github.com/puzpuzpuz/xsync/v4 v4.2.0 // @grafana/grafana-backend-group
 	github.com/redis/go-redis/v9 v9.14.0 // @grafana/alerting-backend
 	github.com/robfig/cron/v3 v3.0.1 // @grafana/grafana-backend-group
@@ -261,13 +260,12 @@ require (
 	github.com/grafana/grafana/pkg/aggregator v0.0.0 // @grafana/grafana-app-platform-squad
 	github.com/grafana/grafana/pkg/apimachinery v0.0.0 // @grafana/grafana-app-platform-squad
 	github.com/grafana/grafana/pkg/apiserver v0.0.0 // @grafana/grafana-app-platform-squad
-	github.com/grafana/grafana/pkg/plugins v0.0.0 // @grafana/plugins-platform-backend

 	// This needs to be here for other projects that import grafana/grafana
 	// For local development grafana/grafana will always use the local files
 	// Check go.work file for details
 	github.com/grafana/grafana/pkg/promlib v0.0.8 // @grafana/oss-big-tent
-	github.com/grafana/grafana/pkg/semconv v0.0.0 // @grafana/grafana-app-platform-squad
+	github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad
 )

 // Replace the workspace versions
@@ -296,8 +294,6 @@ replace (
 	github.com/grafana/grafana/pkg/aggregator => ./pkg/aggregator
 	github.com/grafana/grafana/pkg/apimachinery => ./pkg/apimachinery
 	github.com/grafana/grafana/pkg/apiserver => ./pkg/apiserver
-	github.com/grafana/grafana/pkg/plugins => ./pkg/plugins
-	github.com/grafana/grafana/pkg/semconv => ./pkg/semconv
 )

 require (
@@ -344,21 +340,21 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/at-wat/mqtt-go v0.19.6 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.31.17 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
 	github.com/aws/aws-sdk-go-v2/service/kms v1.41.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 // indirect
 	github.com/axiomhq/hyperloglog v0.0.0-20240507144631-af9851f82b27 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
@@ -656,13 +652,11 @@ require (
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )

+require github.com/grafana/tempo v1.5.1-0.20250529124718-87c2dc380cec // @grafana/observability-traces-and-profiling
+
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/IBM/pgxpoolprometheus v1.1.2 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/cpuguy83/dockercfg v0.3.2 // indirect
@@ -682,8 +676,6 @@ require (
 	github.com/google/gnostic v0.7.1 // indirect
 	github.com/gophercloud/gophercloud/v2 v2.9.0 // indirect
 	github.com/grafana/sqlds/v5 v5.0.3 // indirect
-	github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.2 // indirect
-	github.com/joshlf/go-acl v0.0.0-20200411065538-eae00ae38531 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/moby/go-archive v0.1.0 // indirect
@@ -680,7 +680,6 @@ github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7Og
 github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v11.2.8+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
@@ -738,8 +737,6 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY
 github.com/IBM/pgxpoolprometheus v1.1.2 h1:sHJwxoL5Lw4R79Zt+H4Uj1zZ4iqXJLdk7XDE7TPs97U=
 github.com/IBM/pgxpoolprometheus v1.1.2/go.mod h1:+vWzISN6S9ssgurhUNmm6AlXL9XLah3TdWJktquKTR8=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -762,8 +759,6 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
 github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
-github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
-github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -850,22 +845,22 @@ github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z
 github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
 github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
-github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
-github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
+github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
+github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 h1:12SpdwU8Djs+YGklkinSSlcrPyj3H4VifVsKf78KbwA=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11/go.mod h1:dd+Lkp6YmMryke+qxW/VnKyhMBDTYP41Q2Bb+6gNZgY=
-github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8=
-github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
+github.com/aws/aws-sdk-go-v2/config v1.31.17 h1:QFl8lL6RgakNK86vusim14P2k8BFSxjvUkcWLDjgz9Y=
+github.com/aws/aws-sdk-go-v2/config v1.31.17/go.mod h1:V8P7ILjp/Uef/aX8TjGk6OHZN6IKPM5YW6S78QnRD5c=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.21 h1:56HGpsgnmD+2/KpG0ikvvR8+3v3COCwaF4r+oWwOeNA=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.21/go.mod h1:3YELwedmQbw7cXNaII2Wywd+YY58AmLPwX4LzARgmmA=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13/go.mod h1:Peg/GBAQ6JDt+RoBf4meB1wylmAipb7Kg2ZFakZTlwk=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 h1:cTXRdLkpBanlDwISl+5chq5ui1d1YWg4PWMR9c3kXyw=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84/go.mod h1:kwSy5X7tfIHN39uucmjQVs2LvDdXEjQucgQQEqCggEo=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 h1:GMYy2EOWfzdP3wfVAGXBNKY5vK4K8vMET4sYOYltmqs=
@@ -876,12 +871,12 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0 h1:e5cbPZYTIY2nUEFie
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0/go.mod h1:UseIHRfrm7PqeZo6fcTb6FUCXzCnh1KJbQbmOfxArGM=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2 h1:IfMb3Ar8xEaWjgH/zeVHYD8izwJdQgRP5mKCTDt4GNk=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2/go.mod h1:35jGWx7ECvCwTsApqicFYzZ7JFEnBc6oHUuOQ3xIS54=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 h1:nAP2GYbfh8dd2zGZqFRSMlq+/F6cMPBUuCsGAMkN074=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4/go.mod h1:LT10DsiGjLWh4GbjInf9LQejkYEhBgBCjLG5+lvk4EE=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 h1:kDqdFvMY4AtKoACfzIGD8A0+hbT41KTKF//gq7jITfM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13/go.mod h1:lmKuogqSU3HzQCwZ9ZtcqOc5XGMqtDK7OIc2+DxiUEg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 h1:qcLWgdhq45sDM9na4cvXax9dyLitn8EYBRl8Ak4XtG4=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17/go.mod h1:M+jkjBFZ2J6DJrjMv2+vkBbuht6kxJYtJiwoVgX4p4U=
 github.com/aws/aws-sdk-go-v2/service/kms v1.41.2 h1:zJeUxFP7+XP52u23vrp4zMcVhShTWbNO8dHV6xCSvFo=
@@ -894,16 +889,14 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 h1:0reDqfEN+tB+sozj2r92Bep8MEwBZ
 github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0/go.mod h1:kUklwasNoCn5YpyAqC/97r6dzTA1SRKJfKq16SXeoDU=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 h1:w6a0H79HrHf3lr+zrw+pSzR5B+caiQFAKiNHlrUcnoc=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1/go.mod h1:c6Vg0BRiU7v0MVhHupw90RyL120QBwAMLbDCzptGeMk=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk=
-github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
-github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 h1:0JPwLz1J+5lEOfy/g0SURC9cxhbQ1lIMHMa+AHZSzz0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.1/go.mod h1:fKvyjJcz63iL/ftA6RaM8sRCtN4r4zl4tjL3qw5ec7k=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 h1:OWs0/j2UYR5LOGi88sD5/lhN6TDLG6SfA7CqsQO9zF0=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5/go.mod h1:klO+ejMvYsB4QATfEOIXk8WAEwN4N0aBfJpvC+5SZBo=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 h1:mLlUgHn02ue8whiR4BmxxGJLR2gwU6s6ZzJ5wDamBUs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.1/go.mod h1:E19xDjpzPZC7LS2knI9E6BaRFDK43Eul7vd6rSq2HWk=
+github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
+github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f/go.mod h1:2stgcRjl6QmW+gU2h5E7BQXg4HU0gzxKWDuT5HviN9s=
 github.com/axiomhq/hyperloglog v0.0.0-20240507144631-af9851f82b27 h1:60m4tnanN1ctzIu4V3bfCNJ39BiOPSm1gHFlFjTkRE0=
 github.com/axiomhq/hyperloglog v0.0.0-20240507144631-af9851f82b27/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c=
@@ -1033,8 +1026,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -1673,6 +1664,8 @@ github.com/grafana/grafana/apps/quotas v0.0.0-20251209183543-1013d74f13f2 h1:rDP
 github.com/grafana/grafana/apps/quotas v0.0.0-20251209183543-1013d74f13f2/go.mod h1:M7bV60iRB61y0ISPG1HX/oNLZtlh0ZF22rUYwNkAKjo=
 github.com/grafana/grafana/pkg/promlib v0.0.8 h1:VUWsqttdf0wMI4j9OX9oNrykguQpZcruudDAFpJJVw0=
 github.com/grafana/grafana/pkg/promlib v0.0.8/go.mod h1:U1ezG/MGaEPoThqsr3lymMPN5yIPdVTJnDZ+wcXT+ao=
+github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 h1:A65jWgLk4Re28gIuZcpC0aTh71JZ0ey89hKGE9h543s=
+github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:2HRzUK/xQEYc+8d5If/XSusMcaYq9IptnBSHACiQcOQ=
 github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32 h1:NznuPwItog+rwdVg8hAuGKP29ndRSzJAwhxKldkP8oQ=
 github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32/go.mod h1:796sq+UcONnSlzA3RtlBZ+b/hrerkZXiEmO8oMjyRwY=
 github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000 h1:/5LKSYgLmAhwA4m6iGUD4w1YkydEWWjazn9qxCFT8W0=
@@ -1760,8 +1753,6 @@ github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5O
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 h1:U+kC2dOhMFQctRfhK0gRctKAPTloZdMU5ZJxaesJ/VM=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0/go.mod h1:Ll013mhdmsVDuoIXVfBtvgGJsXDYkTw1kooNcoCXuE0=
-github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.2 h1:gCNiM4T5xEc4IpT8vM50CIO+AtElr5kO9l2Rxbq+Sz8=
-github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.2/go.mod h1:6ZM4ZdwClyAsiU2uDBmRHCvq0If/03BMbF9U+U7G5pA=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -1886,10 +1877,6 @@ github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbd
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/joshlf/go-acl v0.0.0-20200411065538-eae00ae38531 h1:hgVxRoDDPtQE68PT4LFvNlPz2nBKd3OMlGKIQ69OmR4=
-github.com/joshlf/go-acl v0.0.0-20200411065538-eae00ae38531/go.mod h1:fqTUQpVYBvhCNIsMXGl2GE9q6z94DIP6NtFKXCSTVbg=
-github.com/joshlf/testutil v0.0.0-20170608050642-b5d8aa79d93d h1:J8tJzRyiddAFF65YVgxli+TyWBi0f79Sld6rJP6CBcY=
-github.com/joshlf/testutil v0.0.0-20170608050642-b5d8aa79d93d/go.mod h1:b+Q3v8Yrg5o15d71PSUraUzYb+jWl6wQMSBXSGS/hv0=
 github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -2313,8 +2300,8 @@ github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGy
 github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
 github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
 github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
-github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
-github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
+github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
+github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
 github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
@@ -2340,8 +2327,8 @@ github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05Zp
 github.com/prometheus/prometheus v0.0.0-20190818123050-43acd0e2e93f/go.mod h1:rMTlmxGCvukf2KMu3fClMDKLLoJ5hl61MhcJ7xKakf0=
 github.com/prometheus/prometheus v0.303.1 h1:He/2jRE6sB23Ew38AIoR1WRR3fCMgPlJA2E0obD2WSY=
 github.com/prometheus/prometheus v0.303.1/go.mod h1:WEq2ogBPZoLjj9x5K67VEk7ECR0nRD9XCjaOt1lsYck=
-github.com/prometheus/sigv4 v0.4.0 h1:s8oiq+S4ORkpjftnBvzObLrz5Hw49YwEhumNGBdfg4M=
-github.com/prometheus/sigv4 v0.4.0/go.mod h1:D6dQeKEsDyUWzoNGjby5HgXshiOAbsz7vuApHTCmOxA=
+github.com/prometheus/sigv4 v0.1.2 h1:R7570f8AoM5YnTUPFm3mjZH5q2k4D+I/phCWvZ4PXG8=
+github.com/prometheus/sigv4 v0.1.2/go.mod h1:GF9fwrvLgkQwDdQ5BXeV9XUSCH/IPNqzvAoaohfjqMU=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20251124094003-fcb97cc64c7b h1:fPVI9E6QNFYI0Ph3XpKUDrcAvbCifHvqYJcntFLPog8=
 github.com/protocolbuffers/txtpbfmt v0.0.0-20251124094003-fcb97cc64c7b/go.mod h1:JSbkp0BviKovYYt9XunS95M3mLPibE9bGg+Y95DsEEY=
 github.com/puzpuzpuz/xsync/v2 v2.5.1 h1:mVGYAvzDSu52+zaGyNjC+24Xw2bQi3kTr4QJ6N9pIIU=
@@ -280,6 +280,7 @@ github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fw
 github.com/Azure/go-amqp v1.4.0 h1:Xj3caqi4comOF/L1Uc5iuBxR/pB6KumejC01YQOqOR4=
 github.com/Azure/go-amqp v1.4.0/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.13 h1:Ov8avRZi2vmrE2JcXw+tu5K/yB41r7xK9GZDiBF7NdM=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.13/go.mod h1:5BAVfWLWXihP47vYrPuBKKf4cS0bXI+KM9Qx6ETDJYo=
@@ -905,8 +906,6 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263/go.mod h1:VKxaR93Gff0ZlO2sPcdPVob1a/UzArFEW5zx3Bpyhls=
 github.com/grafana/alerting v0.0.0-20251009192429-9427c24835ae/go.mod h1:VGjS5gDwWEADPP6pF/drqLxEImgeuHlEW5u8E5EfIrM=
-github.com/grafana/alerting v0.0.0-20260112110054-6c6f13659ad3 h1:KVncUdAc5YwY/OQmw6HgzJmbRKn6IwrhvtcBAd1yDHo=
-github.com/grafana/alerting v0.0.0-20260112110054-6c6f13659ad3/go.mod h1:Oy4MthJqfErlieO14ryZXdukDrUACy8Lg56P3zP7S1k=
 github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43/go.mod h1:1fWkOiL+m32NBgRHZtlZGz2ji868tPZACYbqP3nBRJI=
 github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43/go.mod h1:qeWYbnWzaYGl88JlL9+DsP1GT2Cudm58rLtx13fKZdw=
 github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37/go.mod h1:qeWYbnWzaYGl88JlL9+DsP1GT2Cudm58rLtx13fKZdw=
@@ -1912,7 +1911,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ=
 go.opentelemetry.io/otel/exporters/prometheus v0.58.0/go.mod h1:7qo/4CLI+zYSNbv0GMNquzuss2FVZo3OYrGh96n4HNc=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0/go.mod h1:PD57idA/AiFD5aqoxGxCvT/ILJPeHy3MjqU/NS7KogY=
@@ -62,7 +62,8 @@
    "stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
    "storybook": "yarn workspace @grafana/ui storybook --ci",
    "storybook:build": "yarn workspace @grafana/ui storybook:build",
-    "themes-generate": "yarn workspace @grafana/data themes-schema && esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --conditions=@grafana-app/source --platform=node --tsconfig=./scripts/cli/tsconfig.json | node",
+    "themes-schema": "typescript-json-schema ./tsconfig.json NewThemeOptions --include 'packages/grafana-data/src/themes/createTheme.ts' --out public/app/features/theme-playground/schema.generated.json",
+    "themes-generate": "yarn themes-schema && esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --conditions=@grafana-app/source --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",
    "plugins:build-bundled": "echo 'bundled plugins are no longer supported'",
@@ -253,6 +254,7 @@
    "ts-jest": "29.4.0",
    "ts-node": "10.9.2",
    "typescript": "5.9.2",
+    "typescript-json-schema": "^0.65.1",
    "webpack": "5.101.0",
    "webpack-assets-manifest": "^5.1.0",
    "webpack-cli": "6.0.1",
@@ -263,7 +265,7 @@
    "webpackbar": "^7.0.0",
    "yaml": "^2.0.0",
    "yargs": "^18.0.0",
-    "zod": "^4.3.0"
+    "zod": "^4.0.0"
  },
  "dependencies": {
    "@bsull/augurs": "^0.10.0",
@@ -408,9 +408,7 @@ export type ObjectMeta = {
  uid?: string;
 };
 export type CorrelationTargetSpec = {
-  [key: string]: {
-    [key: string]: any;
-  };
+  [key: string]: any;
 };
 export type CorrelationTransformationSpec = {
  expression: string;
@@ -47,12 +47,11 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "yarn themes-schema && tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts --configPlugin esbuild",
    "clean": "rimraf ./dist ./compiled ./unstable ./package.tgz",
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-npm-package.js",
-    "postpack": "mv package.json.bak package.json",
-    "themes-schema": "tsx ./src/themes/scripts/generateSchema.ts"
+    "postpack": "mv package.json.bak package.json"
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
@@ -82,12 +81,10 @@
    "tinycolor2": "1.6.0",
    "tslib": "2.8.1",
    "uplot": "1.6.32",
-    "xss": "^1.0.14",
-    "zod": "^4.3.0"
+    "xss": "^1.0.14"
  },
  "devDependencies": {
    "@grafana/scenes": "6.38.0",
-    "@rollup/plugin-json": "6.1.0",
    "@rollup/plugin-node-resolve": "16.0.1",
    "@testing-library/react": "16.3.0",
    "@types/history": "4.7.11",
@@ -104,7 +101,6 @@
    "rollup": "^4.22.4",
    "rollup-plugin-esbuild": "6.2.1",
    "rollup-plugin-node-externals": "^8.0.0",
-    "tsx": "^4.21.0",
    "typescript": "5.9.2"
  },
  "peerDependencies": {
@@ -1,4 +1,3 @@
-import json from '@rollup/plugin-json';
 import { createRequire } from 'node:module';

 import { entryPoint, plugins, esmOutput, cjsOutput } from '../rollup.config.parts';
@@ -9,13 +8,13 @@ const pkg = rq('./package.json');
 export default [
  {
    input: entryPoint,
-    plugins: [...plugins, json()],
+    plugins,
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
  {
    input: 'src/unstable.ts',
-    plugins: [...plugins, json()],
+    plugins,
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
@@ -106,4 +106,3 @@ export { findNumericFieldMinMax } from '../field/fieldOverrides';
 export { type PanelOptionsSupplier } from '../panel/PanelPlugin';
 export { sanitize, sanitizeUrl } from '../text/sanitize';
 export { type NestedValueAccess, type NestedPanelOptions, isNestedPanelOptions } from '../utils/OptionsUIBuilders';
-export { NewThemeOptionsSchema } from '../themes/createTheme';
@@ -1,103 +1,83 @@
 import { merge } from 'lodash';
-import { z } from 'zod';

 import { alpha, darken, emphasize, getContrastRatio, lighten } from './colorManipulator';
 import { palette } from './palette';
-import { DeepRequired, ThemeRichColor, ThemeRichColorInputSchema } from './types';
+import { DeepPartial, ThemeRichColor } from './types';

-const ThemeColorsModeSchema = z.enum(['light', 'dark']);
 /** @internal */
-export type ThemeColorsMode = z.infer<typeof ThemeColorsModeSchema>;
+export type ThemeColorsMode = 'light' | 'dark';

-const createThemeColorsBaseSchema = <TColor>(color: TColor) =>
-  z
-    .object({
-      mode: ThemeColorsModeSchema,
-
-      primary: color,
-      secondary: color,
-      info: color,
-      error: color,
-      success: color,
-      warning: color,
-
-      text: z.object({
-        primary: z.string().optional(),
-        secondary: z.string().optional(),
-        disabled: z.string().optional(),
-        link: z.string().optional(),
-        /** Used for auto white or dark text on colored backgrounds */
-        maxContrast: z.string().optional(),
-      }),
-
-      background: z.object({
-        /** Dashboard and body background */
-        canvas: z.string().optional(),
-        /** Primary content pane background (panels etc) */
-        primary: z.string().optional(),
-        /** Cards and elements that need to stand out on the primary background */
-        secondary: z.string().optional(),
-        /**
-         * For popovers and menu backgrounds. This is the same color as primary in most light themes but in dark
-         * themes it has a brighter shade to help give it contrast against the primary background.
-         **/
-        elevated: z.string().optional(),
-      }),
-
-      border: z.object({
-        weak: z.string().optional(),
-        medium: z.string().optional(),
-        strong: z.string().optional(),
-      }),
-
-      gradients: z.object({
-        brandVertical: z.string().optional(),
-        brandHorizontal: z.string().optional(),
-      }),
-
-      action: z.object({
-        /** Used for selected menu item / select option */
-        selected: z.string().optional(),
-        /**
-         * @alpha (Do not use from plugins)
-         * Used for selected items when background only change is not enough (Currently only used for FilterPill)
-         **/
-        selectedBorder: z.string().optional(),
-        /** Used for hovered menu item / select option */
-        hover: z.string().optional(),
-        /** Used for button/colored background hover opacity */
-        hoverOpacity: z.number().optional(),
-        /** Used focused menu item / select option */
-        focus: z.string().optional(),
-        /** Used for disabled buttons and inputs */
-        disabledBackground: z.string().optional(),
-        /** Disabled text */
-        disabledText: z.string().optional(),
-        /** Disablerd opacity */
-        disabledOpacity: z.number().optional(),
-      }),
-
-      hoverFactor: z.number(),
-      contrastThreshold: z.number(),
-      tonalOffset: z.number(),
-    })
-    .partial();
-
-// Need to override the zod type to include the generic properly
 /** @internal */
-export type ThemeColorsBase<TColor> = DeepRequired<
-  Omit<
-    z.infer<ReturnType<typeof createThemeColorsBaseSchema>>,
-    'primary' | 'secondary' | 'info' | 'error' | 'success' | 'warning'
-  >
-> & {
+export interface ThemeColorsBase<TColor> {
+  mode: ThemeColorsMode;
+
  primary: TColor;
  secondary: TColor;
  info: TColor;
  error: TColor;
  success: TColor;
  warning: TColor;
-};
+
+  text: {
+    primary: string;
+    secondary: string;
+    disabled: string;
+    link: string;
+    /** Used for auto white or dark text on colored backgrounds */
+    maxContrast: string;
+  };
+
+  background: {
+    /** Dashboard and body background */
+    canvas: string;
+    /** Primary content pane background (panels etc) */
+    primary: string;
+    /** Cards and elements that need to stand out on the primary background */
+    secondary: string;
+    /**
+     * For popovers and menu backgrounds. This is the same color as primary in most light themes but in dark
+     * themes it has a brighter shade to help give it contrast against the primary background.
+     **/
+    elevated: string;
+  };
+
+  border: {
+    weak: string;
+    medium: string;
+    strong: string;
+  };
+
+  gradients: {
+    brandVertical: string;
+    brandHorizontal: string;
+  };
+
+  action: {
+    /** Used for selected menu item / select option */
+    selected: string;
+    /**
+     * @alpha (Do not use from plugins)
+     * Used for selected items when background only change is not enough (Currently only used for FilterPill)
+     **/
+    selectedBorder: string;
+    /** Used for hovered menu item / select option */
+    hover: string;
+    /** Used for button/colored background hover opacity */
+    hoverOpacity: number;
+    /** Used focused menu item / select option */
+    focus: string;
+    /** Used for disabled buttons and inputs */
+    disabledBackground: string;
+    /** Disabled text */
+    disabledText: string;
+    /** Disablerd opacity */
+    disabledOpacity: number;
+  };
+
+  hoverFactor: number;
+  contrastThreshold: number;
+  tonalOffset: number;
+}

 export interface ThemeHoverStrengh {}

@@ -109,10 +89,8 @@ export interface ThemeColors extends ThemeColorsBase<ThemeRichColor> {
  emphasize(color: string, amount?: number): string;
 }

-export const ThemeColorsInputSchema = createThemeColorsBaseSchema(ThemeRichColorInputSchema);
-
 /** @internal */
-export type ThemeColorsInput = z.infer<typeof ThemeColorsInputSchema>;
+export type ThemeColorsInput = DeepPartial<ThemeColorsBase<ThemeRichColor>>;

 class DarkColors implements ThemeColorsBase<Partial<ThemeRichColor>> {
  mode: ThemeColorsMode = 'dark';
@@ -1,5 +1,3 @@
-import { z } from 'zod';
-
 /** @beta */
 export interface ThemeShape {
  /**
@@ -36,12 +34,9 @@ export interface Radii {
 }

 /** @internal */
-export const ThemeShapeInputSchema = z.object({
-  borderRadius: z.int().nonnegative().optional(),
-});
-
-/** @internal */
-export type ThemeShapeInput = z.infer<typeof ThemeShapeInputSchema>;
+export interface ThemeShapeInput {
+  borderRadius?: number;
+}

 export function createShape(options: ThemeShapeInput): ThemeShape {
  const baseBorderRadius = options.borderRadius ?? 6;
@@ -1,15 +1,11 @@
 // Code based on Material UI
 // The MIT License (MIT)
 // Copyright (c) 2014 Call-Em-All
-import { z } from 'zod';

 /** @internal */
-export const ThemeSpacingOptionsSchema = z.object({
-  gridSize: z.int().positive().optional(),
-});
-
-/** @internal */
-export type ThemeSpacingOptions = z.infer<typeof ThemeSpacingOptionsSchema>;
+export type ThemeSpacingOptions = {
+  gridSize?: number;
+};

 /** @internal */
 export type ThemeSpacingArgument = number | string;
@@ -1,37 +1,28 @@
-import * as z from 'zod';
-
 import { createBreakpoints } from './breakpoints';
-import { createColors, ThemeColorsInputSchema } from './createColors';
+import { createColors, ThemeColorsInput } from './createColors';
 import { createComponents } from './createComponents';
 import { createShadows } from './createShadows';
-import { createShape, ThemeShapeInputSchema } from './createShape';
-import { createSpacing, ThemeSpacingOptionsSchema } from './createSpacing';
+import { createShape, ThemeShapeInput } from './createShape';
+import { createSpacing, ThemeSpacingOptions } from './createSpacing';
 import { createTransitions } from './createTransitions';
-import { createTypography, ThemeTypographyInputSchema } from './createTypography';
+import { createTypography, ThemeTypographyInput } from './createTypography';
 import { createV1Theme } from './createV1Theme';
-import { createVisualizationColors, ThemeVisualizationColorsInputSchema } from './createVisualizationColors';
+import { createVisualizationColors, ThemeVisualizationColorsInput } from './createVisualizationColors';
 import { GrafanaTheme2 } from './types';
 import { zIndex } from './zIndex';

-export const NewThemeOptionsSchema = z.object({
-  name: z.string(),
-  id: z.string(),
-  colors: ThemeColorsInputSchema.optional(),
-  spacing: ThemeSpacingOptionsSchema.optional(),
-  shape: ThemeShapeInputSchema.optional(),
-  typography: ThemeTypographyInputSchema.optional(),
-  visualization: ThemeVisualizationColorsInputSchema.optional(),
-});
+/** @internal */
+export interface NewThemeOptions {
+  name?: string;
+  colors?: ThemeColorsInput;
+  spacing?: ThemeSpacingOptions;
+  shape?: ThemeShapeInput;
+  typography?: ThemeTypographyInput;
+  visualization?: ThemeVisualizationColorsInput;
+}

 /** @internal */
-export type NewThemeOptions = z.infer<typeof NewThemeOptionsSchema>;
-
-/** @internal */
-export function createTheme(
-  options: Omit<NewThemeOptions, 'id' | 'name'> & {
-    name?: NewThemeOptions['name'];
-  } = {}
-): GrafanaTheme2 {
+export function createTheme(options: NewThemeOptions = {}): GrafanaTheme2 {
  const {
    name,
    colors: colorsInput = {},
@@ -1,7 +1,6 @@
 // Code based on Material UI
 // The MIT License (MIT)
 // Copyright (c) 2014 Call-Em-All
-import { z } from 'zod';

 import { ThemeColors } from './createColors';

@@ -41,20 +40,18 @@ export interface ThemeTypographyVariant {
  letterSpacing?: string;
 }

-export const ThemeTypographyInputSchema = z.object({
-  fontFamily: z.string().optional(),
-  fontFamilyMonospace: z.string().optional(),
-  fontSize: z.number().positive().optional(),
-  fontWeightLight: z.number().positive().optional(),
-  fontWeightRegular: z.number().positive().optional(),
-  fontWeightMedium: z.number().positive().optional(),
-  fontWeightBold: z.number().positive().optional(),
-  // what's the font-size on the html element.
+export interface ThemeTypographyInput {
+  fontFamily?: string;
+  fontFamilyMonospace?: string;
+  fontSize?: number;
+  fontWeightLight?: number;
+  fontWeightRegular?: number;
+  fontWeightMedium?: number;
+  fontWeightBold?: number;
+  // hat's the font-size on the html element.
  // 16px is the default font-size used by browsers.
-  htmlFontSize: z.number().positive().optional(),
-});
-
-export type ThemeTypographyInput = z.infer<typeof ThemeTypographyInputSchema>;
+  htmlFontSize?: number;
+}

 const defaultFontFamily = "'Inter', 'Helvetica', 'Arial', sans-serif";
 const defaultFontFamilyMonospace = "'Roboto Mono', monospace";
@@ -1,5 +1,3 @@
-import { z } from 'zod';
-
 import { FALLBACK_COLOR } from '../types/fieldColor';

 import { ThemeColors } from './createColors';
@@ -28,44 +26,29 @@ export interface ThemeVizColor<T extends ThemeVizColorName> {

 type ThemeVizColorName = 'red' | 'orange' | 'yellow' | 'green' | 'blue' | 'purple';

-const createShadeSchema = <T>(color: T extends ThemeVizColorName ? T : never) =>
-  z.enum([`super-light-${color}`, `light-${color}`, color, `semi-dark-${color}`, `dark-${color}`]);
+type ThemeVizColorShadeName<T extends ThemeVizColorName> =
+  | `super-light-${T}`
+  | `light-${T}`
+  | T
+  | `semi-dark-${T}`
+  | `dark-${T}`;

-type ThemeVizColorShadeName<T extends ThemeVizColorName> = z.infer<ReturnType<typeof createShadeSchema<T>>>;
-
-const createHueSchema = <T>(color: T extends ThemeVizColorName ? T : never) =>
-  z.object({
-    name: z.literal(color),
-    shades: z.array(
-      z.object({
-        color: z.string(),
-        name: createShadeSchema(color),
-        aliases: z.array(z.string()).optional(),
-        primary: z.boolean().optional(),
-      })
-    ),
-  });
-
-const ThemeVizHueSchema = z.union([
-  createHueSchema('red'),
-  createHueSchema('orange'),
-  createHueSchema('yellow'),
-  createHueSchema('green'),
-  createHueSchema('blue'),
-  createHueSchema('purple'),
-]);
+type ThemeVizHueGeneric<T> = T extends ThemeVizColorName
+  ? {
+      name: T;
+      shades: Array<ThemeVizColor<T>>;
+    }
+  : never;

 /**
 * @alpha
 */
-export type ThemeVizHue = z.infer<typeof ThemeVizHueSchema>;
+export type ThemeVizHue = ThemeVizHueGeneric<ThemeVizColorName>;

-export const ThemeVisualizationColorsInputSchema = z.object({
-  hues: z.array(ThemeVizHueSchema).optional(),
-  palette: z.array(z.string()).optional(),
-});
-
-export type ThemeVisualizationColorsInput = z.infer<typeof ThemeVisualizationColorsInputSchema>;
+export type ThemeVisualizationColorsInput = {
+  hues?: ThemeVizHue[];
+  palette?: string[];
+};

 /**
 * @internal
@@ -1,6 +1,6 @@
 import { Registry, RegistryItem } from '../utils/Registry';

-import { createTheme, NewThemeOptionsSchema } from './createTheme';
+import { createTheme } from './createTheme';
 import * as extraThemes from './themeDefinitions';
 import { GrafanaTheme2 } from './types';

@@ -42,6 +42,9 @@ export function getBuiltInThemes(allowedExtras: string[]) {
  return sortedThemes;
 }

+/**
+ * There is also a backend list at pkg/services/preference/themes.go
+ */
 const themeRegistry = new Registry<ThemeRegistryItem>(() => {
  return [
    { id: 'system', name: 'System preference', build: getSystemPreferenceTheme },
@@ -50,19 +53,13 @@ const themeRegistry = new Registry<ThemeRegistryItem>(() => {
  ];
 });

-for (const [name, json] of Object.entries(extraThemes)) {
-  const result = NewThemeOptionsSchema.safeParse(json);
-  if (!result.success) {
-    console.error(`Invalid theme definition for theme ${name}: ${result.error.message}`);
-  } else {
-    const theme = result.data;
-    themeRegistry.register({
-      id: theme.id,
-      name: theme.name,
-      build: () => createTheme(theme),
-      isExtra: true,
-    });
-  }
+for (const [id, theme] of Object.entries(extraThemes)) {
+  themeRegistry.register({
+    id,
+    name: theme.name ?? '',
+    build: () => createTheme(theme),
+    isExtra: true,
+  });
 }

 function getSystemPreferenceTheme() {
@@ -1,608 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "name": {
-      "type": "string"
-    },
-    "id": {
-      "type": "string"
-    },
-    "colors": {
-      "type": "object",
-      "properties": {
-        "mode": {
-          "type": "string",
-          "enum": ["light", "dark"]
-        },
-        "primary": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "secondary": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "info": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "error": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "success": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "warning": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "main": {
-              "type": "string"
-            },
-            "shade": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "border": {
-              "type": "string"
-            },
-            "transparent": {
-              "type": "string"
-            },
-            "borderTransparent": {
-              "type": "string"
-            },
-            "contrastText": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "text": {
-          "type": "object",
-          "properties": {
-            "primary": {
-              "type": "string"
-            },
-            "secondary": {
-              "type": "string"
-            },
-            "disabled": {
-              "type": "string"
-            },
-            "link": {
-              "type": "string"
-            },
-            "maxContrast": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "background": {
-          "type": "object",
-          "properties": {
-            "canvas": {
-              "type": "string"
-            },
-            "primary": {
-              "type": "string"
-            },
-            "secondary": {
-              "type": "string"
-            },
-            "elevated": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "border": {
-          "type": "object",
-          "properties": {
-            "weak": {
-              "type": "string"
-            },
-            "medium": {
-              "type": "string"
-            },
-            "strong": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "gradients": {
-          "type": "object",
-          "properties": {
-            "brandVertical": {
-              "type": "string"
-            },
-            "brandHorizontal": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        "action": {
-          "type": "object",
-          "properties": {
-            "selected": {
-              "type": "string"
-            },
-            "selectedBorder": {
-              "type": "string"
-            },
-            "hover": {
-              "type": "string"
-            },
-            "hoverOpacity": {
-              "type": "number"
-            },
-            "focus": {
-              "type": "string"
-            },
-            "disabledBackground": {
-              "type": "string"
-            },
-            "disabledText": {
-              "type": "string"
-            },
-            "disabledOpacity": {
-              "type": "number"
-            }
-          },
-          "additionalProperties": false
-        },
-        "hoverFactor": {
-          "type": "number"
-        },
-        "contrastThreshold": {
-          "type": "number"
-        },
-        "tonalOffset": {
-          "type": "number"
-        }
-      },
-      "additionalProperties": false
-    },
-    "spacing": {
-      "type": "object",
-      "properties": {
-        "gridSize": {
-          "type": "integer",
-          "exclusiveMinimum": 0,
-          "maximum": 9007199254740991
-        }
-      },
-      "additionalProperties": false
-    },
-    "shape": {
-      "type": "object",
-      "properties": {
-        "borderRadius": {
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        }
-      },
-      "additionalProperties": false
-    },
-    "typography": {
-      "type": "object",
-      "properties": {
-        "fontFamily": {
-          "type": "string"
-        },
-        "fontFamilyMonospace": {
-          "type": "string"
-        },
-        "fontSize": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        },
-        "fontWeightLight": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        },
-        "fontWeightRegular": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        },
-        "fontWeightMedium": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        },
-        "fontWeightBold": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        },
-        "htmlFontSize": {
-          "type": "number",
-          "exclusiveMinimum": 0
-        }
-      },
-      "additionalProperties": false
-    },
-    "visualization": {
-      "type": "object",
-      "properties": {
-        "hues": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "red"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-red", "light-red", "red", "semi-dark-red", "dark-red"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "orange"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-orange", "light-orange", "orange", "semi-dark-orange", "dark-orange"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "yellow"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-yellow", "light-yellow", "yellow", "semi-dark-yellow", "dark-yellow"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "green"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-green", "light-green", "green", "semi-dark-green", "dark-green"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "blue"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-blue", "light-blue", "blue", "semi-dark-blue", "dark-blue"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "const": "purple"
-                  },
-                  "shades": {
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "color": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string",
-                          "enum": ["super-light-purple", "light-purple", "purple", "semi-dark-purple", "dark-purple"]
-                        },
-                        "aliases": {
-                          "type": "array",
-                          "items": {
-                            "type": "string"
-                          }
-                        },
-                        "primary": {
-                          "type": "boolean"
-                        }
-                      },
-                      "required": ["color", "name"],
-                      "additionalProperties": false
-                    }
-                  }
-                },
-                "required": ["name", "shades"],
-                "additionalProperties": false
-              }
-            ]
-          }
-        },
-        "palette": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-  "required": ["name", "id"],
-  "additionalProperties": false
-}
@@ -1,19 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-import { NewThemeOptionsSchema } from '../createTheme';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-fs.writeFileSync(
-  path.join(__dirname, '../schema.generated.json'),
-  JSON.stringify(
-    NewThemeOptionsSchema.toJSONSchema({
-      target: 'draft-07',
-    }),
-    undefined,
-    2
-  )
-);
@@ -1,50 +0,0 @@
-{
-  "name": "Aubergine",
-  "id": "aubergine",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "#4F2A3D",
-      "medium": "#6A3C4B",
-      "strong": "#8C5A69"
-    },
-    "text": {
-      "primary": "#E5D0D6",
-      "secondary": "#D1A8C4",
-      "disabled": "#B7A0A6",
-      "link": "#A56BB6",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#8C5A69"
-    },
-    "secondary": {
-      "main": "#6A3C4B",
-      "text": "#D1A8C4",
-      "border": "#8C5A69"
-    },
-    "background": {
-      "canvas": "#2E1F2D",
-      "primary": "#3C2136",
-      "secondary": "#4A2D47",
-      "elevated": "#4A2D47"
-    },
-    "action": {
-      "hover": "#6A3C4B",
-      "selected": "#8C5A69",
-      "selectedBorder": "#FFB300",
-      "focus": "#A56BB6",
-      "hoverOpacity": 0.1,
-      "disabledText": "#B7A0A6",
-      "disabledBackground": "#4A2D47",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #6A3C4B 0%, #A56BB6 100%)",
-      "brandVertical": "linear-gradient(0deg, #6A3C4B 0%, #A56BB6 100%)"
-    },
-    "contrastThreshold": 4,
-    "hoverFactor": 0.07,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,53 @@
+import { NewThemeOptions } from '../createTheme';
+
+const aubergineTheme: NewThemeOptions = {
+  name: 'Aubergine',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: '#4F2A3D',
+      medium: '#6A3C4B',
+      strong: '#8C5A69',
+    },
+    text: {
+      primary: '#E5D0D6',
+      secondary: '#D1A8C4',
+      disabled: '#B7A0A6',
+      link: '#A56BB6',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#8C5A69',
+    },
+    secondary: {
+      main: '#6A3C4B',
+      text: '#D1A8C4',
+      border: '#8C5A69',
+    },
+    background: {
+      canvas: '#2E1F2D',
+      primary: '#3C2136',
+      secondary: '#4A2D47',
+      elevated: '#4A2D47',
+    },
+    action: {
+      hover: '#6A3C4B',
+      selected: '#8C5A69',
+      selectedBorder: '#FFB300',
+      focus: '#A56BB6',
+      hoverOpacity: 0.1,
+      disabledText: '#B7A0A6',
+      disabledBackground: '#4A2D47',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #6A3C4B 0%, #A56BB6 100%)',
+      brandVertical: 'linear-gradient(0deg, #6A3C4B 0%, #A56BB6 100%)',
+    },
+    contrastThreshold: 4,
+    hoverFactor: 0.07,
+    tonalOffset: 0.15,
+  },
+};
+
+export default aubergineTheme;
@@ -1,60 +0,0 @@
-{
-  "name": "Debug",
-  "id": "debug",
-  "colors": {
-    "mode": "dark",
-    "background": {
-      "canvas": "#000033",
-      "primary": "#000044",
-      "secondary": "#000055",
-      "elevated": "#000055"
-    },
-    "text": {
-      "primary": "#bbbb00",
-      "secondary": "#888800",
-      "disabled": "#444400",
-      "link": "#dddd00",
-      "maxContrast": "#ffff00"
-    },
-    "border": {
-      "weak": "#ff000044",
-      "medium": "#ff000088",
-      "strong": "#ff0000ff"
-    },
-    "primary": {
-      "border": "#ff000088",
-      "text": "#cccc00",
-      "contrastText": "#ffff00",
-      "shade": "#9900dd"
-    },
-    "secondary": {
-      "border": "#ff000088",
-      "text": "#cccc00",
-      "contrastText": "#ffff00",
-      "shade": "#9900dd"
-    },
-    "info": {
-      "shade": "#9900dd"
-    },
-    "warning": {
-      "shade": "#9900dd"
-    },
-    "success": {
-      "shade": "#9900dd"
-    },
-    "error": {
-      "shade": "#9900dd"
-    },
-    "action": {
-      "hover": "#9900dd",
-      "focus": "#6600aa",
-      "selected": "#440088"
-    }
-  },
-  "shape": {
-    "borderRadius": 8
-  },
-  "spacing": {
-    "gridSize": 10
-  }
-}
@@ -0,0 +1,71 @@
+import { NewThemeOptions } from '../createTheme';
+
+/**
+ * a very ugly theme that is useful for debugging and checking if the theme is applied correctly
+ * borders are red,
+ * backgrounds are blue,
+ * text is yellow,
+ * and grafana loves you <3
+ * (also corners are rounded, action states (hover, focus, selected) are purple)
+ */
+const debugTheme: NewThemeOptions = {
+  name: 'Debug',
+  colors: {
+    mode: 'dark',
+    background: {
+      canvas: '#000033',
+      primary: '#000044',
+      secondary: '#000055',
+      elevated: '#000055',
+    },
+    text: {
+      primary: '#bbbb00',
+      secondary: '#888800',
+      disabled: '#444400',
+      link: '#dddd00',
+      maxContrast: '#ffff00',
+    },
+    border: {
+      weak: '#ff000044',
+      medium: '#ff000088',
+      strong: '#ff0000ff',
+    },
+    primary: {
+      border: '#ff000088',
+      text: '#cccc00',
+      contrastText: '#ffff00',
+      shade: '#9900dd',
+    },
+    secondary: {
+      border: '#ff000088',
+      text: '#cccc00',
+      contrastText: '#ffff00',
+      shade: '#9900dd',
+    },
+    info: {
+      shade: '#9900dd',
+    },
+    warning: {
+      shade: '#9900dd',
+    },
+    success: {
+      shade: '#9900dd',
+    },
+    error: {
+      shade: '#9900dd',
+    },
+    action: {
+      hover: '#9900dd',
+      focus: '#6600aa',
+      selected: '#440088',
+    },
+  },
+  shape: {
+    borderRadius: 8,
+  },
+  spacing: {
+    gridSize: 10,
+  },
+};
+
+export default debugTheme;
@@ -1,71 +0,0 @@
-{
-  "name": "Desert bloom",
-  "id": "desertbloom",
-  "colors": {
-    "mode": "light",
-    "border": {
-      "weak": "rgba(0, 0, 0, 0.12)",
-      "medium": "rgba(0, 0, 0, 0.20)",
-      "strong": "rgba(0, 0, 0, 0.30)"
-    },
-    "text": {
-      "primary": "#333333",
-      "secondary": "#555555",
-      "disabled": "rgba(0, 0, 0, 0.5)",
-      "link": "#1A82E2",
-      "maxContrast": "#000000"
-    },
-    "primary": {
-      "main": "#FF6F61",
-      "text": "#FE6F61",
-      "border": "#E55B4D",
-      "name": "primary",
-      "shade": "#E55B4D",
-      "transparent": "#FF6F6126",
-      "contrastText": "#FFFFFF",
-      "borderTransparent": "#FF6F6140"
-    },
-    "secondary": {
-      "main": "#FFFFFF",
-      "text": "#695f53",
-      "border": "#d9cec0",
-      "name": "secondary",
-      "shade": "#d9cec0",
-      "transparent": "#FFFFFF26",
-      "contrastText": "#4c4339",
-      "borderTransparent": "#FFFFFF40"
-    },
-    "info": {
-      "main": "#1A82E2"
-    },
-    "success": {
-      "main": "#4CAF50"
-    },
-    "warning": {
-      "main": "#FFC107"
-    },
-    "background": {
-      "canvas": "#FFF8F0",
-      "primary": "#FFFFFF",
-      "secondary": "#f9f3e8",
-      "elevated": "#FFFFFF"
-    },
-    "action": {
-      "hover": "rgba(168, 156, 134, 0.12)",
-      "selected": "rgba(168, 156, 134, 0.36)",
-      "selectedBorder": "#FF6F61",
-      "focus": "rgba(168, 156, 134, 0.50)",
-      "hoverOpacity": 0.08,
-      "disabledText": "rgba(168, 156, 134, 0.5)",
-      "disabledBackground": "rgba(168, 156, 134, 0.06)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg,rgba(255, 111, 97, 1) 0%, rgba(255, 167, 58, 1) 100%)",
-      "brandVertical": "linear-gradient(0deg, rgba(255, 111, 97, 1) 0%, rgba(255, 167, 58, 1) 100%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,75 @@
+import { NewThemeOptions } from '../createTheme';
+
+const desertBloomTheme: NewThemeOptions = {
+  name: 'Desert bloom',
+  colors: {
+    mode: 'light',
+    border: {
+      weak: 'rgba(0, 0, 0, 0.12)',
+      medium: 'rgba(0, 0, 0, 0.20)',
+      strong: 'rgba(0, 0, 0, 0.30)',
+    },
+    text: {
+      primary: '#333333',
+      secondary: '#555555',
+      disabled: 'rgba(0, 0, 0, 0.5)',
+      link: '#1A82E2',
+      maxContrast: '#000000',
+    },
+    primary: {
+      main: '#FF6F61',
+      text: '#FE6F61',
+      border: '#E55B4D',
+      name: 'primary',
+      shade: '#E55B4D',
+      transparent: '#FF6F6126',
+      contrastText: '#FFFFFF',
+      borderTransparent: '#FF6F6140',
+    },
+    secondary: {
+      main: '#FFFFFF',
+      text: '#695f53',
+      border: '#d9cec0',
+      name: 'secondary',
+      shade: '#d9cec0',
+      transparent: '#FFFFFF26',
+      contrastText: '#4c4339',
+      borderTransparent: '#FFFFFF40',
+    },
+    info: {
+      main: '#1A82E2',
+    },
+    success: {
+      main: '#4CAF50',
+    },
+    warning: {
+      main: '#FFC107',
+    },
+    background: {
+      canvas: '#FFF8F0',
+      primary: '#FFFFFF',
+      secondary: '#f9f3e8',
+      elevated: '#FFFFFF',
+    },
+    action: {
+      hover: 'rgba(168, 156, 134, 0.12)',
+      selected: 'rgba(168, 156, 134, 0.36)',
+      selectedBorder: '#FF6F61',
+      focus: 'rgba(168, 156, 134, 0.50)',
+      hoverOpacity: 0.08,
+      disabledText: 'rgba(168, 156, 134, 0.5)',
+      disabledBackground: 'rgba(168, 156, 134, 0.06)',
+      disabledOpacity: 0.38,
+    },
+
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg,rgba(255, 111, 97, 1) 0%, rgba(255, 167, 58, 1) 100%)',
+      brandVertical: 'linear-gradient(0deg, rgba(255, 111, 97, 1) 0%, rgba(255, 167, 58, 1) 100%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.15,
+  },
+};
+
+export default desertBloomTheme;
@@ -1,62 +0,0 @@
-{
-  "name": "Gilded grove",
-  "id": "gildedgrove",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "rgba(200, 200, 180, 0.12)",
-      "medium": "rgba(200, 200, 180, 0.20)",
-      "strong": "rgba(200, 200, 180, 0.30)"
-    },
-    "text": {
-      "primary": "rgb(250, 250, 239)",
-      "secondary": "rgba(200, 200, 180, 0.85)",
-      "disabled": "rgba(200, 200, 180, 0.6)",
-      "link": "#FEAC34",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#FEAC34",
-      "text": "#FFD783",
-      "border": "#FFD783",
-      "name": "primary",
-      "shade": "rgb(255, 173, 80)",
-      "transparent": "#FEAC3426",
-      "contrastText": "#111614",
-      "borderTransparent": "#FFD78340"
-    },
-    "secondary": {
-      "main": "rgba(200, 200, 180, 0.10)",
-      "shade": "rgba(200, 200, 180, 0.14)",
-      "transparent": "rgba(200, 200, 180, 0.08)",
-      "text": "rgb(200, 200, 180)",
-      "contrastText": "rgb(200, 200, 180)",
-      "border": "rgba(200, 200, 180, 0.08)",
-      "name": "secondary",
-      "borderTransparent": "rgba(200, 200, 180, 0.25)"
-    },
-    "background": {
-      "canvas": "#111614",
-      "primary": "#1d2220",
-      "secondary": "#27312E",
-      "elevated": "#27312E"
-    },
-    "action": {
-      "hover": "rgba(200, 200, 180, 0.16)",
-      "selected": "rgba(200, 200, 180, 0.12)",
-      "selectedBorder": "#FEAC34",
-      "focus": "rgba(200, 200, 180, 0.16)",
-      "hoverOpacity": 0.08,
-      "disabledText": "rgba(200, 200, 180, 0.6)",
-      "disabledBackground": "rgba(200, 200, 180, 0.04)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #FEAC34 0%, #FFD783 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #FEAC34 0.01%, #FFD783 99.99%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,65 @@
+import { NewThemeOptions } from '../createTheme';
+
+const gildedGroveTheme: NewThemeOptions = {
+  name: 'Gilded grove',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: 'rgba(200, 200, 180, 0.12)',
+      medium: 'rgba(200, 200, 180, 0.20)',
+      strong: 'rgba(200, 200, 180, 0.30)',
+    },
+    text: {
+      primary: 'rgb(250, 250, 239)',
+      secondary: 'rgba(200, 200, 180, 0.85)',
+      disabled: 'rgba(200, 200, 180, 0.6)',
+      link: '#FEAC34',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#FEAC34',
+      text: '#FFD783',
+      border: '#FFD783',
+      name: 'primary',
+      shade: 'rgb(255, 173, 80)',
+      transparent: '#FEAC3426',
+      contrastText: '#111614',
+      borderTransparent: '#FFD78340',
+    },
+    secondary: {
+      main: 'rgba(200, 200, 180, 0.10)',
+      shade: 'rgba(200, 200, 180, 0.14)',
+      transparent: 'rgba(200, 200, 180, 0.08)',
+      text: 'rgb(200, 200, 180)',
+      contrastText: 'rgb(200, 200, 180)',
+      border: 'rgba(200, 200, 180, 0.08)',
+      name: 'secondary',
+      borderTransparent: 'rgba(200, 200, 180, 0.25)',
+    },
+    background: {
+      canvas: '#111614',
+      primary: '#1d2220',
+      secondary: '#27312E',
+      elevated: '#27312E',
+    },
+    action: {
+      hover: 'rgba(200, 200, 180, 0.16)',
+      selected: 'rgba(200, 200, 180, 0.12)',
+      selectedBorder: '#FEAC34',
+      focus: 'rgba(200, 200, 180, 0.16)',
+      hoverOpacity: 0.08,
+      disabledText: 'rgba(200, 200, 180, 0.6)',
+      disabledBackground: 'rgba(200, 200, 180, 0.04)',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #FEAC34 0%, #FFD783 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #FEAC34 0.01%, #FFD783 99.99%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.15,
+  },
+};
+
+export default gildedGroveTheme;
@@ -1,52 +0,0 @@
-{
-  "name": "Gloom",
-  "id": "gloom",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "rgba(210, 210, 220, 0.12)",
-      "medium": "rgba(210, 210, 220, 0.20)",
-      "strong": "rgba(210, 210, 220, 0.30)"
-    },
-    "text": {
-      "primary": "rgb(210, 210, 220)",
-      "secondary": "rgba(210, 210, 220, 0.65)",
-      "disabled": "rgba(210, 210, 220, 0.48)",
-      "link": "#f99a5c",
-      "maxContrast": "#FFF"
-    },
-    "primary": {
-      "main": "#ff934d",
-      "text": "#f99a5c",
-      "border": "#ff934d",
-      "name": "primary"
-    },
-    "secondary": {
-      "main": "rgba(195, 195, 245, 0.10)",
-      "shade": "rgba(195, 195, 245, 0.14)",
-      "transparent": "rgba(195, 195, 245, 0.08)",
-      "text": "rgba(195, 195, 245)",
-      "contrastText": "rgb(195, 195, 245)",
-      "border": "rgba(195, 195, 245, 0.08)"
-    },
-    "background": {
-      "canvas": "#000",
-      "primary": "#121118",
-      "secondary": "#211e28",
-      "elevated": "#211e28"
-    },
-    "action": {
-      "hover": "rgba(195, 195, 245, 0.07)",
-      "selected": "rgba(195, 195, 245, 0.11)",
-      "selectedBorder": "#ff934d",
-      "focus": "rgba(195, 195, 245, 0.07)",
-      "hoverOpacity": 0.05,
-      "disabledText": "rgba(210, 210, 220, 0.48)",
-      "disabledBackground": "rgba(210, 210, 220, 0.04)",
-      "disabledOpacity": 0.38
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,80 @@
+import { NewThemeOptions } from '../createTheme';
+
+/**
+ * Torkel's GrafanaCon theme
+ * very WIP state
+ */
+
+const whiteBase = `210, 210, 220`;
+const secondaryBase = `195, 195, 245`;
+
+//const brandMain = '#3d71d9';
+//const brandText = '#6e9fff';
+const brandMain = '#ff934d';
+const brandText = '#f99a5c';
+const disabledText = `rgba(${whiteBase}, 0.48)`;
+
+const gloomTheme: NewThemeOptions = {
+  name: 'Gloom',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: `rgba(${whiteBase}, 0.12)`,
+      medium: `rgba(${whiteBase}, 0.20)`,
+      strong: `rgba(${whiteBase}, 0.30)`,
+    },
+
+    text: {
+      primary: `rgb(${whiteBase})`,
+      secondary: `rgba(${whiteBase}, 0.65)`,
+      disabled: disabledText,
+      link: brandText,
+      maxContrast: '#FFF',
+    },
+
+    primary: {
+      main: brandMain,
+      text: brandText,
+      border: brandMain,
+      name: 'primary',
+    },
+
+    secondary: {
+      main: `rgba(${secondaryBase}, 0.10)`,
+      shade: `rgba(${secondaryBase}, 0.14)`,
+      transparent: `rgba(${secondaryBase}, 0.08)`,
+      text: `rgba(${secondaryBase})`,
+      contrastText: `rgb(${secondaryBase})`,
+      border: `rgba(${secondaryBase}, 0.08)`,
+    },
+
+    background: {
+      canvas: '#000',
+      primary: '#121118',
+      secondary: '#211e28',
+      elevated: '#211e28',
+    },
+
+    action: {
+      hover: `rgba(${secondaryBase}, 0.07)`,
+      selected: `rgba(${secondaryBase}, 0.11)`,
+      selectedBorder: brandMain,
+      focus: `rgba(${secondaryBase}, 0.07)`,
+      hoverOpacity: 0.05,
+      disabledText: disabledText,
+      disabledBackground: `rgba(${whiteBase}, 0.04)`,
+      disabledOpacity: 0.38,
+    },
+
+    // gradients: {
+    //   brandHorizontal: 'linear-gradient(270deg, #ff934d 0%, #FEAC34 100%)',
+    //   brandVertical: 'linear-gradient(0.01deg, #ff934d 0.01%, #FEAC34 99.99%)',
+    // },
+
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.15,
+  },
+};
+
+export default gloomTheme;
@@ -1,12 +1,12 @@
-export { default as aubergine } from './aubergine.json';
-export { default as debug } from './debug.json';
-export { default as desertbloom } from './desertbloom.json';
-export { default as gildedgrove } from './gildedgrove.json';
-export { default as mars } from './mars.json';
-export { default as matrix } from './matrix.json';
-export { default as sapphiredusk } from './sapphiredusk.json';
-export { default as synthwave } from './synthwave.json';
-export { default as tron } from './tron.json';
-export { default as victorian } from './victorian.json';
-export { default as zen } from './zen.json';
-export { default as gloom } from './gloom.json';
+export { default as aubergine } from './aubergine';
+export { default as debug } from './debug';
+export { default as desertbloom } from './desertbloom';
+export { default as gildedgrove } from './gildedgrove';
+export { default as mars } from './mars';
+export { default as matrix } from './matrix';
+export { default as sapphiredusk } from './sapphiredusk';
+export { default as synthwave } from './synthwave';
+export { default as tron } from './tron';
+export { default as victorian } from './victorian';
+export { default as zen } from './zen';
+export { default as gloom } from './gloom';
@@ -1,50 +0,0 @@
-{
-  "name": "Mars",
-  "id": "mars",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "rgba(210, 90, 60, 0.2)",
-      "medium": "rgba(210, 90, 60, 0.35)",
-      "strong": "rgba(210, 90, 60, 0.5)"
-    },
-    "text": {
-      "primary": "#DDDDDD",
-      "secondary": "#BBBBBB",
-      "disabled": "rgba(221, 221, 221, 0.5)",
-      "link": "#FF6F61",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#FF6F61"
-    },
-    "secondary": {
-      "main": "#6a2f2f",
-      "text": "#BBBBBB",
-      "border": "rgba(210, 90, 60, 0.2)"
-    },
-    "background": {
-      "canvas": "#3C1E1E",
-      "primary": "#522626",
-      "secondary": "#6A2F2F",
-      "elevated": "#6A2F2F"
-    },
-    "action": {
-      "hover": "rgba(210, 90, 60, 0.16)",
-      "selected": "rgba(210, 90, 60, 0.12)",
-      "selectedBorder": "#FF6F61",
-      "focus": "rgba(210, 90, 60, 0.16)",
-      "hoverOpacity": 0.08,
-      "disabledText": "rgba(221, 221, 221, 0.5)",
-      "disabledBackground": "rgba(210, 90, 60, 0.08)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #FF6F61 0%, #D25A3C 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #FF6F61 0.01%, #D25A3C 99.99%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.05,
-    "tonalOffset": 0.2
-  }
-}
@@ -0,0 +1,53 @@
+import { NewThemeOptions } from '../createTheme';
+
+const marsTheme: NewThemeOptions = {
+  name: 'Mars',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: 'rgba(210, 90, 60, 0.2)',
+      medium: 'rgba(210, 90, 60, 0.35)',
+      strong: 'rgba(210, 90, 60, 0.5)',
+    },
+    text: {
+      primary: '#DDDDDD',
+      secondary: '#BBBBBB',
+      disabled: 'rgba(221, 221, 221, 0.5)',
+      link: '#FF6F61',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#FF6F61',
+    },
+    secondary: {
+      main: '#6a2f2f',
+      text: '#BBBBBB',
+      border: 'rgba(210, 90, 60, 0.2)',
+    },
+    background: {
+      canvas: '#3C1E1E',
+      primary: '#522626',
+      secondary: '#6A2F2F',
+      elevated: '#6A2F2F',
+    },
+    action: {
+      hover: 'rgba(210, 90, 60, 0.16)',
+      selected: 'rgba(210, 90, 60, 0.12)',
+      selectedBorder: '#FF6F61',
+      focus: 'rgba(210, 90, 60, 0.16)',
+      hoverOpacity: 0.08,
+      disabledText: 'rgba(221, 221, 221, 0.5)',
+      disabledBackground: 'rgba(210, 90, 60, 0.08)',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #FF6F61 0%, #D25A3C 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #FF6F61 0.01%, #D25A3C 99.99%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.05,
+    tonalOffset: 0.2,
+  },
+};
+
+export default marsTheme;
@@ -1,41 +0,0 @@
-{
-  "name": "Matrix",
-  "id": "matrix",
-  "colors": {
-    "mode": "dark",
-    "background": {
-      "canvas": "#000000",
-      "primary": "#020202",
-      "secondary": "#080808",
-      "elevated": "#080808"
-    },
-    "text": {
-      "primary": "#00c017",
-      "secondary": "#008910",
-      "disabled": "#006a0c",
-      "link": "#00ff41",
-      "maxContrast": "#00ff41"
-    },
-    "border": {
-      "weak": "#008f1144",
-      "medium": "#008f1188",
-      "strong": "#008910"
-    },
-    "primary": {
-      "main": "#008910"
-    },
-    "secondary": {
-      "text": "#008910"
-    },
-    "gradients": {
-      "brandVertical": "linear-gradient(0deg, #008910 0%, #00ff41 100%)",
-      "brandHorizontal": "linear-gradient(90deg, #008910 0%, #00ff41 100%)"
-    }
-  },
-  "shape": {
-    "borderRadius": 0
-  },
-  "typography": {
-    "fontFamily": "monospace"
-  }
-}
@@ -0,0 +1,44 @@
+import { NewThemeOptions } from '../createTheme';
+
+const matrixTheme: NewThemeOptions = {
+  name: 'Matrix',
+  colors: {
+    mode: 'dark',
+    background: {
+      canvas: '#000000',
+      primary: '#020202',
+      secondary: '#080808',
+      elevated: '#080808',
+    },
+    text: {
+      primary: '#00c017',
+      secondary: '#008910',
+      disabled: '#006a0c',
+      link: '#00ff41',
+      maxContrast: '#00ff41',
+    },
+    border: {
+      weak: '#008f1144',
+      medium: '#008f1188',
+      strong: '#008910',
+    },
+    primary: {
+      main: '#008910',
+    },
+    secondary: {
+      text: '#008910',
+    },
+    gradients: {
+      brandVertical: 'linear-gradient(0deg, #008910 0%, #00ff41 100%)',
+      brandHorizontal: 'linear-gradient(90deg, #008910 0%, #00ff41 100%)',
+    },
+  },
+  shape: {
+    borderRadius: 0,
+  },
+  typography: {
+    fontFamily: 'monospace',
+  },
+};
+
+export default matrixTheme;
@@ -1,76 +0,0 @@
-{
-  "name": "Sapphire dusk",
-  "id": "sapphiredusk",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "#232e47",
-      "medium": "#2c3853",
-      "strong": "#404d6b"
-    },
-    "text": {
-      "primary": "#FFFFFF",
-      "secondary": "#bcccdd",
-      "disabled": "#838da5",
-      "link": "#93EBF0",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#93EBF0",
-      "text": "#a8e9ed",
-      "border": "#93ebf0",
-      "name": "primary",
-      "shade": "#c0f5d9",
-      "transparent": "#93EBF029",
-      "contrastText": "#111614",
-      "borderTransparent": "#93ebf040"
-    },
-    "secondary": {
-      "main": "#2c364f",
-      "shade": "#36415e",
-      "transparent": "rgba(200, 200, 180, 0.08)",
-      "text": "#d1dfff",
-      "contrastText": "#acfeff",
-      "border": "rgba(200, 200, 180, 0.08)",
-      "name": "secondary",
-      "borderTransparent": "rgba(200, 200, 180, 0.25)"
-    },
-    "info": {
-      "main": "#4d4593",
-      "text": "#a8e9ed",
-      "border": "#5d54a7"
-    },
-    "error": {
-      "main": "#c63370"
-    },
-    "success": {
-      "main": "#1A7F4B"
-    },
-    "warning": {
-      "main": "#D448EA"
-    },
-    "background": {
-      "canvas": "#1e273d",
-      "primary": "#12192e",
-      "secondary": "#212c47",
-      "elevated": "#212c47"
-    },
-    "action": {
-      "hover": "#364057",
-      "selected": "#364260",
-      "selectedBorder": "#D448EA",
-      "focus": "#364057",
-      "hoverOpacity": 0.08,
-      "disabledText": "#838da5",
-      "disabledBackground": "rgba(54, 64, 87, 0.2)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #D346EF 0%, #2C83FE 100%)",
-      "brandVertical": "linear-gradient(0deg, #D346EF 0%, #2C83FE 100%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,79 @@
+import { NewThemeOptions } from '../createTheme';
+
+const sapphireDuskTheme: NewThemeOptions = {
+  name: 'Sapphire dusk',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: '#232e47',
+      medium: '#2c3853',
+      strong: '#404d6b',
+    },
+    text: {
+      primary: '#FFFFFF',
+      secondary: '#bcccdd',
+      disabled: '#838da5',
+      link: '#93EBF0',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#93EBF0',
+      text: '#a8e9ed',
+      border: '#93ebf0',
+      name: 'primary',
+      shade: '#c0f5d9',
+      transparent: '#93EBF029',
+      contrastText: '#111614',
+      borderTransparent: '#93ebf040',
+    },
+    secondary: {
+      main: '#2c364f',
+      shade: '#36415e',
+      transparent: 'rgba(200, 200, 180, 0.08)',
+      text: '#d1dfff',
+      contrastText: '#acfeff',
+      border: 'rgba(200, 200, 180, 0.08)',
+      name: 'secondary',
+      borderTransparent: 'rgba(200, 200, 180, 0.25)',
+    },
+    info: {
+      main: '#4d4593',
+      text: '#a8e9ed',
+      border: '#5d54a7',
+    },
+    error: {
+      main: '#c63370',
+    },
+    success: {
+      main: '#1A7F4B',
+    },
+    warning: {
+      main: '#D448EA',
+    },
+    background: {
+      canvas: '#1e273d',
+      primary: '#12192e',
+      secondary: '#212c47',
+      elevated: '#212c47',
+    },
+    action: {
+      hover: '#364057',
+      selected: '#364260',
+      selectedBorder: '#D448EA',
+      focus: '#364057',
+      hoverOpacity: 0.08,
+      disabledText: '#838da5',
+      disabledBackground: 'rgba(54, 64, 87, 0.2)',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #D346EF 0%, #2C83FE 100%)',
+      brandVertical: 'linear-gradient(0deg, #D346EF 0%, #2C83FE 100%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.15,
+  },
+};
+
+export default sapphireDuskTheme;
@@ -1,50 +0,0 @@
-{
-  "name": "Synthwave",
-  "id": "synthwave",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "rgba(255, 20, 147, 0.12)",
-      "medium": "rgba(255, 20, 147, 0.20)",
-      "strong": "rgba(255, 20, 147, 0.30)"
-    },
-    "text": {
-      "primary": "#E0E0E0",
-      "secondary": "rgba(224, 224, 224, 0.75)",
-      "disabled": "rgba(224, 224, 224, 0.5)",
-      "link": "#FF69B4",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#FF1493"
-    },
-    "secondary": {
-      "main": "#37183a",
-      "text": "rgba(224, 224, 224, 0.75)",
-      "border": "rgba(255, 20, 147, 0.10)"
-    },
-    "background": {
-      "canvas": "#1A1A2E",
-      "primary": "#16213E",
-      "secondary": "#0F3460",
-      "elevated": "#0F3460"
-    },
-    "action": {
-      "hover": "rgba(255, 20, 147, 0.16)",
-      "selected": "rgba(255, 20, 147, 0.12)",
-      "selectedBorder": "#FF1493",
-      "focus": "rgba(255, 20, 147, 0.16)",
-      "hoverOpacity": 0.08,
-      "disabledText": "rgba(224, 224, 224, 0.5)",
-      "disabledBackground": "rgba(255, 20, 147, 0.08)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #FF1493 0%, #1E90FF 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #FF1493 0.01%, #1E90FF 99.99%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.15
-  }
-}
@@ -0,0 +1,53 @@
+import { NewThemeOptions } from '../createTheme';
+
+const synthwaveTheme: NewThemeOptions = {
+  name: 'Synthwave',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: 'rgba(255, 20, 147, 0.12)',
+      medium: 'rgba(255, 20, 147, 0.20)',
+      strong: 'rgba(255, 20, 147, 0.30)',
+    },
+    text: {
+      primary: '#E0E0E0',
+      secondary: 'rgba(224, 224, 224, 0.75)',
+      disabled: 'rgba(224, 224, 224, 0.5)',
+      link: '#FF69B4',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#FF1493',
+    },
+    secondary: {
+      main: '#37183a',
+      text: 'rgba(224, 224, 224, 0.75)',
+      border: 'rgba(255, 20, 147, 0.10)',
+    },
+    background: {
+      canvas: '#1A1A2E',
+      primary: '#16213E',
+      secondary: '#0F3460',
+      elevated: '#0F3460',
+    },
+    action: {
+      hover: 'rgba(255, 20, 147, 0.16)',
+      selected: 'rgba(255, 20, 147, 0.12)',
+      selectedBorder: '#FF1493',
+      focus: 'rgba(255, 20, 147, 0.16)',
+      hoverOpacity: 0.08,
+      disabledText: 'rgba(224, 224, 224, 0.5)',
+      disabledBackground: 'rgba(255, 20, 147, 0.08)',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #FF1493 0%, #1E90FF 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #FF1493 0.01%, #1E90FF 99.99%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.15,
+  },
+};
+
+export default synthwaveTheme;
@@ -1,50 +0,0 @@
-{
-  "name": "Tron",
-  "id": "tron",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "rgba(0, 255, 255, 0.12)",
-      "medium": "rgba(0, 255, 255, 0.20)",
-      "strong": "rgba(0, 255, 255, 0.30)"
-    },
-    "text": {
-      "primary": "#E0E0E0",
-      "secondary": "rgba(224, 224, 224, 0.75)",
-      "disabled": "rgba(224, 224, 224, 0.5)",
-      "link": "#00FFFF",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#00FFFF"
-    },
-    "secondary": {
-      "main": "#0b2e36",
-      "text": "rgba(224, 224, 224, 0.75)",
-      "border": "rgba(0, 255, 255, 0.10)"
-    },
-    "background": {
-      "canvas": "#0A0F18",
-      "primary": "#0F1B2A",
-      "secondary": "#152234",
-      "elevated": "#152234"
-    },
-    "action": {
-      "hover": "rgba(0, 255, 255, 0.16)",
-      "selected": "rgba(0, 255, 255, 0.12)",
-      "selectedBorder": "#00FFFF",
-      "focus": "rgba(0, 255, 255, 0.16)",
-      "hoverOpacity": 0.08,
-      "disabledText": "rgba(224, 224, 224, 0.5)",
-      "disabledBackground": "rgba(0, 255, 255, 0.08)",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #00FFFF 0%, #29ABE2 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #00FFFF 0.01%, #29ABE2 99.99%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.05,
-    "tonalOffset": 0.2
-  }
-}
@@ -0,0 +1,53 @@
+import { NewThemeOptions } from '../createTheme';
+
+const tronTheme: NewThemeOptions = {
+  name: 'Tron',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: 'rgba(0, 255, 255, 0.12)',
+      medium: 'rgba(0, 255, 255, 0.20)',
+      strong: 'rgba(0, 255, 255, 0.30)',
+    },
+    text: {
+      primary: '#E0E0E0',
+      secondary: 'rgba(224, 224, 224, 0.75)',
+      disabled: 'rgba(224, 224, 224, 0.5)',
+      link: '#00FFFF',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#00FFFF',
+    },
+    secondary: {
+      main: '#0b2e36',
+      text: 'rgba(224, 224, 224, 0.75)',
+      border: 'rgba(0, 255, 255, 0.10)',
+    },
+    background: {
+      canvas: '#0A0F18',
+      primary: '#0F1B2A',
+      secondary: '#152234',
+      elevated: '#152234',
+    },
+    action: {
+      hover: 'rgba(0, 255, 255, 0.16)',
+      selected: 'rgba(0, 255, 255, 0.12)',
+      selectedBorder: '#00FFFF',
+      focus: 'rgba(0, 255, 255, 0.16)',
+      hoverOpacity: 0.08,
+      disabledText: 'rgba(224, 224, 224, 0.5)',
+      disabledBackground: 'rgba(0, 255, 255, 0.08)',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #00FFFF 0%, #29ABE2 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #00FFFF 0.01%, #29ABE2 99.99%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.05,
+    tonalOffset: 0.2,
+  },
+};
+
+export default tronTheme;
@@ -1,54 +0,0 @@
-{
-  "name": "Victorian",
-  "id": "victorian",
-  "colors": {
-    "mode": "dark",
-    "border": {
-      "weak": "#3A2C22",
-      "medium": "#3A2C22",
-      "strong": "#4B3D32"
-    },
-    "text": {
-      "primary": "#D9D0A2",
-      "secondary": "#C4B89B",
-      "disabled": "#A89F91",
-      "link": "#C28A4D",
-      "maxContrast": "#FFFFFF"
-    },
-    "primary": {
-      "main": "#C28A4D"
-    },
-    "secondary": {
-      "main": "#3A2C22",
-      "text": "#C4B89B",
-      "border": "#4B3D32"
-    },
-    "background": {
-      "canvas": "#1F1510",
-      "primary": "#2C1A13",
-      "secondary": "#402A21",
-      "elevated": "#402A21"
-    },
-    "action": {
-      "hover": "#3A2C22",
-      "selected": "#4B3D32",
-      "selectedBorder": "#C28A4D",
-      "focus": "#C28A4D",
-      "hoverOpacity": 0.1,
-      "disabledText": "#A89F91",
-      "disabledBackground": "#402A21",
-      "disabledOpacity": 0.38
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #D9D0a1 0%, #C28A4D 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #D9D0a1 0.01%, #C28A4D 99.99%)"
-    },
-    "contrastThreshold": 4,
-    "hoverFactor": 0.07,
-    "tonalOffset": 0.15
-  },
-  "typography": {
-    "fontFamily": "\"Georgia\", \"Times New Roman\", serif",
-    "fontFamilyMonospace": "'Courier New', monospace"
-  }
-}
@@ -0,0 +1,57 @@
+import { NewThemeOptions } from '../createTheme';
+
+const victorianTheme: NewThemeOptions = {
+  name: 'Victorian',
+  colors: {
+    mode: 'dark',
+    border: {
+      weak: '#3A2C22',
+      medium: '#3A2C22',
+      strong: '#4B3D32',
+    },
+    text: {
+      primary: '#D9D0A2',
+      secondary: '#C4B89B',
+      disabled: '#A89F91',
+      link: '#C28A4D',
+      maxContrast: '#FFFFFF',
+    },
+    primary: {
+      main: '#C28A4D',
+    },
+    secondary: {
+      main: '#3A2C22',
+      text: '#C4B89B',
+      border: '#4B3D32',
+    },
+    background: {
+      canvas: '#1F1510',
+      primary: '#2C1A13',
+      secondary: '#402A21',
+      elevated: '#402A21',
+    },
+    action: {
+      hover: '#3A2C22',
+      selected: '#4B3D32',
+      selectedBorder: '#C28A4D',
+      focus: '#C28A4D',
+      hoverOpacity: 0.1,
+      disabledText: '#A89F91',
+      disabledBackground: '#402A21',
+      disabledOpacity: 0.38,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #D9D0a1 0%, #C28A4D 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #D9D0a1 0.01%, #C28A4D 99.99%)',
+    },
+    contrastThreshold: 4,
+    hoverFactor: 0.07,
+    tonalOffset: 0.15,
+  },
+  typography: {
+    fontFamily: '"Georgia", "Times New Roman", serif',
+    fontFamilyMonospace: "'Courier New', monospace",
+  },
+};
+
+export default victorianTheme;
@@ -1,50 +0,0 @@
-{
-  "name": "Zen",
-  "id": "zen",
-  "colors": {
-    "mode": "light",
-    "text": {
-      "primary": "#333333",
-      "secondary": "#666666",
-      "disabled": "#B8B8B8",
-      "link": "#4F9F6E",
-      "maxContrast": "#000000"
-    },
-    "border": {
-      "weak": "#B1B7B3",
-      "medium": "#A2A8A2",
-      "strong": "#7C7F7A"
-    },
-    "primary": {
-      "main": "#6D8E6D"
-    },
-    "secondary": {
-      "main": "#E0E0E0",
-      "text": "#666666",
-      "border": "#A2A8A2"
-    },
-    "background": {
-      "canvas": "#F4F4F4",
-      "primary": "#E9E9E9",
-      "secondary": "#D8D8D8",
-      "elevated": "#E9E9E9"
-    },
-    "action": {
-      "hover": "#D1D1D1",
-      "selected": "#B8B8B8",
-      "selectedBorder": "#88B88B",
-      "hoverOpacity": 0.1,
-      "focus": "#D1D1D1",
-      "disabledBackground": "#E0E0E0",
-      "disabledText": "#B8B8B8",
-      "disabledOpacity": 0.5
-    },
-    "gradients": {
-      "brandHorizontal": "linear-gradient(270deg, #88B88B 0%, #6D8E6D 100%)",
-      "brandVertical": "linear-gradient(0.01deg, #88B88B 0.01%, #6D8E6D 99.99%)"
-    },
-    "contrastThreshold": 3,
-    "hoverFactor": 0.03,
-    "tonalOffset": 0.2
-  }
-}
@@ -0,0 +1,53 @@
+import { NewThemeOptions } from '../createTheme';
+
+const zenTheme: NewThemeOptions = {
+  name: 'Zen',
+  colors: {
+    mode: 'light',
+    text: {
+      primary: '#333333',
+      secondary: '#666666',
+      disabled: '#B8B8B8',
+      link: '#4F9F6E',
+      maxContrast: '#000000',
+    },
+    border: {
+      weak: '#B1B7B3',
+      medium: '#A2A8A2',
+      strong: '#7C7F7A',
+    },
+    primary: {
+      main: '#6D8E6D',
+    },
+    secondary: {
+      main: '#E0E0E0',
+      text: '#666666',
+      border: '#A2A8A2',
+    },
+    background: {
+      canvas: '#F4F4F4',
+      primary: '#E9E9E9',
+      secondary: '#D8D8D8',
+      elevated: '#E9E9E9',
+    },
+    action: {
+      hover: '#D1D1D1',
+      selected: '#B8B8B8',
+      selectedBorder: '#88B88B',
+      hoverOpacity: 0.1,
+      focus: '#D1D1D1',
+      disabledBackground: '#E0E0E0',
+      disabledText: '#B8B8B8',
+      disabledOpacity: 0.5,
+    },
+    gradients: {
+      brandHorizontal: 'linear-gradient(270deg, #88B88B 0%, #6D8E6D 100%)',
+      brandVertical: 'linear-gradient(0.01deg, #88B88B 0.01%, #6D8E6D 99.99%)',
+    },
+    contrastThreshold: 3,
+    hoverFactor: 0.03,
+    tonalOffset: 0.2,
+  },
+};
+
+export default zenTheme;
@@ -1,5 +1,3 @@
-import { z } from 'zod';
-
 import { GrafanaTheme } from '../types/theme';

 import { ThemeBreakpoints } from './breakpoints';
@@ -37,36 +35,27 @@ export interface GrafanaTheme2 {
  flags: {};
 }

-export const ThemeRichColorInputSchema = z.object({
-  /** color intent (primary, secondary, info, error, etc) */
-  name: z.string().optional(),
-  /** Main color */
-  main: z.string().optional(),
-  /** Used for hover */
-  shade: z.string().optional(),
-  /** Used for text */
-  text: z.string().optional(),
-  /** Used for borders */
-  border: z.string().optional(),
-  /** Used subtly colored backgrounds */
-  transparent: z.string().optional(),
-  /** Used for weak colored borders like larger alert/banner boxes and smaller badges and tags */
-  borderTransparent: z.string().optional(),
-  /** Text color for text ontop of main */
-  contrastText: z.string().optional(),
-});
-
-export const ThemeRichColorSchema = ThemeRichColorInputSchema.required();
-
 /** @alpha */
-export type ThemeRichColor = z.infer<typeof ThemeRichColorSchema>;
+export interface ThemeRichColor {
+  /** color intent (primary, secondary, info, error, etc) */
+  name: string;
+  /** Main color */
+  main: string;
+  /** Used for hover */
+  shade: string;
+  /** Used for text */
+  text: string;
+  /** Used for borders */
+  border: string;
+  /** Used subtly colored backgrounds */
+  transparent: string;
+  /** Used for weak colored borders like larger alert/banner boxes and smaller badges and tags */
+  borderTransparent: string;
+  /** Text color for text ontop of main */
+  contrastText: string;
+}

 /** @internal */
 export type DeepPartial<T> = {
  [P in keyof T]?: DeepPartial<T[P]>;
 };
-
-/** @internal */
-export type DeepRequired<T> = Required<{
-  [P in keyof T]: T[P] extends Required<T[P]> ? T[P] : DeepRequired<T[P]>;
-}>;
@@ -649,6 +649,10 @@ export interface FeatureToggles {
  */
  rolePickerDrawer?: boolean;
  /**
+  * Enable sprinkles on unified storage search
+  */
+  unifiedStorageSearchSprinkles?: boolean;
+  /**
  * Pick the dual write mode from database configs
  */
  managedDualWriter?: boolean;
@@ -9,4 +9,5 @@
 * and be subject to the standard policies
 */

-export { default as themeJsonSchema } from './themes/schema.generated.json';
+// This is a dummy export so typescript doesn't error importing an "empty module"
+export const unstable = {};
@@ -16,4 +16,16 @@ describe('Pagination component', () => {
    expect(screen.getAllByRole('button')).toHaveLength(9);
    expect(screen.getAllByTestId('pagination-ellipsis-icon')).toHaveLength(2);
  });
+  it('should only render the page number if number of pages is 0', () => {
+    render(<Pagination currentPage={8} numberOfPages={0} onNavigate={() => {}} />);
+    expect(screen.getAllByRole('button')).toHaveLength(2);
+    expect(screen.getAllByRole('button')[1]).toBeEnabled();
+    expect(screen.getByText('8')).toBeVisible();
+  });
+  it('should disable the next page button if hasNextPage is false', () => {
+    render(<Pagination currentPage={8} numberOfPages={0} onNavigate={() => {}} hasNextPage={false} />);
+    expect(screen.getAllByRole('button')).toHaveLength(2);
+    expect(screen.getAllByRole('button')[0]).toBeEnabled();
+    expect(screen.getAllByRole('button')[1]).toBeDisabled();
+  });
 });
@@ -19,6 +19,8 @@ export interface Props {
  /** Small version only shows the current page and the navigation buttons. */
  showSmallVersion?: boolean;
  className?: string;
+  /** If we are using cursor based pagination, disable next page button when we have no cursor */
+  hasNextPage?: boolean;
 }

 /**
@@ -33,6 +35,7 @@ export const Pagination = ({
  hideWhenSinglePage,
  showSmallVersion,
  className,
+  hasNextPage,
 }: Props) => {
  const styles = useStyles2(getStyles);
  const pageLengthToCondense = showSmallVersion ? 1 : 8;
@@ -122,13 +125,14 @@ export const Pagination = ({
          </Button>
        </li>
        {pageButtons}
+        {pageButtons.length === 0 && <li className={styles.item}>{currentPage}</li>}
        <li className={styles.item}>
          <Button
            aria-label={nextPageLabel}
            size="sm"
            variant="secondary"
            onClick={() => onNavigate(currentPage + 1)}
-            disabled={currentPage === numberOfPages}
+            disabled={hasNextPage === false || currentPage === numberOfPages}
          >
            <Icon name="angle-right" />
          </Button>
@@ -14,8 +14,6 @@ export type Props = React.ComponentProps<typeof TextArea> & {
  isConfigured: boolean;
  /** Called when the user clicks on the "Reset" button in order to clear the secret */
  onReset: () => void;
-  /** If true, the text area will grow to fill available width. */
-  grow?: boolean;
 };

 export const CONFIGURED_TEXT = 'configured';
@@ -37,11 +35,11 @@ const getStyles = (theme: GrafanaTheme2) => {
 *
 * https://developers.grafana.com/ui/latest/index.html?path=/docs/inputs-secrettextarea--docs
 */
-export const SecretTextArea = ({ isConfigured, onReset, grow, ...props }: Props) => {
+export const SecretTextArea = ({ isConfigured, onReset, ...props }: Props) => {
  const styles = useStyles2(getStyles);
  return (
    <Stack>
-      <Box grow={grow ? 1 : undefined}>
+      <Box>
        {!isConfigured && <TextArea {...props} />}
        {isConfigured && (
          <TextArea
@@ -11,7 +11,6 @@ import (
 	_ "github.com/Azure/azure-sdk-for-go/services/keyvault/v7.1/keyvault"
 	_ "github.com/Azure/go-autorest/autorest"
 	_ "github.com/Azure/go-autorest/autorest/adal"
-	_ "github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	_ "github.com/beevik/etree"
 	_ "github.com/blugelabs/bluge"
 	_ "github.com/blugelabs/bluge_segment_api"
@@ -2,7 +2,9 @@ package correlations

 import (
 	"context"
+	b64 "encoding/base64"
 	"fmt"
+	"strconv"
 	"strings"

 	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
@@ -78,27 +80,53 @@ func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListO
 		}
 	}

-	if options.Continue != "" {
-		return nil, fmt.Errorf("paging not yet supported")
+	page := int64(0)
+	limit := int64(100000)
+	if options != nil {
+		if options.Limit > 0 {
+			limit = options.Limit
+		}
+		if options.Continue != "" {
+			token, err := decodeContinueToken(options.Continue)
+			if err != nil {
+				return nil, err
+			}
+			if token.Limit != limit {
+				return nil, fmt.Errorf("continue token limit does not match the previous request")
+			}
+			page = token.Page
+		}
 	}

 	rsp, err := s.service.GetCorrelations(ctx, correlations.GetCorrelationsQuery{
 		OrgId:      orgID,
-		Limit:      1000,
+		Limit:      limit + 1, // the plus one indicates we have reached the limit
+		Page:       page,
 		SourceUIDs: uids,
 	})
 	if err != nil {
 		return nil, err
 	}
 	list := &correlationsV0.CorrelationList{
-		Items: make([]correlationsV0.Correlation, len(rsp.Correlations)),
+		Items: make([]correlationsV0.Correlation, 0, len(rsp.Correlations)),
 	}
+
 	for i, orig := range rsp.Correlations {
+		if i >= int(limit) {
+			remaining := rsp.TotalCount - (page * limit) - int64(len(list.Items))
+			if remaining > 0 {
+				list.RemainingItemCount = &remaining
+			}
+
+			list.Continue = encodeContinueToken(page+1, limit)
+			break
+		}
+
 		c, err := correlations.ToResource(orig, s.namespacer)
 		if err != nil {
 			return nil, err
 		}
-		list.Items[i] = *c
+		list.Items = append(list.Items, *c)
 	}
 	return list, nil
 }
@@ -193,3 +221,33 @@ func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidatio
 func (s *legacyStorage) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) {
 	return nil, fmt.Errorf("DeleteCollection for shorturl not implemented")
 }
+
+type continueToken struct {
+	Page  int64
+	Limit int64
+}
+
+func encodeContinueToken(page, limit int64) string {
+	data := fmt.Sprintf("%d/%d", page, limit)
+	return b64.StdEncoding.EncodeToString([]byte(data)) // use base64 so it is not treated like query params
+}
+
+func decodeContinueToken(s string) (token continueToken, err error) {
+	decoded, err := b64.StdEncoding.DecodeString(s)
+	if err != nil {
+		return token, fmt.Errorf("invalid continue token")
+	}
+	parts := strings.Split(string(decoded), "/")
+	if len(parts) != 2 {
+		return token, fmt.Errorf("invalid continue token")
+	}
+	token.Page, err = strconv.ParseInt(parts[0], 10, 64)
+	if err != nil {
+		return token, fmt.Errorf("invalid continue token (page)")
+	}
+	token.Limit, err = strconv.ParseInt(parts[1], 10, 64)
+	if err != nil {
+		return token, fmt.Errorf("invalid continue token")
+	}
+	return token, nil
+}
@@ -3,7 +3,6 @@ package server
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"time"

 	"github.com/grafana/dskit/flagext"
@@ -16,15 +15,11 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
-	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
-	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/backoff"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/health/grpc_health_v1"
 )

@@ -116,25 +111,14 @@ func newClientPool(clientCfg grpcclient.Config, log log.Logger, reg prometheus.R
 		Help:    "Time spent executing requests to resource server.",
 		Buckets: prometheus.ExponentialBuckets(0.008, 4, 7),
 	}, []string{"operation", "status_code"})
-	factoryRequestRetries := promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
-		Name: "resource_server_client_request_retries_total",
-		Help: "Total number of retries for requests to the resource server.",
-	}, []string{"operation"})

 	factory := ringclient.PoolInstFunc(func(inst ring.InstanceDesc) (ringclient.PoolClient, error) {
 		unaryInterceptors, streamInterceptors := grpcclient.Instrument(factoryRequestDuration)
-
-		// Add retry interceptors for transient connection issues
-		unaryInterceptors = append(unaryInterceptors, ringClientRetryInterceptor())
-		unaryInterceptors = append(unaryInterceptors, ringClientRetryInstrument(factoryRequestRetries))
-
 		opts, err := clientCfg.DialOption(unaryInterceptors, streamInterceptors, nil)
 		if err != nil {
 			return nil, err
 		}

-		opts = append(opts, connectionBackoffOptions())
-
 		conn, err := grpc.NewClient(inst.Addr, opts...)
 		if err != nil {
 			return nil, fmt.Errorf("failed to dial resource server %s %s: %s", inst.Id, inst.Addr, err)
@@ -151,40 +135,3 @@ func newClientPool(clientCfg grpcclient.Config, log log.Logger, reg prometheus.R

 	return ringclient.NewPool(resource.RingName, poolCfg, nil, factory, clientsCount, log)
 }
-
-// ringClientRetryInterceptor creates an interceptor to perform retries for unary methods.
-// It retries on ResourceExhausted and Unavailable codes, which are typical for
-// transient connection issues and rate limiting.
-func ringClientRetryInterceptor() grpc.UnaryClientInterceptor {
-	return grpc_retry.UnaryClientInterceptor(
-		grpc_retry.WithMax(3),
-		grpc_retry.WithBackoff(grpc_retry.BackoffExponentialWithJitter(time.Second, 0.1)),
-		grpc_retry.WithCodes(codes.ResourceExhausted, codes.Unavailable),
-	)
-}
-
-// ringClientRetryInstrument creates an interceptor to count retry attempts for metrics.
-func ringClientRetryInstrument(metric *prometheus.CounterVec) grpc.UnaryClientInterceptor {
-	return func(ctx context.Context, method string, req, resp interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
-		// We can tell if a call is a retry by checking the retry attempt metadata.
-		attempt, err := strconv.Atoi(metautils.ExtractOutgoing(ctx).Get(grpc_retry.AttemptMetadataKey))
-		if err == nil && attempt > 0 {
-			metric.WithLabelValues(method).Inc()
-		}
-		return invoker(ctx, method, req, resp, cc, opts...)
-	}
-}
-
-// connectionBackoffOptions configures connection backoff parameters for faster recovery from
-// transient connection failures (e.g., during pod restarts).
-func connectionBackoffOptions() grpc.DialOption {
-	return grpc.WithConnectParams(grpc.ConnectParams{
-		Backoff: backoff.Config{
-			BaseDelay:  100 * time.Millisecond,
-			Multiplier: 1.6,
-			Jitter:     0.2,
-			MaxDelay:   10 * time.Second,
-		},
-		MinConnectTimeout: 5 * time.Second,
-	})
-}
@@ -11,16 +11,11 @@ import (
 	"github.com/spf13/pflag"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/backoff"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/keepalive"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/options"
 	"k8s.io/client-go/rest"

-	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
-
 	apiserverrest "github.com/grafana/grafana/pkg/apiserver/rest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	secret "github.com/grafana/grafana/pkg/registry/apis/secret/contracts"
@@ -237,16 +232,19 @@ func (o *StorageOptions) ApplyTo(serverConfig *genericapiserver.RecommendedConfi
 	if o.StorageType != StorageTypeUnifiedGrpc {
 		return nil
 	}
-
-	grpcOpts := o.buildGrpcDialOptions()
-
-	conn, err := grpc.NewClient(o.Address, grpcOpts...)
+	conn, err := grpc.NewClient(o.Address,
+		grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
 	if err != nil {
 		return err
 	}
 	var indexConn *grpc.ClientConn
 	if o.SearchServerAddress != "" {
-		indexConn, err = grpc.NewClient(o.SearchServerAddress, grpcOpts...)
+		indexConn, err = grpc.NewClient(o.SearchServerAddress,
+			grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
+			grpc.WithTransportCredentials(insecure.NewCredentials()),
+		)
 		if err != nil {
 			return err
 		}
@@ -295,42 +293,3 @@ func (o *StorageOptions) ApplyTo(serverConfig *genericapiserver.RecommendedConfi
 	serverConfig.RESTOptionsGetter = getter
 	return nil
 }
-
-// buildGrpcDialOptions creates gRPC dial options with resilience mechanisms:
-// - Round-robin load balancing with client-side health checking
-// - Retry interceptor for transient connection issues
-// - Keepalive for long-lived connections
-func (o *StorageOptions) buildGrpcDialOptions() []grpc.DialOption {
-	// Retry interceptor for transient connection issues (codes.Unavailable includes connection refused)
-	retryInterceptor := grpc_retry.UnaryClientInterceptor(
-		grpc_retry.WithMax(3),
-		grpc_retry.WithBackoff(grpc_retry.BackoffExponentialWithJitter(time.Second, 0.5)),
-		grpc_retry.WithCodes(codes.ResourceExhausted, codes.Unavailable),
-	)
-
-	opts := []grpc.DialOption{
-		grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithChainUnaryInterceptor(retryInterceptor),
-		grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
-		grpc.WithConnectParams(grpc.ConnectParams{
-			Backoff: backoff.Config{
-				BaseDelay:  100 * time.Millisecond,
-				Multiplier: 1.6,
-				Jitter:     0.2,
-				MaxDelay:   10 * time.Second,
-			},
-			MinConnectTimeout: 5 * time.Second,
-		}),
-	}
-
-	if o.GrpcClientKeepaliveTime > 0 {
-		opts = append(opts, grpc.WithKeepaliveParams(keepalive.ClientParameters{
-			Time:                o.GrpcClientKeepaliveTime,
-			Timeout:             10 * time.Second,
-			PermitWithoutStream: true,
-		}))
-	}
-
-	return opts
-}
@@ -1073,6 +1073,13 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       identityAccessTeam,
 		},
+		{
+			Name:         "unifiedStorageSearchSprinkles",
+			Description:  "Enable sprinkles on unified storage search",
+			Stage:        FeatureStageExperimental,
+			Owner:        grafanaSearchAndStorageSquad,
+			HideFromDocs: true,
+		},
 		{
 			Name:         "managedDualWriter",
 			Description:  "Pick the dual write mode from database configs",
@@ -409,6 +409,7 @@ lokiLabelNamesQueryApi,2024-12-13T14:31:41Z,,5ac7443fcec0db412d3333044a82c2c26b5
 kubernetesCliDashboards,2024-12-13T22:55:43Z,2025-02-18T23:11:26Z,8f6e9f8ed0a5024a510cc337c9f1e6972bfb23d4,Stephanie Hingtgen
 useV2DashboardsAPI,2024-12-17T21:17:09Z,2025-03-12T17:43:32Z,070f0e4457c5967102ef157197073dc2662f6fb8,Dominik Prokop
 investigationsBackend,2024-12-18T08:31:03Z,,f46c07aba7b6faccd2ecafc83051d1410cacc867,Jackson Coelho
+unifiedStorageSearchSprinkles,2024-12-18T17:00:54Z,,4837585cab0fd84184a8c6f5d6891f442a2b95f1,owensmallwood
 prometheusSpecialCharsInLabelValues,2024-12-18T21:31:08Z,,721c50a304588ebd7cea76e301ec0f68a5a55d68,Nick Richmond
 unifiedStorageSearchUI,2024-12-19T18:21:48Z,,a8f347144ddc16f2033fdeb4f3474e49239ba7ab,Scott Lepper
 playlistsReconciler,2024-12-20T03:09:31Z,,24bf337c562dc9b9d8684cc9acb7ea171ea83414,Charandas
@@ -148,6 +148,7 @@ alertingQueryAndExpressionsStepMode,GA,@grafana/alerting-squad,false,false,true
 improvedExternalSessionHandling,GA,@grafana/identity-access-team,false,false,false
 useSessionStorageForRedirection,GA,@grafana/identity-access-team,false,false,false
 rolePickerDrawer,experimental,@grafana/identity-access-team,false,false,false
+unifiedStorageSearchSprinkles,experimental,@grafana/search-and-storage,false,false,false
 managedDualWriter,experimental,@grafana/search-and-storage,false,false,false
 pluginsSriChecks,GA,@grafana/plugins-platform-backend,false,false,false
 unifiedStorageBigObjectsSupport,experimental,@grafana/search-and-storage,false,false,false
@@ -455,6 +455,10 @@ const (
 	// Enables the new role picker drawer design
 	FlagRolePickerDrawer = "rolePickerDrawer"

+	// FlagUnifiedStorageSearchSprinkles
+	// Enable sprinkles on unified storage search
+	FlagUnifiedStorageSearchSprinkles = "unifiedStorageSearchSprinkles"
+
 	// FlagManagedDualWriter
 	// Pick the dual write mode from database configs
 	FlagManagedDualWriter = "managedDualWriter"
@@ -3723,6 +3723,19 @@
        "hideFromDocs": true
      }
    },
+    {
+      "metadata": {
+        "name": "unifiedStorageSearchSprinkles",
+        "resourceVersion": "1764664939750",
+        "creationTimestamp": "2024-12-18T17:00:54Z"
+      },
+      "spec": {
+        "description": "Enable sprinkles on unified storage search",
+        "stage": "experimental",
+        "codeowner": "@grafana/search-and-storage",
+        "hideFromDocs": true
+      }
+    },
    {
      "metadata": {
        "name": "unifiedStorageSearchUI",
@@ -1,90 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-type Colors struct {
-	Mode string `json:"mode"`
-}
-
-type ThemeDefinition struct {
-	Colors Colors `json:"colors"`
-	Id     string `json:"id"`
-}
-
-func main() {
-	themesPath := filepath.Join("..", "..", "..", "packages", "grafana-data", "src", "themes", "themeDefinitions")
-
-	// Check if the themes directory exists
-	if _, err := os.Stat(themesPath); os.IsNotExist(err) {
-		fmt.Fprintf(os.Stderr, "Themes directory not found: %s\n", themesPath)
-		os.Exit(1)
-	}
-
-	output := `// Code generated by go generate; DO NOT EDIT.
-
-package pref
-
-var themes = []ThemeDTO{
-	{ID: "light", Type: "light"},
-	{ID: "dark", Type: "dark"},
-	{ID: "system", Type: "dark"},
-`
-
-	err := filepath.WalkDir(themesPath, func(path string, d os.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Only process json files
-		if d.IsDir() || !strings.HasSuffix(d.Name(), ".json") {
-			return nil
-		}
-
-		fileBytes, readErr := os.ReadFile(path)
-		if readErr != nil {
-			fmt.Fprintf(os.Stderr, "Error reading file %s: %v\n", path, readErr)
-			return nil // Continue processing other files
-		}
-
-		var themeDef ThemeDefinition
-		jsonErr := json.Unmarshal(fileBytes, &themeDef)
-		if jsonErr != nil {
-			fmt.Fprintf(os.Stderr, "Error parsing JSON from %s: %v\n", path, jsonErr)
-			return nil // Continue processing other files
-		}
-
-		themeId := themeDef.Id
-		themeType := "dark" // default fallback
-		if themeDef.Colors.Mode != "" {
-			themeType = themeDef.Colors.Mode
-		}
-
-		output += fmt.Sprintf("\t{ID: %q, Type: %q, IsExtra: true},\n", themeId, themeType)
-
-		return nil
-	})
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error walking themes directory: %v\n", err)
-		os.Exit(1)
-	}
-
-	output += "}\n"
-
-	// Write the generated file
-	outputPath := filepath.Join("themes_generated.go")
-	if err := os.WriteFile(outputPath, []byte(output), 0644); err != nil {
-		fmt.Fprintf(os.Stderr, "Error writing output file: %v\n", err)
-		os.Exit(1)
-	}
-
-	fmt.Printf("Successfully generated themes_generated.go\n")
-}
@@ -1,5 +1,3 @@
-//go:generate go run generate_themes.go
-
 package pref

 type ThemeDTO struct {
@@ -8,6 +6,24 @@ type ThemeDTO struct {
 	IsExtra bool   `json:"isExtra"`
 }

+var themes = []ThemeDTO{
+	{ID: "light", Type: "light"},
+	{ID: "dark", Type: "dark"},
+	{ID: "system", Type: "dark"},
+	{ID: "debug", Type: "dark", IsExtra: true},
+	{ID: "aubergine", Type: "dark", IsExtra: true},
+	{ID: "desertbloom", Type: "light", IsExtra: true},
+	{ID: "gildedgrove", Type: "dark", IsExtra: true},
+	{ID: "mars", Type: "dark", IsExtra: true},
+	{ID: "matrix", Type: "dark", IsExtra: true},
+	{ID: "sapphiredusk", Type: "dark", IsExtra: true},
+	{ID: "synthwave", Type: "dark", IsExtra: true},
+	{ID: "tron", Type: "dark", IsExtra: true},
+	{ID: "victorian", Type: "dark", IsExtra: true},
+	{ID: "zen", Type: "light", IsExtra: true},
+	{ID: "gloom", Type: "dark", IsExtra: true},
+}
+
 func GetThemeByID(id string) *ThemeDTO {
 	for _, theme := range themes {
 		if theme.ID == id {
@@ -1,21 +0,0 @@
-// Code generated by go generate; DO NOT EDIT.
-
-package pref
-
-var themes = []ThemeDTO{
-	{ID: "light", Type: "light"},
-	{ID: "dark", Type: "dark"},
-	{ID: "system", Type: "dark"},
-	{ID: "aubergine", Type: "dark", IsExtra: true},
-	{ID: "debug", Type: "dark", IsExtra: true},
-	{ID: "desertbloom", Type: "light", IsExtra: true},
-	{ID: "gildedgrove", Type: "dark", IsExtra: true},
-	{ID: "gloom", Type: "dark", IsExtra: true},
-	{ID: "mars", Type: "dark", IsExtra: true},
-	{ID: "matrix", Type: "dark", IsExtra: true},
-	{ID: "sapphiredusk", Type: "dark", IsExtra: true},
-	{ID: "synthwave", Type: "dark", IsExtra: true},
-	{ID: "tron", Type: "dark", IsExtra: true},
-	{ID: "victorian", Type: "dark", IsExtra: true},
-	{ID: "zen", Type: "light", IsExtra: true},
-}
@@ -237,6 +237,7 @@ kubernetesFolders = true
 unifiedStorage = true
 unifiedStorageHistoryPruner = true
 unifiedStorageSearchPermissionFiltering = false
+unifiedStorageSearchSprinkles = false

 [unified_storage]
 enable_search = true
@@ -314,6 +315,9 @@ To enable it, add the following to your `custom.ini` under the `[feature_toggles
 ; Used by the Grafana instance
 unifiedStorageSearchUI = true

+; (optional) Allows you to sort dashboards by usage insights fields when using enterprise
+; unifiedStorageSearchSprinkles = true
+
 [unified_storage]
 ; Used by unified storage server
 enable_search = true
@@ -930,6 +934,7 @@ Unified Search requires several feature flags to be enabled depending on the des
 | Feature Flag | Purpose | Stage | Required For |
 |--------------|---------|-------|--------------|
 | `unifiedStorageSearchUI` | Frontend search interface | Experimental | Grafana UI search |
+| `unifiedStorageSearchSprinkles` | Usage insights integration | Experimental | Dashboard usage sorting (Enterprise) |
 | `unifiedStorageSearchDualReaderEnabled` | Shadow traffic to unified search | Experimental | Shadow traffic during migration |

 #### Unified Search Specific Configuration
@@ -950,6 +955,9 @@ unifiedStorageSearchUI = true
 ; Enable shadow traffic during migration (optional)
 unifiedStorageSearchDualReaderEnabled = true

+; Enable usage insights sorting (Enterprise only)
+unifiedStorageSearchSprinkles = true
+
 [unified_storage]
 ; Enable core search functionality (required)
 enable_search = true
@@ -271,7 +271,7 @@ func grpcConn(address string, metrics *clientMetrics, clientKeepaliveTime time.D
 	retryCfg := retryConfig{
 		Max:           3,
 		Backoff:       time.Second,
-		BackoffJitter: 0.1,
+		BackoffJitter: 0.5,
 	}
 	unary = append(unary, unaryRetryInterceptor(retryCfg))
 	unary = append(unary, unaryRetryInstrument(metrics.requestRetries))
@@ -288,15 +288,13 @@ func grpcConn(address string, metrics *clientMetrics, clientKeepaliveTime time.D
 	opts = append(opts, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
 	opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))

-	// Use round_robin to balance requests more evenly over the available Storage server.
+	// Use round_robin to balances requests more evenly over the available Storage server.
 	opts = append(opts, grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`))

 	// Disable looking up service config from TXT DNS records.
 	// This reduces the number of requests made to the DNS servers.
 	opts = append(opts, grpc.WithDisableServiceConfig())

-	opts = append(opts, connectionBackoffOptions())
-
 	if clientKeepaliveTime > 0 {
 		opts = append(opts, grpc.WithKeepaliveParams(keepalive.ClientParameters{
 			Time:                clientKeepaliveTime,
@@ -9,7 +9,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/codes"
 )

@@ -45,17 +44,3 @@ func unaryRetryInstrument(metric *prometheus.CounterVec) grpc.UnaryClientInterce
 		return invoker(ctx, method, req, resp, cc, opts...)
 	}
 }
-
-// connectionBackoffOptions configures connection backoff parameters for faster recovery from
-// transient connection failures (e.g., during pod restarts).
-func connectionBackoffOptions() grpc.DialOption {
-	return grpc.WithConnectParams(grpc.ConnectParams{
-		Backoff: backoff.Config{
-			BaseDelay:  100 * time.Millisecond,
-			Multiplier: 1.6,
-			Jitter:     0.2,
-			MaxDelay:   10 * time.Second,
-		},
-		MinConnectTimeout: 5 * time.Second,
-	})
-}
@@ -1028,10 +1028,7 @@
      },
      "com.github.grafana.grafana.apps.correlations.pkg.apis.correlation.v0alpha1.CorrelationTargetSpec": {
        "type": "object",
-        "additionalProperties": {
-          "type": "object",
-          "additionalProperties": {}
-        }
+        "additionalProperties": {}
      },
      "com.github.grafana.grafana.apps.correlations.pkg.apis.correlation.v0alpha1.CorrelationTransformationSpec": {
        "type": "object",
@@ -166,24 +166,8 @@ func TestIntegrationProvisioning_ConnectionCRUDL(t *testing.T) {
 		githubInfo = spec["github"].(map[string]any)
 		assert.Equal(t, "454546", githubInfo["installationID"], "installationID should be updated")

-		// DELETE - Retry delete to handle resource version conflicts
-		// The controller may have updated the resource after our update, changing the resource version
-		require.Eventually(t, func() bool {
-			err := helper.Connections.Resource.Delete(ctx, "connection", metav1.DeleteOptions{})
-			if err != nil {
-				if k8serrors.IsConflict(err) {
-					// Resource version conflict - retry
-					return false
-				}
-				if k8serrors.IsNotFound(err) {
-					// Already deleted - success
-					return true
-				}
-				// Other error - fail the test
-				require.NoError(t, err, "failed to delete resource")
-			}
-			return true
-		}, 5*time.Second, 100*time.Millisecond, "should successfully delete resource")
+		// DELETE
+		require.NoError(t, helper.Connections.Resource.Delete(ctx, "connection", metav1.DeleteOptions{}), "failed to delete resource")
 		list, err = helper.Connections.Resource.List(ctx, metav1.ListOptions{})
 		require.NoError(t, err, "failed to list resources")
 		assert.Equal(t, 0, len(list.Items), "should have no connections")
@@ -11,7 +11,6 @@ import { t } from '@grafana/i18n';
 import { isFetchError } from '@grafana/runtime';
 import { clearFolders } from 'app/features/browse-dashboards/state/slice';
 import { getState } from 'app/store/store';
-import { ThunkDispatch } from 'app/types/store';

 import { createSuccessNotification, createErrorNotification } from '../../../../core/copy/appNotification';
 import { notifyApp } from '../../../../core/reducers/appNotification';
@@ -20,26 +19,6 @@ import { refetchChildren } from '../../../../features/browse-dashboards/state/ac
 import { handleError } from '../../../utils';
 import { createOnCacheEntryAdded } from '../utils/createOnCacheEntryAdded';

-const handleProvisioningFormError = (e: unknown, dispatch: ThunkDispatch, title: string) => {
-  if (typeof e === 'object' && e && 'error' in e && isFetchError(e.error)) {
-    if (e.error.data.kind === 'Status' && e.error.data.status === 'Failure') {
-      const statusError: Status = e.error.data;
-      dispatch(notifyApp(createErrorNotification(title, new Error(statusError.message || 'Unknown error'))));
-      return;
-    }
-
-    if (Array.isArray(e.error.data.errors) && e.error.data.errors.length) {
-      const nonFieldErrors = e.error.data.errors.filter((err: ErrorDetails) => !err.field);
-      if (nonFieldErrors.length > 0) {
-        dispatch(notifyApp(createErrorNotification(title)));
-      }
-      return;
-    }
-  }
-
-  handleError(e, dispatch, title);
-};
-
 export const provisioningAPIv0alpha1 = generatedAPI.enhanceEndpoints({
  endpoints: {
    listJob: {
@@ -58,17 +37,6 @@ export const provisioningAPIv0alpha1 = generatedAPI.enhanceEndpoints({
      }),
      onCacheEntryAdded: createOnCacheEntryAdded<RepositorySpec, RepositoryStatus>('repositories'),
    },
-    listConnection: {
-      providesTags: (result) =>
-        result
-          ? [
-              { type: 'Connection', id: 'LIST' },
-              ...result.items
-                .map((connection) => ({ type: 'Connection' as const, id: connection.metadata?.name }))
-                .filter(Boolean),
-            ]
-          : [{ type: 'Connection', id: 'LIST' }],
-    },
    deleteRepository: {
      onQueryStarted: async (_, { queryFulfilled, dispatch }) => {
        try {
@@ -136,7 +104,34 @@ export const provisioningAPIv0alpha1 = generatedAPI.enhanceEndpoints({
        try {
          await queryFulfilled;
        } catch (e) {
-          handleProvisioningFormError(e, dispatch, 'Error validating repository');
+          // Handle special cases first
+          if (typeof e === 'object' && e && 'error' in e && isFetchError(e.error)) {
+            // Handle Status error responses (Kubernetes style)
+            if (e.error.data.kind === 'Status' && e.error.data.status === 'Failure') {
+              const statusError: Status = e.error.data;
+              dispatch(
+                notifyApp(
+                  createErrorNotification(
+                    'Error validating repository',
+                    new Error(statusError.message || 'Unknown error')
+                  )
+                )
+              );
+              return;
+            }
+            // Handle TestResults error responses with field errors
+            if (Array.isArray(e.error.data.errors) && e.error.data.errors.length) {
+              const nonFieldErrors = e.error.data.errors.filter((err: ErrorDetails) => !err.field);
+              // Only show notification if there are errors that don't have a field, field errors are handled by the form
+              if (nonFieldErrors.length > 0) {
+                dispatch(notifyApp(createErrorNotification('Error validating repository')));
+              }
+              return;
+            }
+          }
+
+          // For all other cases, use handleError
+          handleError(e, dispatch, 'Error validating repository');
        }
      },
    },
@@ -245,70 +240,6 @@ export const provisioningAPIv0alpha1 = generatedAPI.enhanceEndpoints({
        }
      },
    },
-    createConnection: {
-      onQueryStarted: async (_, { queryFulfilled, dispatch }) => {
-        try {
-          await queryFulfilled;
-          dispatch(
-            notifyApp(
-              createSuccessNotification(t('provisioning.connection-form.alert-connection-saved', 'Connection saved'))
-            )
-          );
-        } catch (e) {
-          handleProvisioningFormError(
-            e,
-            dispatch,
-            t('provisioning.connection-form.error-save-connection', 'Failed to save connection')
-          );
-        }
-      },
-    },
-    replaceConnection: {
-      onQueryStarted: async (_, { queryFulfilled, dispatch }) => {
-        try {
-          await queryFulfilled;
-          dispatch(
-            notifyApp(
-              createSuccessNotification(
-                t('provisioning.connection-form.alert-connection-updated', 'Connection updated')
-              )
-            )
-          );
-        } catch (e) {
-          handleProvisioningFormError(
-            e,
-            dispatch,
-            t('provisioning.connection-form.error-save-connection', 'Failed to save connection')
-          );
-        }
-      },
-    },
-    deleteConnection: {
-      invalidatesTags: (result, error) => (error ? [] : [{ type: 'Connection', id: 'LIST' }]),
-      onQueryStarted: async (_, { queryFulfilled, dispatch }) => {
-        try {
-          await queryFulfilled;
-          dispatch(
-            notifyApp(
-              createSuccessNotification(
-                t('provisioning.connection-form.alert-connection-deleted', 'Connection deleted')
-              )
-            )
-          );
-        } catch (e) {
-          if (e instanceof Error) {
-            dispatch(
-              notifyApp(
-                createErrorNotification(
-                  t('provisioning.connection-form.error-delete-connection', 'Failed to delete connection'),
-                  e
-                )
-              )
-            );
-          }
-        }
-      },
-    },
  },
 });

@@ -4,8 +4,8 @@ import * as React from 'react';
 import SplitPane, { Split } from 'react-split-pane';

 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { getDragStyles } from '@grafana/ui';
+import { config } from 'app/core/config';

 interface Props {
  splitOrientation?: Split;
@@ -1,5 +1,6 @@
 import { PluginState } from '@grafana/data';
 import { config, GrafanaBootConfig } from '@grafana/runtime';
+export { config, type GrafanaBootConfig as Settings };

 let grafanaConfig: GrafanaBootConfig = config;

@@ -2,7 +2,7 @@ import deepEqual from 'fast-deep-equal';
 import memoize from 'micro-memoize';

 import { getLanguage } from '@grafana/i18n/internal';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';

 const deepMemoize: typeof memoize = (fn) => memoize(fn, { isEqual: deepEqual });

@@ -1,7 +1,8 @@
 import { getThemeById } from '@grafana/data/internal';
-import { config, ThemeChangedEvent } from '@grafana/runtime';
+import { ThemeChangedEvent } from '@grafana/runtime';

 import { appEvents } from '../app_events';
+import { config } from '../config';
 import { contextSrv } from '../services/context_srv';

 import { PreferencesService } from './PreferencesService';
@@ -1,7 +1,7 @@
 import { Navigate } from 'react-router-dom-v5-compat';

-import { config } from '@grafana/runtime';
 import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
+import { config } from 'app/core/config';
 import { GrafanaRouteComponent, RouteDescriptor } from 'app/core/navigation/types';
 import { AccessControlAction } from 'app/types/accessControl';

@@ -1,4 +1,4 @@
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';

 export const hiddenReducerTypes = ['percent_diff', 'percent_diff_abs'];
@@ -162,7 +162,7 @@ export function useCombinedLabels(
  // This is called by Combobox when the dropdown menu opens
  const createAsyncValuesLoader = useCallback(
    (key: string): AsyncOptionsLoader => {
-      return async (valueQuery: string): Promise<Array<ComboboxOption<string>>> => {
+      return async (_inputValue: string): Promise<Array<ComboboxOption<string>>> => {
        if (!isKeyAllowed(key) || !key) {
          return [];
        }
@@ -188,10 +188,7 @@ export function useCombinedLabels(
        // Combine: existing values first, then unique ops values (Set preserves first occurrence)
        const combinedValues = [...new Set([...existingValues, ...opsValues])];

-        const valueQueryLowerCase = valueQuery.toLowerCase();
-        const filteredValues = combinedValues.filter((value) => value.toLowerCase().includes(valueQueryLowerCase));
-
-        return mapLabelsToOptions(filteredValues);
+        return mapLabelsToOptions(combinedValues);
      };
    },
    [labelsByKeyFromExisingAlerts, labelsPluginInstalled, opsLabelKeysSet, fetchLabelValues]
@@ -6,40 +6,24 @@ import { clearPluginSettingsCache } from 'app/features/plugins/pluginSettings';

 import { mockAlertRuleApi, setupMswServer } from '../../../mockApi';
 import { getGrafanaRule } from '../../../mocks';
-import { getMockOpsLabels } from '../../../mocks/server/handlers/plugins/grafana-labels-app';
+import {
+  defaultLabelValues,
+  getLabelValuesHandler,
+  getMockOpsLabels,
+} from '../../../mocks/server/handlers/plugins/grafana-labels-app';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../../utils/datasource';

 import { LabelsWithSuggestions } from './LabelsField';

-// Mock getBoundingClientRect for @tanstack/react-virtual to calculate visible items
-// The global ResizeObserver mock in jest-setup.ts handles subsequent measurements
-Element.prototype.getBoundingClientRect = jest.fn(() => ({
-  width: 200,
-  height: 400,
-  top: 0,
-  left: 0,
-  bottom: 400,
-  right: 200,
-  x: 0,
-  y: 0,
-  toJSON: () => ({}),
-}));
-
 // Existing labels in the form (simulating editing an existing alert rule with ops labels)
 const existingOpsLabels = getMockOpsLabels();

-// Wrapper that provides portal container for Combobox dropdowns
-const TestWrapper = ({
+const SubFormProviderWrapper = ({
  children,
  labels,
 }: React.PropsWithChildren<{ labels: Array<{ key: string; value: string }> }>) => {
  const methods = useForm({ defaultValues: { labelsInSubform: labels } });
-  return (
-    <>
-      <FormProvider {...methods}>{children}</FormProvider>
-      <div id="grafana-portal-container" />
-    </>
-  );
+  return <FormProvider {...methods}>{children}</FormProvider>;
 };

 const grafanaRule = getGrafanaRule(undefined, {
@@ -80,9 +64,9 @@ describe('LabelsField with ops labels', () => {

  async function renderLabelsWithOpsLabels(labels = existingOpsLabels) {
    const view = render(
-      <TestWrapper labels={labels}>
+      <SubFormProviderWrapper labels={labels}>
        <LabelsWithSuggestions dataSourceName="grafana" />
-      </TestWrapper>
+      </SubFormProviderWrapper>
    );

    // Wait for the dropdowns to be rendered
@@ -237,84 +221,41 @@ describe('LabelsField with ops labels', () => {
    expect(combobox).toHaveAttribute('aria-expanded', 'true');
  });

-  // Test that opening the value dropdown shows values for the CORRECT label key
-  // This verifies the async loader is called with the right key and renders the correct options
-  it('should show correct label values when opening value dropdown', async () => {
+  // Test that opening the value dropdown requests values for the CORRECT label key
+  // This verifies the async loader is called with the right key
+  it('should request correct label values when opening value dropdown', async () => {
+    const requestedKeys: string[] = [];
+
+    // Add a spy handler that tracks which keys are requested
+    server.use(getLabelValuesHandler(defaultLabelValues, (key) => requestedKeys.push(key)));
+
    const { user } = await renderLabelsWithOpsLabels();

    // Open the first label's value dropdown (sentMail)
-    // Expected values: "true", "false"
    const firstValueDropdown = within(screen.getByTestId('labelsInSubform-value-0'));
    await user.click(firstValueDropdown.getByRole('combobox'));

-    // Wait for sentMail values to appear
-    const trueOption = await screen.findByRole('option', { name: /true/i });
-    expect(trueOption).toBeInTheDocument();
+    // Wait for the API call to be made
+    await waitFor(() => {
+      expect(requestedKeys).toContain('sentMail');
+    });

-    // Verify we have exactly 2 options for sentMail (true, false)
-    const firstDropdownOptions = screen.getAllByRole('option');
-    expect(firstDropdownOptions).toHaveLength(2);
-    expect(firstDropdownOptions[0]).toHaveTextContent('true');
-    expect(firstDropdownOptions[1]).toHaveTextContent('false');
+    // Close dropdown
+    await user.keyboard('{Escape}');

-    // Close dropdown by clicking outside (simulate real user behavior)
-    await user.click(document.body);
+    // Clear the tracked keys
+    requestedKeys.length = 0;

    // Open the second label's value dropdown (stage)
-    // Expected values: "production", "staging", "development"
    const secondValueDropdown = within(screen.getByTestId('labelsInSubform-value-1'));
    await user.click(secondValueDropdown.getByRole('combobox'));

-    // Wait for stage values to appear
-    const productionOption = await screen.findByRole('option', { name: /production/i });
-    expect(productionOption).toBeInTheDocument();
+    // Wait for the API call - should request 'stage', NOT 'sentMail'
+    await waitFor(() => {
+      expect(requestedKeys).toContain('stage');
+    });

-    // Verify we have exactly 3 options for stage (production, staging, development)
-    // This ensures we're NOT showing sentMail values
-    const secondDropdownOptions = screen.getAllByRole('option');
-    expect(secondDropdownOptions).toHaveLength(3);
-    expect(secondDropdownOptions[0]).toHaveTextContent('production');
-    expect(secondDropdownOptions[1]).toHaveTextContent('staging');
-    expect(secondDropdownOptions[2]).toHaveTextContent('development');
-  });
-
-  // Test that typing in the value dropdown filters options (search functionality)
-  it('should filter value options when typing in the combobox', async () => {
-    const { user } = await renderLabelsWithOpsLabels();
-
-    // Add a new label with "stage" key which has multiple values: production, staging, development
-    const addMoreButton = await screen.findByText('Add more');
-    await user.click(addMoreButton);
-
-    // First, set the key to "stage"
-    const keyDropdown = within(screen.getByTestId('labelsInSubform-key-2'));
-    await user.type(keyDropdown.getByRole('combobox'), 'stage{enter}');
-
-    // Wait for the key to be set
-    const keyInput = screen.getByTestId('labelsInSubform-key-2').querySelector('input');
-    await waitFor(() => expect(keyInput).toHaveValue('stage'));
-
-    const valueDropdown = within(screen.getByTestId('labelsInSubform-value-2'));
-    const combobox = valueDropdown.getByRole('combobox');
-
-    // Type "stag" which should filter to only "staging" (not "production" or "development")
-    await user.type(combobox, 'stag');
-
-    // Wait for the staging option to appear (allows for debounce + async load)
-    const stagingOption = await screen.findByRole('option', { name: /staging/i });
-    expect(stagingOption).toBeInTheDocument();
-
-    // Verify we have exactly 2 options:
-    // 1. "stag" - Use custom value (created because user typed custom text)
-    // 2. "staging" - The filtered match from available values
-    const allOptions = screen.getAllByRole('option');
-    expect(allOptions).toHaveLength(2);
-    expect(allOptions[0]).toHaveTextContent('stag');
-    expect(allOptions[0]).toHaveTextContent('Use custom value');
-    expect(allOptions[1]).toHaveTextContent('staging');
-
-    // Verify that "production" and "development" are NOT shown (they don't match "stag")
-    expect(screen.queryByRole('option', { name: /^production$/i })).not.toBeInTheDocument();
-    expect(screen.queryByRole('option', { name: /^development$/i })).not.toBeInTheDocument();
+    // Verify we didn't request the wrong key (the bug from escalation #19378)
+    expect(requestedKeys).not.toContain('sentMail');
  });
 });
@@ -8,8 +8,8 @@ import {
  ThresholdsMode,
  isTimeSeriesFrames,
 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { GraphThresholdsStyleMode } from '@grafana/schema';
+import { config } from 'app/core/config';
 import { EvalFunction } from 'app/features/alerting/state/alertDef';
 import { isExpressionQuery } from 'app/features/expressions/guards';
 import { ClassicCondition, ExpressionQueryType } from 'app/features/expressions/types';
@@ -18,7 +18,7 @@ import {
  standardTransformers,
 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';

 export const standardAnnotationSupport: AnnotationSupport = {
  /**
@@ -3,9 +3,10 @@ import { connect, ConnectedProps } from 'react-redux';

 import { GrafanaEdition } from '@grafana/data/internal';
 import { Trans } from '@grafana/i18n';
-import { config, reportInteraction } from '@grafana/runtime';
+import { reportInteraction } from '@grafana/runtime';
 import { Grid, TextLink, ToolbarButton } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
+import { config } from 'app/core/config';
 import { StoreState } from 'app/types/store';

 import { isOpenSourceBuildOrUnlicenced } from '../admin/EnterpriseAuthFeaturesCard';
@@ -2,8 +2,8 @@ import { ComponentType } from 'react';

 import { DataLink, RegistryItem, Action } from '@grafana/data';
 import { PanelOptionsSupplier } from '@grafana/data/internal';
-import { config } from '@grafana/runtime';
 import { ColorDimensionConfig, ScaleDimensionConfig, DirectionDimensionConfig } from '@grafana/schema';
+import { config } from 'app/core/config';
 import { BackgroundConfig, Constraint, LineConfig, Placement } from 'app/plugins/panel/canvas/panelcfg.gen';

 import { LineStyleConfig } from '../../plugins/panel/canvas/editor/LineStyleEditor';
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';

 import { GrafanaTheme2 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';

 import { GrafanaTheme2 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';

 import { GrafanaTheme2 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';

 import { GrafanaTheme2 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
@@ -14,10 +14,10 @@ import {
  ActionType,
 } from '@grafana/data';
 import { t } from '@grafana/i18n';
-import { config } from '@grafana/runtime';
 import { TooltipDisplayMode } from '@grafana/schema';
 import { ConfirmModal, VariablesInputModal } from '@grafana/ui';
 import { LayerElement } from 'app/core/components/Layers/types';
+import { config } from 'app/core/config';
 import { notFoundItem } from 'app/features/canvas/elements/notFound';
 import { DimensionContext } from 'app/features/dimensions/context';
 import {
@@ -6,7 +6,7 @@ import { BehaviorSubject, ReplaySubject, Subject, Subscription } from 'rxjs';
 import Selecto from 'selecto';

 import { AppEvents, PanelData, OneClickMode, ActionType } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import {
  ColorDimensionConfig,
  ResourceDimensionConfig,
@@ -17,6 +17,7 @@ import {
  DirectionDimensionConfig,
 } from '@grafana/schema';
 import { Portal } from '@grafana/ui';
+import { config } from 'app/core/config';
 import { DimensionContext } from 'app/features/dimensions/context';
 import {
  getColorDimensionFromData,
@@ -2,7 +2,7 @@ import InfiniteViewer from 'infinite-viewer';
 import Moveable from 'moveable';
 import Selecto from 'selecto';

-import { config } from '@grafana/runtime';
+import { config } from 'app/core/config';
 import { CONNECTION_ANCHOR_DIV_ID } from 'app/plugins/panel/canvas/components/connections/ConnectionAnchors';
 import {
  CONNECTION_VERTEX_ID,
@@ -23,7 +23,7 @@ import { configureStore } from 'app/store/configureStore';

 import { mockDataSource } from '../alerting/unified/mocks';

-import CorrelationsPage from './CorrelationsPage';
+import { CorrelationsPageLegacy } from './CorrelationsPageWrapper';
 import {
  createCreateCorrelationResponse,
  createFetchCorrelationsError,
@@ -112,7 +112,7 @@ const renderWithContext = async (

  const renderResult = render(
    <TestProvider store={configureStore({})} grafanaContext={grafanaContext}>
-      <CorrelationsPage />
+      <CorrelationsPageLegacy />
    </TestProvider>,
    {
      queries: {
@@ -2,9 +2,10 @@ import { css } from '@emotion/css';
 import { negate } from 'lodash';
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';

+import { Status } from '@grafana/api-clients/rtkq/correlations/v0alpha1';
 import { DataSourceInstanceSettings, GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { CorrelationData, isFetchError, reportInteraction } from '@grafana/runtime';
+import { CorrelationData, CorrelationsData, FetchError, isFetchError, reportInteraction } from '@grafana/runtime';
 import {
  Badge,
  Button,
@@ -27,11 +28,27 @@ import { AccessControlAction } from 'app/types/accessControl';
 import { AddCorrelationForm } from './Forms/AddCorrelationForm';
 import { EditCorrelationForm } from './Forms/EditCorrelationForm';
 import { EmptyCorrelationsCTA } from './components/EmptyCorrelationsCTA';
-import type { Correlation, RemoveCorrelationParams } from './types';
-import { useCorrelations } from './useCorrelations';
+import type { Correlation, GetCorrelationsParams, RemoveCorrelationParams } from './types';
+
+type CorrelationsPageProps = {
+  fetchCorrelations: (params: GetCorrelationsParams) => Promise<CorrelationsData> | CorrelationsData;
+  correlations?: CorrelationsData;
+  isLoading: boolean;
+  changePageFn?: (page: number) => void;
+  removeFn?: (params: RemoveCorrelationParams) => Promise<
+    | {
+        message: string;
+      }
+    | Status
+  >;
+  error?: Error | FetchError;
+  hasNextPage?: boolean;
+};
+
+const collator = new Intl.Collator();

 const sortDatasource: SortByFn<CorrelationData> = (a, b, column) =>
-  a.values[column].name.localeCompare(b.values[column].name);
+  collator.compare(a.values[column].name, b.values[column].name);

 const isCorrelationsReadOnly = (correlation: CorrelationData) => correlation.provisioned;

@@ -40,7 +57,8 @@ const loaderWrapper = css({
  justifyContent: 'center',
 });

-export default function CorrelationsPage() {
+export default function CorrelationsPage(props: CorrelationsPageProps) {
+  const { fetchCorrelations, correlations, isLoading, error, removeFn, changePageFn, hasNextPage } = props;
  const navModel = useNavModel('correlations');
  const [isAdding, setIsAddingValue] = useState(false);
  const page = useRef(1);
@@ -52,11 +70,6 @@ export default function CorrelationsPage() {
    }
  };

-  const {
-    remove,
-    get: { execute: fetchCorrelations, ...get },
-  } = useCorrelations();
-
  const canWriteCorrelations = contextSrv.hasPermission(AccessControlAction.DataSourcesWrite);

  const handleAdded = useCallback(() => {
@@ -72,15 +85,17 @@ export default function CorrelationsPage() {

  const handleDelete = useCallback(
    async (params: RemoveCorrelationParams, isLastRow: boolean) => {
-      await remove.execute(params);
-      reportInteraction('grafana_correlations_deleted');
+      if (removeFn) {
+        await removeFn(params);
+        reportInteraction('grafana_correlations_deleted');

-      if (isLastRow) {
-        page.current--;
+        if (isLastRow) {
+          page.current--;
+        }
+        fetchCorrelations({ page: page.current });
      }
-      fetchCorrelations({ page: page.current });
    },
-    [remove, fetchCorrelations]
+    [removeFn, fetchCorrelations]
  );

  useEffect(() => {
@@ -102,9 +117,7 @@ export default function CorrelationsPage() {
        !provisioned && (
          <DeleteButton
            aria-label={t('correlations.list.delete', 'delete correlation')}
-            onConfirm={() =>
-              handleDelete({ sourceUID, uid }, page.current > 1 && index === 0 && data?.correlations.length === 1)
-            }
+            onConfirm={() => handleDelete({ sourceUID, uid }, page.current > 1 && index === 0 && corrData.length === 1)}
            closeOnConfirm
          />
        )
@@ -145,9 +158,9 @@ export default function CorrelationsPage() {
    [RowActions, canWriteCorrelations]
  );

-  const data = useMemo(() => get.value, [get.value]);
-  const showEmptyListCTA = data?.correlations.length === 0 && !isAdding && !get.error;
-  const addButton = canWriteCorrelations && data?.correlations?.length !== 0 && data !== undefined && !isAdding && (
+  const corrData = correlations?.correlations ?? [];
+  const showEmptyListCTA = corrData.length === 0 && !isAdding && !error;
+  const addButton = canWriteCorrelations && corrData.length !== 0 && !isAdding && (
    <Button icon="plus" onClick={() => setIsAdding(true)}>
      <Trans i18nKey="correlations.add-new">Add new</Trans>
    </Button>
@@ -170,25 +183,23 @@ export default function CorrelationsPage() {
    >
      <Page.Contents>
        <div>
-          {!data && get.loading && (
+          {isLoading && (
            <div className={loaderWrapper}>
              <LoadingPlaceholder text={t('correlations.list.loading', 'loading...')} />
            </div>
          )}
-
          {showEmptyListCTA && (
            <EmptyCorrelationsCTA canWriteCorrelations={canWriteCorrelations} onClick={() => setIsAdding(true)} />
          )}
-
          {
            // This error is not actionable, it'd be nice to have a recovery button
-            get.error && (
+            error && (
              <Alert
                severity="error"
                title={t('correlations.alert.title', 'Error fetching correlation data')}
                topSpacing={2}
              >
-                {(isFetchError(get.error) && get.error.data?.message) ||
+                {(isFetchError(error) && error.data?.message) ||
                  t(
                    'correlations.alert.error-message',
                    'An unknown error occurred while fetching correlation data. Please try again.'
@@ -196,10 +207,9 @@ export default function CorrelationsPage() {
              </Alert>
            )
          }
-
          {isAdding && <AddCorrelationForm onClose={() => setIsAdding(false)} onCreated={handleAdded} />}

-          {data && data.correlations.length >= 1 && (
+          {correlations && corrData.length >= 1 && (
            <>
              <InteractiveTable
                renderExpandedRow={(correlation) => (
@@ -210,15 +220,19 @@ export default function CorrelationsPage() {
                  />
                )}
                columns={columns}
-                data={data.correlations}
+                data={corrData}
                getRowId={(correlation) => `${correlation.source.uid}-${correlation.uid}`}
              />
              <Pagination
                currentPage={page.current}
-                numberOfPages={Math.ceil(data.totalCount / data.limit)}
+                numberOfPages={Math.ceil(correlations?.totalCount / correlations?.limit)}
                onNavigate={(toPage: number) => {
+                  if (changePageFn) {
+                    changePageFn(toPage);
+                  }
                  fetchCorrelations({ page: (page.current = toPage) });
                }}
+                hasNextPage={hasNextPage}
              />
            </>
          )}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kristina Durivage	b727586dd7	do ds lookup instead of trusting the uid	2026-01-13 21:07:17 -06:00
Kristina Durivage	0a2fae7f49	Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr	2026-01-12 20:48:08 -06:00
Kristina Durivage	fdc3603ffc	Fix based on PR feedback	2026-01-12 20:48:01 -06:00
Kristina Durivage	5c05cbae99	Merge branch 'main' into kristina/rtk-corr	2026-01-09 10:30:39 -06:00
Kristina Durivage	c2acc65ed6	Merge branch 'main' into kristina/rtk-corr	2026-01-07 13:36:29 -06:00
Kristina Durivage	7c52ba7e11	Merge branch 'main' into kristina/rtk-corr	2026-01-07 07:37:09 -06:00
Kristina Durivage	6a41f99439	Merge branch 'main' into kristina/rtk-corr	2026-01-05 13:37:41 -06:00
Kristina Durivage	f9ae7b14d2	Merge branch 'main' into kristina/rtk-corr	2025-12-30 13:22:13 -06:00
Kristina Durivage	022582809e	🧹	2025-12-29 19:34:52 -06:00
Kristina Durivage	05de2ccbd7	move back to reasonable number	2025-12-29 19:23:28 -06:00
Kristina Durivage	da6cc641a5	Add tests	2025-12-29 19:10:26 -06:00
Kristina Durivage	f9b7e5743f	Don’t crash if bad data, fix pagination to be usable with cursor only	2025-12-29 18:46:36 -06:00
Kristina Durivage	2326454af2	Merge branch 'main' into kristina/rtk-corr	2025-12-29 10:07:57 -06:00
Kristina Durivage	7cd212a5ed	fix lint/fmt	2025-12-24 18:57:38 -06:00
Kristina Durivage	1ec0f01717	fix tests	2025-12-24 18:36:03 -06:00
Kristina Durivage	7a3ecaece0	Merge branch 'main' into kristina/rtk-corr	2025-12-24 14:09:51 -06:00
Kristina Durivage	a523ca1e7e	fix lint suppressions	2025-12-22 20:57:56 -06:00
Kristina Durivage	9f93948f0b	Merge branch 'main' into kristina/rtk-corr	2025-12-22 11:52:46 -06:00
Kristina Durivage	3ef8251351	Merge branch 'main' into kristina/rtk-corr	2025-12-19 14:29:28 -06:00
Kristina Durivage	e2f6d99028	Testing the test	2025-12-16 08:41:44 -06:00
Kristina Durivage	ec6d82e1ba	Merge branch 'main' into kristina/rtk-corr	2025-12-16 08:22:16 -06:00
Kristina Durivage	9ccba75ee3	Merge branch 'main' into kristina/rtk-corr	2025-12-15 20:51:11 -06:00
Kristina Durivage	6f549cbdac	Change test to only use legacy version for now	2025-12-15 20:30:33 -06:00
Kristina Durivage	b40a5fe52b	Merge branch 'main' into kristina/rtk-corr	2025-12-15 10:46:20 -06:00
Kristina Durivage	d3e3d4252b	add wrapper test, WIP main test but remove the errors	2025-12-15 10:46:03 -06:00
Kristina Durivage	0ea1b197fd	fix linter errors	2025-12-11 13:39:17 -06:00
Kristina Durivage	c0147297b7	fix the error type	2025-12-11 13:27:13 -06:00
Kristina Durivage	a44eb98456	change limit	2025-12-10 20:51:35 -06:00
Kristina Durivage	caa95b2d95	cleanup	2025-12-10 19:50:03 -06:00
Kristina Durivage	b380118034	fix deletion	2025-12-10 19:47:00 -06:00
Kristina Durivage	2e38e852dc	Merge branch 'main' into kristina/rtk-corr	2025-12-09 09:31:58 -06:00
Kristina Durivage	af43f94ef2	wip	2025-12-03 12:31:57 -06:00
Kristina Durivage	f7273f415b	Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr	2025-12-03 09:47:32 -06:00
Kristina Durivage	b95899c698	WIP	2025-12-03 09:40:17 -06:00
Kristina Durivage	c7d58a32c6	add fake pagination	2025-12-02 11:57:12 -06:00
Kristina Durivage	7e2a6a7222	move conversion logic to hook, remove unneeded memo	2025-11-30 12:51:28 -06:00
Kristina Durivage	f935a6579f	properly split logic	2025-11-30 10:32:34 -06:00
Kristina Durivage	df6d5cc628	Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr	2025-11-28 14:09:32 -06:00
Kristina Durivage	ccd9d18e40	Add this to show what I’m trying to access	2025-11-25 19:56:03 -06:00
Kristina Durivage	7a7b529e81	WIP	2025-11-25 14:26:30 -06:00
Kristina Durivage	5ff8961662	Merge branch 'cocorrelations-limit' of https://github.com/grafana/grafana into kristina/rtk-corr	2025-11-25 09:05:54 -06:00
Kristina Durivage	403e483fac	Merge branch 'main' into kristina/rtk-corr	2025-11-25 08:40:35 -06:00
Ryan McKinley	50b8721a0a	paging	2025-11-25 09:45:05 +03:00
Ryan McKinley	1265bcffcf	paging	2025-11-25 09:42:06 +03:00
Kristina Durivage	38811ac9d1	Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr	2025-11-24 08:27:14 -06:00
Kristina Durivage	9e9b1c660f	split	2025-11-20 18:41:38 -06:00
Kristina Durivage	e61912c721	Merge branch 'main' into kristina/rtk-corr	2025-11-20 10:25:46 -06:00
Kristina Durivage	17c57a1fb5	Merge branch 'main' into kristina/rtk-corr	2025-11-17 08:18:36 -06:00
Kristina Durivage	95bccb76fa	fix test that is technically correct but not great	2025-11-14 16:12:37 -06:00
Kristina Durivage	8329b12240	fully bring in the type for target	2025-11-14 16:09:40 -06:00
Kristina Durivage	b849787b2b	Try to get targetspec change to stick	2025-11-14 13:17:10 -06:00
Kristina Durivage	25faf7260b	Merge branch 'main' into kristina/rtk-corr	2025-11-13 14:06:12 -06:00
Kristina Durivage	5613a9ffbe	start create correlation, attempt to fix target type	2025-11-13 12:43:45 -06:00
Kristina Durivage	5092e0129a	Merge branch 'main' into kristina/rtk-corr	2025-11-13 08:45:28 -06:00
Kristina Durivage	9b2c224a9d	add more clarifying comments	2025-11-12 16:49:49 -06:00
Kristina Durivage	5aa18cbfe2	finish useCorrelations list	2025-11-12 16:06:13 -06:00
Kristina Durivage	38e38a3f7a	fix bad merge	2025-11-12 09:44:15 -06:00
Kristina Durivage	31a6e63bae	Merge branch 'main' of https://github.com/grafana/grafana into kristina/rtk-corr # Conflicts: # packages/grafana-api-clients/package.json	2025-11-12 09:43:13 -06:00
Kristina Durivage	0602d85706	Merge branch 'main' into kristina/rtk-corr	2025-10-24 11:27:13 -05:00
Kristina Durivage	fc7184b339	wip……	2025-10-23 21:15:46 -05:00
Kristina Durivage	5e456394a3	export library from package, use new location	2025-10-23 16:42:40 -05:00
Kristina Durivage	31bb3a7533	Merge branch 'main' into kristina/rtk-corr	2025-10-23 14:10:23 -05:00
Kristina Durivage	32ab61746f	WIP	2025-10-22 21:12:59 -05:00