undo go.mod change

make update-workspace
fix lint issues
2026-01-13 16:22:49 +00:00 · 2026-01-13 16:06:59 +00:00 · 2026-01-13 15:59:06 +00:00 · 2026-01-13 15:58:25 +00:00 · 2026-01-13 15:46:34 +00:00
317 changed files with 2171 additions and 14450 deletions
@@ -440,7 +440,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/dashboards/TestDashboard.json @grafana/dashboards-squad @grafana/grafana-search-navigate-organise
 /e2e-playwright/dashboards/TestV2Dashboard.json @grafana/dashboards-squad
 /e2e-playwright/dashboards/V2DashWithRepeats.json @grafana/dashboards-squad
-/e2e-playwright/dashboards/V2DashWithRowRepeats.json @grafana/dashboards-squad
 /e2e-playwright/dashboards/V2DashWithTabRepeats.json @grafana/dashboards-squad
 /e2e-playwright/dashboards-suite/adhoc-filter-from-panel.spec.ts @grafana/datapro
 /e2e-playwright/dashboards-suite/dashboard-browse-nested.spec.ts @grafana/grafana-search-navigate-organise
@@ -543,7 +542,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /packages/grafana-data/tsconfig.json @grafana/grafana-frontend-platform
 /packages/grafana-data/test/ @grafana/grafana-frontend-platform
 /packages/grafana-data/typings/ @grafana/grafana-frontend-platform
-/packages/grafana-data/scripts/ @grafana/grafana-frontend-platform

 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-data/src/context/plugins/ @grafana/plugins-platform-frontend
@@ -659,7 +657,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /packages/grafana-runtime/src/services/LocationService.tsx @grafana/grafana-search-navigate-organise
 /packages/grafana-runtime/src/services/LocationSrv.ts @grafana/grafana-search-navigate-organise
 /packages/grafana-runtime/src/services/live.ts @grafana/dashboards-squad
-/packages/grafana-runtime/src/services/pluginMeta @grafana/plugins-platform-frontend
 /packages/grafana-runtime/src/utils/chromeHeaderHeight.ts @grafana/grafana-search-navigate-organise
 /packages/grafana-runtime/src/utils/DataSourceWithBackend* @grafana/grafana-datasources-core-services
 /packages/grafana-runtime/src/utils/licensing.ts @grafana/grafana-operator-experience-squad
@@ -121,8 +121,6 @@ linters:
            - '**/pkg/tsdb/zipkin/**/*'
            - '**/pkg/tsdb/jaeger/*'
            - '**/pkg/tsdb/jaeger/**/*'
-            - '**/pkg/tsdb/elasticsearch/*'
-            - '**/pkg/tsdb/elasticsearch/**/*'
          deny:
            - pkg: github.com/grafana/grafana/pkg/api
              desc: Core plugins are not allowed to depend on Grafana core packages
@@ -28,7 +28,7 @@ type check struct {
 	PluginStore               pluginstore.Store
 	PluginContextProvider     PluginContextProvider
 	PluginClient              plugins.Client
-	PluginRepo                checks.PluginInfoGetter
+	PluginRepo                repo.Service
 	GrafanaVersion            string
 	pluginCanBeInstalledCache map[string]bool
 	pluginExistsCacheMu       sync.RWMutex
@@ -39,7 +39,7 @@ func New(
 	pluginStore pluginstore.Store,
 	pluginContextProvider PluginContextProvider,
 	pluginClient plugins.Client,
-	pluginRepo checks.PluginInfoGetter,
+	pluginRepo repo.Service,
 	grafanaVersion string,
 ) checks.Check {
 	return &check{
@@ -15,7 +15,7 @@ import (

 type missingPluginStep struct {
 	PluginStore    pluginstore.Store
-	PluginRepo     checks.PluginInfoGetter
+	PluginRepo     repo.Service
 	GrafanaVersion string
 }

@@ -5,7 +5,6 @@ import (

 	"github.com/grafana/grafana-app-sdk/logging"
 	advisorv0alpha1 "github.com/grafana/grafana/apps/advisor/pkg/apis/advisor/v0alpha1"
-	"github.com/grafana/grafana/pkg/plugins/repo"
 )

 // Check returns metadata about the check being executed and the list of Steps
@@ -38,10 +37,3 @@ type Step interface {
 	// Run executes the step for an item and returns a report
 	Run(ctx context.Context, log logging.Logger, obj *advisorv0alpha1.CheckSpec, item any) ([]advisorv0alpha1.CheckReportFailure, error)
 }
-
-// PluginInfoGetter is a minimal interface for retrieving plugin information from a repository.
-// It contains only the GetPluginsInfo method used by plugincheck and datasourcecheck.
-type PluginInfoGetter interface {
-	// GetPluginsInfo will return a list of plugins from grafana.com/api/plugins.
-	GetPluginsInfo(ctx context.Context, options repo.GetPluginsInfoOptions, compatOpts repo.CompatOpts) ([]repo.PluginInfo, error)
-}
@@ -17,7 +17,7 @@ const (

 func New(
 	pluginStore pluginstore.Store,
-	pluginRepo checks.PluginInfoGetter,
+	pluginRepo repo.Service,
 	updateChecker pluginchecker.PluginUpdateChecker,
 	pluginErrorResolver plugins.ErrorResolver,
 	grafanaVersion string,
@@ -33,7 +33,7 @@ func New(

 type check struct {
 	PluginStore         pluginstore.Store
-	PluginRepo          checks.PluginInfoGetter
+	PluginRepo          repo.Service
 	updateChecker       pluginchecker.PluginUpdateChecker
 	pluginErrorResolver plugins.ErrorResolver
 	GrafanaVersion      string
@@ -800,8 +800,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

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

 // Query variable specification
@@ -241,8 +241,6 @@ lineage: schemas: [{
 			text: string | [...string]
 			// Value of the option
 			value: string | [...string]
-			// Additional properties for multi-props variables
-			properties?: {[string]: string}
 		} @cuetsy(kind="interface")

 		// Options to config when to refresh a variable
@@ -241,8 +241,6 @@ lineage: schemas: [{
 			text: string | [...string]
 			// Value of the option
 			value: string | [...string]
-			// Additional properties for multi-props variables
-			properties?: {[string]: string}
 		} @cuetsy(kind="interface")

 		// Options to config when to refresh a variable
@@ -804,8 +804,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -1426,8 +1426,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
@@ -5133,22 +5133,6 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardVariableOption(ref common.Refer
 							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1.DashboardStringOrArrayOfString"),
 						},
 					},
-					"properties": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Additional properties for multi-props variables",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
 				},
 				Required: []string{"text", "value"},
 			},
@@ -808,8 +808,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

 // Query variable specification
@@ -1429,8 +1429,6 @@ type DashboardVariableOption struct {
 	Text DashboardStringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value DashboardStringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
@@ -5196,22 +5196,6 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardVariableOption(ref common.Refere
 							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1.DashboardStringOrArrayOfString"),
 						},
 					},
-					"properties": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Additional properties for multi-props variables",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
 				},
 				Required: []string{"text", "value"},
 			},
@@ -71,6 +71,11 @@ func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec) (m
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert panels: %w", err)
 	}
+	// Count total panels including those in collapsed rows
+	totalPanelsConverted := countTotalPanels(panels)
+	if totalPanelsConverted < len(in.Elements) {
+		return nil, fmt.Errorf("some panels were not converted from v2alpha1 to v1beta1")
+	}

 	if len(panels) > 0 {
 		dashboard["panels"] = panels
@@ -193,6 +198,29 @@ func convertLinksToV1(links []dashv2alpha1.DashboardDashboardLink) []map[string]
 	return result
 }

+// countTotalPanels counts all panels including those nested in collapsed row panels.
+func countTotalPanels(panels []interface{}) int {
+	count := 0
+	for _, p := range panels {
+		panel, ok := p.(map[string]interface{})
+		if !ok {
+			count++
+			continue
+		}
+
+		// Check if this is a row panel with nested panels
+		if panelType, ok := panel["type"].(string); ok && panelType == "row" {
+			if nestedPanels, ok := panel["panels"].([]interface{}); ok {
+				count += len(nestedPanels)
+			}
+			// Don't count the row itself as a panel element
+		} else {
+			count++
+		}
+	}
+	return count
+}
+
 // convertPanelsFromElementsAndLayout converts V2 layout structures to V1 panel arrays.
 // V1 only supports a flat array of panels with row panels for grouping.
 // This function dispatches to the appropriate converter based on layout type:
@@ -290,7 +290,7 @@
        ],
        "legend": {
          "displayMode": "table",
-          "placement": "bottom",
+          "placement": "right",
          "showLegend": true,
          "values": [
            "percent"
@@ -304,7 +304,7 @@
          "fields": "",
          "values": false
        },
-        "showLegend": false,
+        "showLegend": true,
        "strokeWidth": 1,
        "text": {}
      },
@@ -323,6 +323,15 @@
        }
      ],
      "title": "Percent",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "^Backend-(.*)$",
+            "renamePattern": "b-$1"
+          }
+        }
+      ],
      "type": "piechart"
    },
    {
@@ -366,7 +375,7 @@
        ],
        "legend": {
          "displayMode": "table",
-          "placement": "bottom",
+          "placement": "right",
          "showLegend": true,
          "values": [
            "value"
@@ -380,7 +389,7 @@
          "fields": "",
          "values": false
        },
-        "showLegend": false,
+        "showLegend": true,
        "strokeWidth": 1,
        "text": {}
      },
@@ -399,6 +408,15 @@
        }
      ],
      "title": "Value",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "(.*)",
+            "renamePattern": "$1-how-much-wood-could-a-woodchuck-chuck-if-a-woodchuck-could-chuck-wood"
+          }
+        }
+      ],
      "type": "piechart"
    },
    {
@@ -1,16 +1,9 @@
 include ../sdk.mk

-.PHONY: internal-generate # Run Grafana App SDK code generation
-internal-generate: install-app-sdk update-app-sdk
+.PHONY: generate # Run Grafana App SDK code generation
+generate: install-app-sdk update-app-sdk
 	@$(APP_SDK_BIN) generate \
 		--source=./kinds/ \
 		--gogenpath=./pkg/apis \
 		--grouping=group \
-		--defencoding=none
-
-.PHONY: generate
-generate: internal-generate # copy files to packages/grafana-runtime/src/services/pluginMeta/types
-	rm -f ./packages/grafana-runtime/src/services/pluginMeta/types/*.ts 
-	cp plugin/src/generated/meta/v0alpha1/meta_object_gen.ts ../../packages/grafana-runtime/src/services/pluginMeta/types/meta_object_gen.ts
-	cp plugin/src/generated/meta/v0alpha1/types.spec.gen.ts ../../packages/grafana-runtime/src/services/pluginMeta/types/types.spec.gen.ts
-	cp plugin/src/generated/meta/v0alpha1/types.status.gen.ts ../../packages/grafana-runtime/src/services/pluginMeta/types/types.status.gen.ts
+		--defencoding=none
@@ -4,7 +4,8 @@ API documentation is available at http://localhost:3000/swagger?api=plugins.graf

 ## Codegen

- Go and TypeScript: `make generate`
+- Go: `make generate`
+- Frontend: Follow instructions in this [README](../..//packages/grafana-api-clients/README.md)

 ## Plugin sync

@@ -30,6 +30,7 @@ require (
 require (
 	cel.dev/expr v0.25.1 // indirect
 	github.com/Machiel/slugify v1.0.1 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/ProtonMail/go-crypto v1.3.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -9,6 +9,8 @@ github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
 github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
@@ -11,7 +11,7 @@ manifest: {
 v0alpha1Version: {
 	served: true
 	codegen: {
-		ts: {enabled: true}
+		ts: {enabled: false}
 		go: {enabled: true}
 	}
 	kinds: [
@@ -4,7 +4,6 @@ import (
 	"context"
 	"time"

-	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 )

@@ -12,26 +11,16 @@ const (
 	defaultLocalTTL = 1 * time.Hour
 )

-// PluginAssetsCalculator is an interface for calculating plugin asset information.
-// LocalProvider requires this to calculate loading strategy and module hash.
-type PluginAssetsCalculator interface {
-	LoadingStrategy(ctx context.Context, p pluginstore.Plugin) plugins.LoadingStrategy
-	ModuleHash(ctx context.Context, p pluginstore.Plugin) string
-}
-
 // LocalProvider retrieves plugin metadata for locally installed plugins.
 // It uses the plugin store to access plugins that have already been loaded.
 type LocalProvider struct {
-	store        pluginstore.Store
-	pluginAssets PluginAssetsCalculator
+	store pluginstore.Store
 }

 // NewLocalProvider creates a new LocalProvider for locally installed plugins.
-// pluginAssets is required for calculating loading strategy and module hash.
-func NewLocalProvider(pluginStore pluginstore.Store, pluginAssets PluginAssetsCalculator) *LocalProvider {
+func NewLocalProvider(pluginStore pluginstore.Store) *LocalProvider {
 	return &LocalProvider{
-		store:        pluginStore,
-		pluginAssets: pluginAssets,
+		store: pluginStore,
 	}
 }

@@ -42,10 +31,7 @@ func (p *LocalProvider) GetMeta(ctx context.Context, pluginID, version string) (
 		return nil, ErrMetaNotFound
 	}

-	loadingStrategy := p.pluginAssets.LoadingStrategy(ctx, plugin)
-	moduleHash := p.pluginAssets.ModuleHash(ctx, plugin)
-
-	spec := pluginStorePluginToMeta(plugin, loadingStrategy, moduleHash)
+	spec := pluginStorePluginToMeta(plugin, plugin.LoadingStrategy, plugin.ModuleHash)
 	return &Result{
 		Meta: spec,
 		TTL:  defaultLocalTTL,
@@ -1,49 +0,0 @@
-/*
- * This file was generated by grafana-app-sdk. DO NOT EDIT.
- */
-import { Spec } from './types.spec.gen';
-import { Status } from './types.status.gen';
-
-export interface Metadata {
-    name: string;
-    namespace: string;
-    generateName?: string;
-    selfLink?: string;
-    uid?: string;
-    resourceVersion?: string;
-    generation?: number;
-    creationTimestamp?: string;
-    deletionTimestamp?: string;
-    deletionGracePeriodSeconds?: number;
-    labels?: Record<string, string>;
-    annotations?: Record<string, string>;
-    ownerReferences?: OwnerReference[];
-    finalizers?: string[];
-    managedFields?: ManagedFieldsEntry[];
-}
-
-export interface OwnerReference {
-    apiVersion: string;
-    kind: string;
-    name: string;
-    uid: string;
-    controller?: boolean;
-    blockOwnerDeletion?: boolean;
-}
-
-export interface ManagedFieldsEntry {
-    manager?: string;
-    operation?: string;
-    apiVersion?: string;
-    time?: string;
-    fieldsType?: string;
-    subresource?: string;
-}
-
-export interface Meta {
-    kind: string;
-    apiVersion: string;
-    metadata: Metadata;
-    spec: Spec;
-    status: Status;
-}
@@ -1,30 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-// metadata contains embedded CommonMetadata and can be extended with custom string fields
-// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-// without external reference as using the CommonMetadata reference breaks thema codegen.
-export interface Metadata {
-	updateTimestamp: string;
-	createdBy: string;
-	uid: string;
-	creationTimestamp: string;
-	deletionTimestamp?: string;
-	finalizers: string[];
-	resourceVersion: string;
-	generation: number;
-	updatedBy: string;
-	labels: Record<string, string>;
-}
-
-export const defaultMetadata = (): Metadata => ({
-	updateTimestamp: "",
-	createdBy: "",
-	uid: "",
-	creationTimestamp: "",
-	finalizers: [],
-	resourceVersion: "",
-	generation: 0,
-	updatedBy: "",
-	labels: {},
-});
-
@@ -1,278 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-// JSON configuration schema for Grafana plugins
-// Converted from: https://github.com/grafana/grafana/blob/main/docs/sources/developers/plugins/plugin.schema.json
-export interface JSONData {
-	// Unique name of the plugin
-	id: string;
-	// Plugin type
-	type: "app" | "datasource" | "panel" | "renderer";
-	// Human-readable name of the plugin
-	name: string;
-	// Metadata for the plugin
-	info: Info;
-	// Dependency information
-	dependencies: Dependencies;
-	// Optional fields
-	alerting?: boolean;
-	annotations?: boolean;
-	autoEnabled?: boolean;
-	backend?: boolean;
-	buildMode?: string;
-	builtIn?: boolean;
-	category?: "tsdb" | "logging" | "cloud" | "tracing" | "profiling" | "sql" | "enterprise" | "iot" | "other";
-	enterpriseFeatures?: EnterpriseFeatures;
-	executable?: string;
-	hideFromList?: boolean;
-	// +listType=atomic
-	includes?: Include[];
-	logs?: boolean;
-	metrics?: boolean;
-	multiValueFilterOperators?: boolean;
-	pascalName?: string;
-	preload?: boolean;
-	queryOptions?: QueryOptions;
-	// +listType=atomic
-	routes?: Route[];
-	skipDataQuery?: boolean;
-	state?: "alpha" | "beta";
-	streaming?: boolean;
-	suggestions?: boolean;
-	tracing?: boolean;
-	iam?: IAM;
-	// +listType=atomic
-	roles?: Role[];
-	extensions?: Extensions;
-}
-
-export const defaultJSONData = (): JSONData => ({
-	id: "",
-	type: "app",
-	name: "",
-	info: defaultInfo(),
-	dependencies: defaultDependencies(),
-});
-
-export interface Info {
-	// Required fields
-	// +listType=set
-	keywords: string[];
-	logos: {
-		small: string;
-		large: string;
-	};
-	updated: string;
-	version: string;
-	// Optional fields
-	author?: {
-		name?: string;
-		email?: string;
-		url?: string;
-	};
-	description?: string;
-	// +listType=atomic
-	links?: {
-		name?: string;
-		url?: string;
-	}[];
-	// +listType=atomic
-	screenshots?: {
-		name?: string;
-		path?: string;
-	}[];
-}
-
-export const defaultInfo = (): Info => ({
-	keywords: [],
-	logos: {
-	small: "",
-	large: "",
-},
-	updated: "",
-	version: "",
-});
-
-export interface Dependencies {
-	// Required field
-	grafanaDependency: string;
-	// Optional fields
-	grafanaVersion?: string;
-	// +listType=set
-	// +listMapKey=id
-	plugins?: {
-		id: string;
-		type: "app" | "datasource" | "panel";
-		name: string;
-	}[];
-	extensions?: {
-		// +listType=set
-		exposedComponents?: string[];
-	};
-}
-
-export const defaultDependencies = (): Dependencies => ({
-	grafanaDependency: "",
-});
-
-export interface EnterpriseFeatures {
-	// Allow additional properties
-	healthDiagnosticsErrors?: boolean;
-}
-
-export const defaultEnterpriseFeatures = (): EnterpriseFeatures => ({
-	healthDiagnosticsErrors: false,
-});
-
-export interface Include {
-	uid?: string;
-	type?: "dashboard" | "page" | "panel" | "datasource";
-	name?: string;
-	component?: string;
-	role?: "Admin" | "Editor" | "Viewer" | "None";
-	action?: string;
-	path?: string;
-	addToNav?: boolean;
-	defaultNav?: boolean;
-	icon?: string;
-}
-
-export const defaultInclude = (): Include => ({
-});
-
-export interface QueryOptions {
-	maxDataPoints?: boolean;
-	minInterval?: boolean;
-	cacheTimeout?: boolean;
-}
-
-export const defaultQueryOptions = (): QueryOptions => ({
-});
-
-export interface Route {
-	path?: string;
-	method?: string;
-	url?: string;
-	reqSignedIn?: boolean;
-	reqRole?: string;
-	reqAction?: string;
-	// +listType=atomic
-	headers?: string[];
-	body?: Record<string, any>;
-	tokenAuth?: {
-		url?: string;
-		// +listType=set
-		scopes?: string[];
-		params?: Record<string, any>;
-	};
-	jwtTokenAuth?: {
-		url?: string;
-		// +listType=set
-		scopes?: string[];
-		params?: Record<string, any>;
-	};
-	// +listType=atomic
-	urlParams?: {
-		name?: string;
-		content?: string;
-	}[];
-}
-
-export const defaultRoute = (): Route => ({
-});
-
-export interface IAM {
-	// +listType=atomic
-	permissions?: {
-		action?: string;
-		scope?: string;
-	}[];
-}
-
-export const defaultIAM = (): IAM => ({
-});
-
-export interface Role {
-	role?: {
-		name?: string;
-		description?: string;
-		// +listType=atomic
-		permissions?: {
-			action?: string;
-			scope?: string;
-		}[];
-	};
-	// +listType=set
-	grants?: string[];
-}
-
-export const defaultRole = (): Role => ({
-});
-
-export interface Extensions {
-	// +listType=atomic
-	addedComponents?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=atomic
-	addedLinks?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=atomic
-	addedFunctions?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=set
-	// +listMapKey=id
-	exposedComponents?: {
-		id: string;
-		title?: string;
-		description?: string;
-	}[];
-	// +listType=set
-	// +listMapKey=id
-	extensionPoints?: {
-		id: string;
-		title?: string;
-		description?: string;
-	}[];
-}
-
-export const defaultExtensions = (): Extensions => ({
-});
-
-export interface Spec {
-	pluginJson: JSONData;
-	class: "core" | "external";
-	module?: {
-		path: string;
-		hash?: string;
-		loadingStrategy?: "fetch" | "script";
-	};
-	baseURL?: string;
-	signature?: {
-		status: "internal" | "valid" | "invalid" | "modified" | "unsigned";
-		type?: "grafana" | "commercial" | "community" | "private" | "private-glob";
-		org?: string;
-	};
-	angular?: {
-		detected: boolean;
-	};
-	translations?: Record<string, string>;
-	// +listType=atomic
-	children?: string[];
-}
-
-export const defaultSpec = (): Spec => ({
-	pluginJson: defaultJSONData(),
-	class: "core",
-});
-
@@ -1,30 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-export interface OperatorState {
-	// lastEvaluation is the ResourceVersion last evaluated
-	lastEvaluation: string;
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	state: "success" | "in_progress" | "failed";
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	descriptiveState?: string;
-	// details contains any extra information that is operator-specific
-	details?: Record<string, any>;
-}
-
-export const defaultOperatorState = (): OperatorState => ({
-	lastEvaluation: "",
-	state: "success",
-});
-
-export interface Status {
-	// operatorStates is a map of operator ID to operator state evaluations.
-	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	operatorStates?: Record<string, OperatorState>;
-	// additionalFields is reserved for future use
-	additionalFields?: Record<string, any>;
-}
-
-export const defaultStatus = (): Status => ({
-});
-
@@ -1,49 +0,0 @@
-/*
- * This file was generated by grafana-app-sdk. DO NOT EDIT.
- */
-import { Spec } from './types.spec.gen';
-import { Status } from './types.status.gen';
-
-export interface Metadata {
-    name: string;
-    namespace: string;
-    generateName?: string;
-    selfLink?: string;
-    uid?: string;
-    resourceVersion?: string;
-    generation?: number;
-    creationTimestamp?: string;
-    deletionTimestamp?: string;
-    deletionGracePeriodSeconds?: number;
-    labels?: Record<string, string>;
-    annotations?: Record<string, string>;
-    ownerReferences?: OwnerReference[];
-    finalizers?: string[];
-    managedFields?: ManagedFieldsEntry[];
-}
-
-export interface OwnerReference {
-    apiVersion: string;
-    kind: string;
-    name: string;
-    uid: string;
-    controller?: boolean;
-    blockOwnerDeletion?: boolean;
-}
-
-export interface ManagedFieldsEntry {
-    manager?: string;
-    operation?: string;
-    apiVersion?: string;
-    time?: string;
-    fieldsType?: string;
-    subresource?: string;
-}
-
-export interface Plugin {
-    kind: string;
-    apiVersion: string;
-    metadata: Metadata;
-    spec: Spec;
-    status: Status;
-}
@@ -1,30 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-// metadata contains embedded CommonMetadata and can be extended with custom string fields
-// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-// without external reference as using the CommonMetadata reference breaks thema codegen.
-export interface Metadata {
-	updateTimestamp: string;
-	createdBy: string;
-	uid: string;
-	creationTimestamp: string;
-	deletionTimestamp?: string;
-	finalizers: string[];
-	resourceVersion: string;
-	generation: number;
-	updatedBy: string;
-	labels: Record<string, string>;
-}
-
-export const defaultMetadata = (): Metadata => ({
-	updateTimestamp: "",
-	createdBy: "",
-	uid: "",
-	creationTimestamp: "",
-	finalizers: [],
-	resourceVersion: "",
-	generation: 0,
-	updatedBy: "",
-	labels: {},
-});
-
@@ -1,13 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-export interface Spec {
-	id: string;
-	version: string;
-	url?: string;
-}
-
-export const defaultSpec = (): Spec => ({
-	id: "",
-	version: "",
-});
-
@@ -1,30 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-export interface OperatorState {
-	// lastEvaluation is the ResourceVersion last evaluated
-	lastEvaluation: string;
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	state: "success" | "in_progress" | "failed";
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	descriptiveState?: string;
-	// details contains any extra information that is operator-specific
-	details?: Record<string, any>;
-}
-
-export const defaultOperatorState = (): OperatorState => ({
-	lastEvaluation: "",
-	state: "success",
-});
-
-export interface Status {
-	// operatorStates is a map of operator ID to operator state evaluations.
-	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	operatorStates?: Record<string, OperatorState>;
-	// additionalFields is reserved for future use
-	additionalFields?: Record<string, any>;
-}
-
-export const defaultStatus = (): Status => ({
-});
-
@@ -248,7 +248,7 @@
        "legend": {
          "values": ["percent"],
          "displayMode": "table",
-          "placement": "bottom"
+          "placement": "right"
        },
        "pieType": "pie",
        "reduceOptions": {
@@ -256,7 +256,7 @@
          "fields": "",
          "values": false
        },
-        "showLegend": false,
+        "showLegend": true,
        "strokeWidth": 1,
        "text": {}
      },
@@ -272,6 +272,15 @@
      "timeFrom": null,
      "timeShift": null,
      "title": "Percent",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "^Backend-(.*)$",
+            "renamePattern": "b-$1"
+          }
+        }
+      ],
      "type": "piechart"
    },
    {
@@ -311,7 +320,7 @@
        "legend": {
          "values": ["value"],
          "displayMode": "table",
-          "placement": "bottom"
+          "placement": "right"
        },
        "pieType": "pie",
        "reduceOptions": {
@@ -319,7 +328,7 @@
          "fields": "",
          "values": false
        },
-        "showLegend": false,
+        "showLegend": true,
        "strokeWidth": 1,
        "text": {}
      },
@@ -335,6 +344,15 @@
      "timeFrom": null,
      "timeShift": null,
      "title": "Value",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "(.*)",
+            "renamePattern": "$1-how-much-wood-could-a-woodchuck-chuck-if-a-woodchuck-could-chuck-wood"
+          }
+        }
+      ],
      "type": "piechart"
    },
    {
@@ -35,10 +35,10 @@ For Grafana Cloud users, Grafana Support is not authorised to make org role chan

 ## Grafana server administrators

-A Grafana server administrator (sometimes referred to as a **Grafana Admin**) manages server-wide settings and access to resources such as organizations, users, and licenses. Grafana includes a default server administrator that you can use to manage all of Grafana, or you can divide that responsibility among other server administrators that you create.
+A Grafana server administrator manages server-wide settings and access to resources such as organizations, users, and licenses. Grafana includes a default server administrator that you can use to manage all of Grafana, or you can divide that responsibility among other server administrators that you create.

-{{< admonition type="caution" >}}
-The server administrator role is distinct from the [organization administrator](#organization-roles) role.
+{{< admonition type="note" >}}
+The server administrator role does not mean that the user is also a Grafana [organization administrator](#organization-roles).
 {{< /admonition >}}

 A server administrator can perform the following tasks:
@@ -50,7 +50,7 @@ A server administrator can perform the following tasks:
 - Upgrade the server to Grafana Enterprise.

 {{< admonition type="note" >}}
-The server administrator (Grafana Admin) role does not exist in Grafana Cloud.
+The server administrator role does not exist in Grafana Cloud.
 {{< /admonition >}}

 To assign or remove server administrator privileges, see [Server user management](../user-management/server-user-management/assign-remove-server-admin-privileges/).
@@ -53,11 +53,6 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/custom-role-actions-scopes/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/account-management/authentication-and-permissions/access-control/custom-role-actions-scopes/
-  rbac-terraform-provisioning:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/account-management/authentication-and-permissions/access-control/rbac-terraform-provisioning/
  rbac-grafana-provisioning:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/
@@ -150,13 +145,7 @@ Refer to the [RBAC HTTP API](ref:api-rbac-get-a-role) for more details.

 ## Create custom roles

-This section shows you how to create a custom RBAC role using Grafana provisioning or the HTTP API.
-
-Creating and editing custom roles is not currently possible in the Grafana UI. To manage custom roles, use one of the following methods:
-
- [Provisioning](ref:rbac-grafana-provisioning) (for self-managed instances)
- [HTTP API](ref:api-rbac-create-a-new-custom-role)
- [Terraform](ref:rbac-terraform-provisioning)
+This section shows you how to create a custom RBAC role using Grafana provisioning and the HTTP API.

 Create a custom role when basic roles and fixed roles do not meet your permissions requirements.

@@ -164,101 +153,14 @@ Create a custom role when basic roles and fixed roles do not meet your permissio

 - [Plan your RBAC rollout strategy](ref:plan-rbac-rollout-strategy).
 - Determine which permissions you want to add to the custom role. To see a list of actions and scope, refer to [RBAC permissions, actions, and scopes](ref:custom-role-actions-scopes).
+- [Enable role provisioning](ref:rbac-grafana-provisioning).
 - Ensure that you have permissions to create a custom role.
  - By default, the Grafana Admin role has permission to create custom roles.
  - A Grafana Admin can delegate the custom role privilege to another user by creating a custom role with the relevant permissions and adding the `permissions:type:delegate` scope.

-### Create custom roles using the HTTP API
+### Create custom roles using provisioning

-The following examples show you how to create a custom role using the Grafana HTTP API. For more information about the HTTP API, refer to [Create a new custom role](ref:api-rbac-create-a-new-custom-role).
-
-{{< admonition type="note" >}}
-When you create a custom role you can only give it the same permissions you already have. For example, if you only have `users:create` permissions, then you can't create a role that includes other permissions.
-{{< /admonition >}}
-
-The following example creates a `custom:users:admin` role and assigns the `users:create` action to it.
-
-**Example request**
-
-```
-curl --location --request POST '<grafana_url>/api/access-control/roles/' \
--header 'Authorization: Basic YWRtaW46cGFzc3dvcmQ=' \
--header 'Content-Type: application/json' \
--data-raw '{
-    "version": 1,
-    "uid": "jZrmlLCkGksdka",
-    "name": "custom:users:admin",
-    "displayName": "custom users admin",
-    "description": "My custom role which gives users permissions to create users",
-    "global": true,
-    "permissions": [
-        {
-            "action": "users:create"
-        }
-    ]
-}'
-```
-
-**Example response**
-
-```
-{
-    "version": 1,
-    "uid": "jZrmlLCkGksdka",
-    "name": "custom:users:admin",
-    "displayName": "custom users admin",
-    "description": "My custom role which gives users permissions to create users",
-    "global": true,
-    "permissions": [
-        {
-            "action": "users:create"
-            "updated": "2021-05-17T22:07:31.569936+02:00",
-            "created": "2021-05-17T22:07:31.569935+02:00"
-        }
-    ],
-    "updated": "2021-05-17T22:07:31.564403+02:00",
-    "created": "2021-05-17T22:07:31.564403+02:00"
-}
-```
-
-Refer to the [RBAC HTTP API](ref:api-rbac-create-a-new-custom-role) for more details.
-
-### Create custom roles using Terraform
-
-You can use the [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs) to manage custom roles and their assignments. This is the recommended method for Grafana Cloud users who want to manage RBAC as code. For more information, refer to [Provisioning RBAC with Terraform](ref:rbac-terraform-provisioning).
-
-The following example creates a custom role and assigns it to a team:
-
-```terraform
-resource "grafana_role" "custom_folder_manager" {
-  name        = "custom:folders:manager"
-  description = "Custom role for reading and creating folders"
-  uid         = "custom-folders-manager"
-  version     = 1
-  global      = true
-
-  permissions {
-    action = "folders:read"
-    scope  = "folders:*"
-  }
-
-  permissions {
-    action = "folders:create"
-    scope  = "folders:uid:general" # Allows creating folders at the root level
-  }
-}
-
-resource "grafana_role_assignment" "custom_folder_manager_assignment" {
-  role_uid = grafana_role.custom_folder_manager.uid
-  teams    = ["<TEAM_UID>"]
-}
-```
-
-For more information, refer to the [`grafana_role`](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role) and [`grafana_role_assignment`](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role_assignment) documentation in the Terraform Registry.
-
-### Create custom roles using file-based provisioning
-
-You can use [file-based provisioning](ref:rbac-grafana-provisioning) to create custom roles for self-managed instances.
+[File-based provisioning](ref:rbac-grafana-provisioning) is one method you can use to create custom roles.

 1. Open the YAML configuration file and locate the `roles` section.

@@ -349,6 +251,61 @@ roles:
        state: 'absent'
 ```

+### Create custom roles using the HTTP API
+
+The following examples show you how to create a custom role using the Grafana HTTP API. For more information about the HTTP API, refer to [Create a new custom role](ref:api-rbac-create-a-new-custom-role).
+
+{{< admonition type="note" >}}
+You cannot create a custom role with permissions that you do not have. For example, if you only have `users:create` permissions, then you cannot create a role that includes other permissions.
+{{< /admonition >}}
+
+The following example creates a `custom:users:admin` role and assigns the `users:create` action to it.
+
+**Example request**
+
+```
+curl --location --request POST '<grafana_url>/api/access-control/roles/' \
+--header 'Authorization: Basic YWRtaW46cGFzc3dvcmQ=' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "version": 1,
+    "uid": "jZrmlLCkGksdka",
+    "name": "custom:users:admin",
+    "displayName": "custom users admin",
+    "description": "My custom role which gives users permissions to create users",
+    "global": true,
+    "permissions": [
+        {
+            "action": "users:create"
+        }
+    ]
+}'
+```
+
+**Example response**
+
+```
+{
+    "version": 1,
+    "uid": "jZrmlLCkGksdka",
+    "name": "custom:users:admin",
+    "displayName": "custom users admin",
+    "description": "My custom role which gives users permissions to create users",
+    "global": true,
+    "permissions": [
+        {
+            "action": "users:create"
+            "updated": "2021-05-17T22:07:31.569936+02:00",
+            "created": "2021-05-17T22:07:31.569935+02:00"
+        }
+    ],
+    "updated": "2021-05-17T22:07:31.564403+02:00",
+    "created": "2021-05-17T22:07:31.564403+02:00"
+}
+```
+
+Refer to the [RBAC HTTP API](ref:api-rbac-create-a-new-custom-role) for more details.
+
 ## Update basic role permissions

 If the default basic role definitions do not meet your requirements, you can change their permissions.
@@ -6,6 +6,7 @@ description: Learn about RBAC Grafana provisioning and view an example YAML prov
  file that configures Grafana role assignments.
 labels:
  products:
+    - cloud
    - enterprise
 menuTitle: Provisioning RBAC with Grafana
 title: Provisioning RBAC with Grafana
@@ -51,13 +52,11 @@ refs:
 # Provisioning RBAC with Grafana

 {{< admonition type="note" >}}
-Available in [Grafana Enterprise](/docs/grafana/<GRAFANA_VERSION>/introduction/grafana-enterprise/) for self-managed instances. This feature is not available in Grafana Cloud.
+Available in [Grafana Enterprise](/docs/grafana/<GRAFANA_VERSION>/introduction/grafana-enterprise/) and [Grafana Cloud](/docs/grafana-cloud).
 {{< /admonition >}}

 You can create, change or remove [Custom roles](ref:manage-rbac-roles-create-custom-roles-using-provisioning) and create or remove [basic role assignments](ref:assign-rbac-roles-assign-a-fixed-role-to-a-basic-role-using-provisioning), by adding one or more YAML configuration files in the `provisioning/access-control/` directory.

-Because this method requires access to the file system where Grafana is running, it's only available for self-managed Grafana instances. To provision RBAC in Grafana Cloud, use [Terraform](ref:rbac-terraform-provisioning) or the [HTTP API](ref:api-rbac-create-and-manage-custom-roles).
-
 Grafana performs provisioning during startup. After you make a change to the configuration file, you can reload it during runtime. You do not need to restart the Grafana server for your changes to take effect.

 **Before you begin:**
@@ -103,11 +103,10 @@ To configure basic settings for the data source, complete the following steps:

 1. Set the data source's basic configuration options:

-   | Name                | Description                                                                                                                                                                                                                                                                                                                                                                                                                       |
-   | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-   | **Name**            | Sets the name you use to refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                                          |
-   | **Default**         | Sets whether the data source is pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                                      |
-   | **Universe Domain** | The universe domain to connect to. For more information, refer to [Documentation on universe domains](https://docs.cloud.google.com/python/docs/reference/monitoring/latest/google.cloud.monitoring_v3.services.service_monitoring_service.ServiceMonitoringServiceAsyncClient#google_cloud_monitoring_v3_services_service_monitoring_service_ServiceMonitoringServiceAsyncClient_universe_domain). Defaults to `googleapis.com`. |
+   | Name        | Description                                                              |
+   | ----------- | ------------------------------------------------------------------------ |
+   | **Name**    | Sets the name you use to refer to the data source in panels and queries. |
+   | **Default** | Sets whether the data source is pre-selected for new panels.             |

 ### Provision the data source

@@ -130,7 +129,6 @@ datasources:
      clientEmail: stackdriver@myproject.iam.gserviceaccount.com
      authenticationType: jwt
      defaultProject: my-project-name
-      universeDomain: googleapis.com
    secureJsonData:
      privateKey: |
        -----BEGIN PRIVATE KEY-----
@@ -154,7 +152,6 @@ datasources:
      clientEmail: stackdriver@myproject.iam.gserviceaccount.com
      authenticationType: jwt
      defaultProject: my-project-name
-      universeDomain: googleapis.com
      privateKeyPath: /etc/secrets/gce.pem
 ```

@@ -169,7 +166,6 @@ datasources:
    access: proxy
    jsonData:
      authenticationType: gce
-      universeDomain: googleapis.com
 ```

 ## Import pre-configured dashboards
@@ -87,7 +87,6 @@ With a Grafana Enterprise license, you also get access to premium data sources,
 - [CockroachDB](/grafana/plugins/grafana-cockroachdb-datasource)
 - [Databricks](/grafana/plugins/grafana-databricks-datasource)
 - [DataDog](/grafana/plugins/grafana-datadog-datasource)
- [IBM Db2](/grafana/plugins/grafana-ibmdb2-datasource)
 - [Drone](/grafana/plugins/grafana-drone-datasource)
 - [DynamoDB](/grafana/plugins/grafana-dynamodb-datasource/)
 - [Dynatrace](/grafana/plugins/grafana-dynatrace-datasource)
@@ -2030,44 +2030,6 @@ For example: `disabled_labels=grafana_folder`

 <hr>

-### `[unified_alerting.state_history]`
-
-This section configures where Grafana Alerting writes alert state history. Refer to [Configure alert state history](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alert-state-history/) for end-to-end setup and examples.
-
-#### `enabled `
-
-Enables recording alert state history. Default is `false`.
-
-#### `backend `
-
-Select the backend used to store alert state history. Supported values: `loki`, `prometheus`, `multiple`.
-
-#### `loki_remote_url `
-
-The URL of the Loki server used when `backend = loki` (or when `backend = multiple` and Loki is a primary/secondary).
-
-#### `prometheus_target_datasource_uid `
-
-Target Prometheus data source UID used for writing alert state changes when `backend = prometheus` (or when `backend = multiple` and Prometheus is a secondary).
-
-#### `prometheus_metric_name `
-
-Optional. Metric name for the alert state metric. Default is `GRAFANA_ALERTS`.
-
-#### `prometheus_write_timeout `
-
-Optional. Timeout for writing alert state data to the target data source. Default is `10s`.
-
-#### `primary `
-
-Used only when `backend = multiple`. Selects the primary backend (for example `loki`).
-
-#### `secondaries `
-
-Used only when `backend = multiple`. Comma-separated list of secondary backends (for example `prometheus`).
-
-<hr>
-
 ### `[unified_alerting.state_history.annotations]`

 This section controls retention of annotations automatically created while evaluating alert rules when alerting state history backend is configured to be annotations (see setting [unified_alerting.state_history].backend)
@@ -83,7 +83,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `reportingRetries`                | Enables rendering retries for the reporting feature                                                    |
 | `externalServiceAccounts`         | Automatic service account and token setup for plugins                                                  |
 | `cloudWatchBatchQueries`          | Runs CloudWatch metrics queries as separate batches                                                    |
-| `dashboardNewLayouts`             | Enables new dashboard layouts                                                                          |
 | `pdfTables`                       | Enables generating table data as PDF in reporting                                                      |
 | `canvasPanelPanZoom`              | Allow pan and zoom in canvas panel                                                                     |
 | `alertingSaveStateCompressed`     | Enables the compressed protobuf-based alert state storage. Default is enabled.                         |
@@ -30,9 +30,7 @@ refs:

 # Datagrid

-{{< admonition type="caution" >}}
-Starting with Grafana 12.4, Datagrid is deprecated. It will be removed in version 13.0.
-{{< /admonition >}}
+{{< docs/experimental product="The datagrid visualization" featureFlag="`enableDatagridEditing`" >}}

 Datagrids offer you the ability to create, edit, and fine-tune data within Grafana. As such, this panel can act as a data source for other panels
 inside a dashboard.
@@ -1,7 +1,6 @@
 import { test, expect } from '@grafana/plugin-e2e';

 import testV2DashWithRepeats from '../dashboards/V2DashWithRepeats.json';
-import testV2DashWithRowRepeats from '../dashboards/V2DashWithRowRepeats.json';

 import {
  checkRepeatedPanelTitles,
@@ -11,14 +10,11 @@ import {
  saveDashboard,
  importTestDashboard,
  goToEmbeddedPanel,
-  goToPanelSnapshot,
 } from './utils';

 const repeatTitleBase = 'repeat - ';
 const newTitleBase = 'edited rep - ';
 const repeatOptions = [1, 2, 3, 4];
-const getTitleInRepeatRow = (rowIndex: number, panelIndex: number) =>
-  `repeated-row-${rowIndex}-repeated-panel-${panelIndex}`;

 test.use({
  featureToggles: {
@@ -169,7 +165,9 @@ test.describe(
        )
      ).toBeVisible();

-      await page.keyboard.press('Escape');
+      await dashboardPage
+        .getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.backToDashboardButton)
+        .click();

      await expect(
        dashboardPage.getByGrafanaSelector(selectors.components.DashboardEditPaneSplitter.primaryBody)
@@ -219,7 +217,9 @@ test.describe(
        )
      ).toBeVisible();

-      await page.keyboard.press('Escape');
+      await dashboardPage
+        .getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.backToDashboardButton)
+        .click();

      await expect(
        dashboardPage.getByGrafanaSelector(selectors.components.DashboardEditPaneSplitter.primaryBody)
@@ -405,143 +405,5 @@ test.describe(
        await dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerContainer).all()
      ).toHaveLength(3);
    });
-
-    test('can view repeated panel in a repeated row', async ({ dashboardPage, selectors, page }) => {
-      await importTestDashboard(
-        page,
-        selectors,
-        'Custom grid repeats - view repeated panel in a repeated row',
-        JSON.stringify(testV2DashWithRowRepeats)
-      );
-
-      // make sure the repeated panel is present in multiple rows
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeVisible();
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(2, 2)))
-      ).toBeVisible();
-
-      await dashboardPage
-        .getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-        .hover();
-
-      await page.keyboard.press('v');
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(2, 2)))
-      ).not.toBeVisible();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeVisible();
-
-      const repeatedPanelUrl = page.url();
-
-      await page.keyboard.press('Escape');
-
-      // load view panel directly
-      await page.goto(repeatedPanelUrl);
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeVisible();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(2, 2)))
-      ).not.toBeVisible();
-    });
-
-    test('can view embedded panel in a repeated row', async ({ dashboardPage, selectors, page }) => {
-      const embedPanelTitle = 'embedded-panel';
-      await importTestDashboard(
-        page,
-        selectors,
-        'Custom grid repeats - view embedded repeated panel in a repeated row',
-        JSON.stringify(testV2DashWithRowRepeats)
-      );
-
-      await dashboardPage
-        .getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-        .hover();
-      await page.keyboard.press('p+e');
-
-      await goToEmbeddedPanel(page);
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeVisible();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(2, 2)))
-      ).not.toBeVisible();
-    });
-
-    // there is a bug in the Snapshot feature that prevents the next two tests from passing
-    // tracking issue: https://github.com/grafana/grafana/issues/114509
-    test.skip('can view repeated panel inside snapshot', async ({ dashboardPage, selectors, page }) => {
-      await importTestDashboard(
-        page,
-        selectors,
-        'Custom grid repeats - view repeated panel inside snapshot',
-        JSON.stringify(testV2DashWithRowRepeats)
-      );
-
-      await dashboardPage
-        .getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-        .hover();
-      await page.keyboard.press('p+s');
-
-      // click "Publish snapshot"
-      await dashboardPage
-        .getByGrafanaSelector(selectors.pages.ShareDashboardDrawer.ShareSnapshot.publishSnapshot)
-        .click();
-
-      // click "Copy link" button in the snapshot drawer
-      await dashboardPage
-        .getByGrafanaSelector(selectors.pages.ShareDashboardDrawer.ShareSnapshot.copyUrlButton)
-        .click();
-
-      await goToPanelSnapshot(page);
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeVisible();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(2, 2)))
-      ).not.toBeVisible();
-    });
-    test.skip('can view single panel in a repeated row inside snapshot', async ({ dashboardPage, selectors, page }) => {
-      await importTestDashboard(
-        page,
-        selectors,
-        'Custom grid repeats - view single panel inside snapshot',
-        JSON.stringify(testV2DashWithRowRepeats)
-      );
-
-      await dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('single panel row 1')).hover();
-      // open panel snapshot
-      await page.keyboard.press('p+s');
-
-      // click "Publish snapshot"
-      await dashboardPage
-        .getByGrafanaSelector(selectors.pages.ShareDashboardDrawer.ShareSnapshot.publishSnapshot)
-        .click();
-
-      // click "Copy link" button
-      await dashboardPage
-        .getByGrafanaSelector(selectors.pages.ShareDashboardDrawer.ShareSnapshot.copyUrlButton)
-        .click();
-
-      await goToPanelSnapshot(page);
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title('single panel row 1'))
-      ).toBeVisible();
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(getTitleInRepeatRow(1, 1)))
-      ).toBeHidden();
-    });
  }
 );
@@ -218,15 +218,6 @@ export async function goToEmbeddedPanel(page: Page) {
  await page.goto(soloPanelUrl!);
 }

-export async function goToPanelSnapshot(page: Page) {
-  // extracting snapshot url from clipboard
-  const snapshotUrl = await page.evaluate(() => navigator.clipboard.readText());
-
-  expect(snapshotUrl).toBeDefined();
-
-  await page.goto(snapshotUrl);
-}
-
 export async function moveTab(
  dashboardPage: DashboardPage,
  page: Page,
@@ -1,486 +0,0 @@
-{
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "ad8l8fz",
-    "namespace": "default",
-    "uid": "fLb2na54K8NZHvn8LfWGL1jhZh03Hy0xpV1KzMYgAXEX",
-    "resourceVersion": "1",
-    "generation": 2,
-    "creationTimestamp": "2025-11-25T15:52:42Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "20"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:aerwo725ot62od",
-      "grafana.app/updatedBy": "user:aerwo725ot62od",
-      "grafana.app/updatedTimestamp": "2025-11-25T15:52:42Z",
-      "grafana.app/folder": ""
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "builtIn": true,
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "query": {
-            "datasource": {
-              "name": "-- Grafana --"
-            },
-            "group": "grafana",
-            "kind": "DataQuery",
-            "spec": {},
-            "version": "v0"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "description": "",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "hidden": false,
-                    "query": {
-                      "group": "",
-                      "kind": "DataQuery",
-                      "spec": {},
-                      "version": "v0"
-                    },
-                    "refId": "A"
-                  }
-                }
-              ],
-              "queryOptions": {},
-              "transformations": []
-            }
-          },
-          "description": "",
-          "id": 4,
-          "links": [],
-          "title": "repeated-row-$c4-repeated-panel-$c3",
-          "vizConfig": {
-            "group": "timeseries",
-            "kind": "VizConfig",
-            "spec": {
-              "fieldConfig": {
-                "defaults": {
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  },
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": 0
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                },
-                "overrides": []
-              },
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              }
-            },
-            "version": "12.4.0-pre"
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "hidden": false,
-                    "query": {
-                      "group": "",
-                      "kind": "DataQuery",
-                      "spec": {},
-                      "version": "v0"
-                    },
-                    "refId": "A"
-                  }
-                }
-              ],
-              "queryOptions": {},
-              "transformations": []
-            }
-          },
-          "description": "",
-          "id": 2,
-          "links": [],
-          "title": "single panel row $c4",
-          "vizConfig": {
-            "group": "timeseries",
-            "kind": "VizConfig",
-            "spec": {
-              "fieldConfig": {
-                "defaults": {
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  },
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": 0
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                },
-                "overrides": []
-              },
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              }
-            },
-            "version": "12.4.0-pre"
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "RowsLayout",
-      "spec": {
-        "rows": [
-          {
-            "kind": "RowsLayoutRow",
-            "spec": {
-              "collapse": false,
-              "layout": {
-                "kind": "GridLayout",
-                "spec": {
-                  "items": [
-                    {
-                      "kind": "GridLayoutItem",
-                      "spec": {
-                        "element": {
-                          "kind": "ElementReference",
-                          "name": "panel-1"
-                        },
-                        "height": 10,
-                        "repeat": {
-                          "direction": "h",
-                          "mode": "variable",
-                          "value": "c3"
-                        },
-                        "width": 24,
-                        "x": 0,
-                        "y": 0
-                      }
-                    },
-                    {
-                      "kind": "GridLayoutItem",
-                      "spec": {
-                        "element": {
-                          "kind": "ElementReference",
-                          "name": "panel-2"
-                        },
-                        "height": 8,
-                        "width": 12,
-                        "x": 0,
-                        "y": 10
-                      }
-                    }
-                  ]
-                }
-              },
-              "repeat": {
-                "mode": "variable",
-                "value": "c4"
-              },
-              "title": "Repeated row $c4"
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "autoRefresh": "",
-      "autoRefreshIntervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-      "fiscalYearStartMonth": 0,
-      "from": "now-6h",
-      "hideTimepicker": false,
-      "timezone": "browser",
-      "to": "now"
-    },
-    "title": "test-e2e-repeats",
-    "variables": [
-      {
-        "kind": "CustomVariable",
-        "spec": {
-          "allowCustomValue": true,
-          "current": {
-            "text": ["1", "2", "3", "4"],
-            "value": ["1", "2", "3", "4"]
-          },
-          "hide": "dontHide",
-          "includeAll": true,
-          "multi": true,
-          "name": "c1",
-          "options": [
-            {
-              "selected": true,
-              "text": "1",
-              "value": "1"
-            },
-            {
-              "selected": true,
-              "text": "2",
-              "value": "2"
-            },
-            {
-              "selected": true,
-              "text": "3",
-              "value": "3"
-            },
-            {
-              "selected": true,
-              "text": "4",
-              "value": "4"
-            }
-          ],
-          "query": "1,2,3,4",
-          "skipUrlSync": false
-        }
-      },
-      {
-        "kind": "CustomVariable",
-        "spec": {
-          "allowCustomValue": true,
-          "current": {
-            "text": ["A", "B", "C", "D"],
-            "value": ["A", "B", "C", "D"]
-          },
-          "hide": "dontHide",
-          "includeAll": true,
-          "multi": true,
-          "name": "c2",
-          "options": [
-            {
-              "selected": true,
-              "text": "A",
-              "value": "A"
-            },
-            {
-              "selected": true,
-              "text": "B",
-              "value": "B"
-            },
-            {
-              "selected": true,
-              "text": "C",
-              "value": "C"
-            },
-            {
-              "selected": true,
-              "text": "D",
-              "value": "D"
-            }
-          ],
-          "query": "A,B,C,D",
-          "skipUrlSync": false
-        }
-      },
-      {
-        "kind": "CustomVariable",
-        "spec": {
-          "allowCustomValue": true,
-          "current": {
-            "text": ["1", "2", "3", "4"],
-            "value": ["1", "2", "3", "4"]
-          },
-          "hide": "dontHide",
-          "includeAll": false,
-          "multi": true,
-          "name": "c3",
-          "options": [
-            {
-              "selected": true,
-              "text": "1",
-              "value": "1"
-            },
-            {
-              "selected": true,
-              "text": "2",
-              "value": "2"
-            },
-            {
-              "selected": true,
-              "text": "3",
-              "value": "3"
-            },
-            {
-              "selected": true,
-              "text": "4",
-              "value": "4"
-            }
-          ],
-          "query": "1, 2, 3, 4",
-          "skipUrlSync": false
-        }
-      },
-      {
-        "kind": "CustomVariable",
-        "spec": {
-          "allowCustomValue": true,
-          "current": {
-            "text": ["1", "2", "3", "4"],
-            "value": ["1", "2", "3", "4"]
-          },
-          "hide": "dontHide",
-          "includeAll": false,
-          "multi": true,
-          "name": "c4",
-          "options": [
-            {
-              "selected": true,
-              "text": "1",
-              "value": "1"
-            },
-            {
-              "selected": true,
-              "text": "2",
-              "value": "2"
-            },
-            {
-              "selected": true,
-              "text": "3",
-              "value": "3"
-            },
-            {
-              "selected": true,
-              "text": "4",
-              "value": "4"
-            }
-          ],
-          "query": "1, 2, 3, 4",
-          "skipUrlSync": false
-        }
-      }
-    ]
-  },
-  "status": {}
-}
@@ -1337,11 +1337,6 @@
      "count": 2
    }
  },
-  "public/app/features/alerting/unified/api/onCallApi.test.ts": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
  "public/app/features/alerting/unified/components/AnnotationDetailsField.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -1382,11 +1377,6 @@
      "count": 1
    }
  },
-  "public/app/features/alerting/unified/components/import-to-gma/ConfirmConvertModal.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/alerting/unified/components/import-to-gma/NamespaceAndGroupFilter.tsx": {
    "no-restricted-syntax": {
      "count": 2
@@ -1627,31 +1617,11 @@
      "count": 1
    }
  },
-  "public/app/features/alerting/unified/mocks/server/configure.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "public/app/features/alerting/unified/mocks/server/handlers/plugins.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "public/app/features/alerting/unified/rule-editor/clone.utils.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
  "public/app/features/alerting/unified/rule-editor/formDefaults.ts": {
    "no-restricted-syntax": {
      "count": 6
    }
  },
-  "public/app/features/alerting/unified/rule-list/hooks/grafanaFilter.test.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/alerting/unified/types/alerting.ts": {
    "@typescript-eslint/no-explicit-any": {
      "count": 5
@@ -1662,16 +1632,6 @@
      "count": 1
    }
  },
-  "public/app/features/alerting/unified/utils/config.test.ts": {
-    "no-restricted-syntax": {
-      "count": 6
-    }
-  },
-  "public/app/features/alerting/unified/utils/config.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/alerting/unified/utils/datasource.ts": {
    "no-restricted-syntax": {
      "count": 2
@@ -1703,20 +1663,12 @@
      "count": 1
    }
  },
-  "public/app/features/alerting/unified/utils/rules.test.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/alerting/unified/utils/rules.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 3
    },
    "@typescript-eslint/no-explicit-any": {
      "count": 1
-    },
-    "no-restricted-syntax": {
-      "count": 1
    }
  },
  "public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx": {
@@ -1772,16 +1724,6 @@
      "count": 1
    }
  },
-  "public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "public/app/features/connections/components/AdvisorRedirectNotice/AdvisorRedirectNotice.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/connections/tabs/ConnectData/ConnectData.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -2121,11 +2063,6 @@
      "count": 1
    }
  },
-  "public/app/features/dashboard/components/GenAI/utils.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx": {
    "no-restricted-syntax": {
      "count": 3
@@ -2952,71 +2889,6 @@
      "count": 1
    }
  },
-  "public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts": {
-    "no-restricted-syntax": {
-      "count": 6
-    }
-  },
-  "public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts": {
-    "no-restricted-syntax": {
-      "count": 6
-    }
-  },
-  "public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts": {
-    "no-restricted-syntax": {
-      "count": 6
-    }
-  },
-  "public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts": {
-    "no-restricted-syntax": {
-      "count": 6
-    }
-  },
-  "public/app/features/plugins/extensions/usePluginComponent.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 3
-    }
-  },
-  "public/app/features/plugins/extensions/usePluginComponents.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "public/app/features/plugins/extensions/usePluginFunctions.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "public/app/features/plugins/extensions/usePluginLinks.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "public/app/features/plugins/extensions/utils.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 27
-    }
-  },
-  "public/app/features/plugins/extensions/utils.tsx": {
-    "no-restricted-syntax": {
-      "count": 7
-    }
-  },
-  "public/app/features/plugins/extensions/validators.test.tsx": {
-    "no-restricted-syntax": {
-      "count": 30
-    }
-  },
-  "public/app/features/plugins/extensions/validators.ts": {
-    "no-restricted-syntax": {
-      "count": 4
-    }
-  },
-  "public/app/features/plugins/sandbox/codeLoader.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
  "public/app/features/plugins/sandbox/distortions.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -3743,21 +3615,46 @@
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/aggregations.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.ts": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 2
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/aggregations.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx": {
    "no-restricted-syntax": {
      "count": 1
@@ -117,8 +117,6 @@ module.exports = [
      'scripts/grafana-server/tmp',
      'packages/grafana-ui/src/graveyard', // deprecated UI components slated for removal
      'public/build-swagger', // swagger build output
-      'apps/plugins/plugin/src/generated/meta/v0alpha1',
-      'apps/plugins/plugin/src/generated/plugin/v0alpha1',
    ],
  },
  ...grafanaConfig,
@@ -577,42 +575,6 @@ module.exports = [
            "Property[key.name='a11y'][value.type='ObjectExpression'] Property[key.name='test'][value.value='off']",
          message: 'Skipping a11y tests is not allowed. Please fix the component or story instead.',
        },
-        {
-          selector: 'MemberExpression[object.name="config"][property.name="apps"]',
-          message:
-            'Usage of config.apps is not allowed. Use the function getAppPluginMetas or useAppPluginMetas from @grafana/runtime instead',
-        },
-      ],
-    },
-  },
-  {
-    files: [...commonTestIgnores],
-    ignores: [
-      // FIXME: Remove once all enterprise issues are fixed -
-      // we don't have a suppressions file/approach for enterprise code yet
-      ...enterpriseIgnores,
-    ],
-    rules: {
-      'no-restricted-syntax': [
-        'error',
-        {
-          selector: 'MemberExpression[object.name="config"][property.name="apps"]',
-          message:
-            'Usage of config.apps is not allowed. Use the function getAppPluginMetas or useAppPluginMetas from @grafana/runtime instead',
-        },
-      ],
-    },
-  },
-  {
-    files: [...enterpriseIgnores],
-    rules: {
-      'no-restricted-syntax': [
-        'error',
-        {
-          selector: 'MemberExpression[object.name="config"][property.name="apps"]',
-          message:
-            'Usage of config.apps is not allowed. Use the function getAppPluginMetas or useAppPluginMetas from @grafana/runtime instead',
-        },
      ],
    },
  },
@@ -44,8 +44,8 @@ require (
 	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
-	github.com/blevesearch/bleve/v2 v2.5.7 // @grafana/grafana-search-and-storage
-	github.com/blevesearch/bleve_index_api v1.3.0 // @grafana/grafana-search-and-storage
+	github.com/blevesearch/bleve/v2 v2.5.0 // @grafana/grafana-search-and-storage
+	github.com/blevesearch/bleve_index_api v1.2.7 // @grafana/grafana-search-and-storage
 	github.com/blugelabs/bluge v0.2.2 // @grafana/grafana-backend-group
 	github.com/blugelabs/bluge_segment_api v0.2.0 // @grafana/grafana-backend-group
 	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // @grafana/grafana-backend-group
@@ -365,22 +365,22 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.22.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/blevesearch/geo v0.2.4 // indirect
-	github.com/blevesearch/go-faiss v1.0.26 // indirect
+	github.com/blevesearch/geo v0.1.20 // indirect
+	github.com/blevesearch/go-faiss v1.0.25 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
 	github.com/blevesearch/gtreap v0.1.1 // indirect
 	github.com/blevesearch/mmap-go v1.0.4 // indirect
-	github.com/blevesearch/scorch_segment_api/v2 v2.3.13 // indirect
+	github.com/blevesearch/scorch_segment_api/v2 v2.3.9 // indirect
 	github.com/blevesearch/segment v0.9.1 // indirect
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
 	github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
 	github.com/blevesearch/vellum v1.1.0 // indirect
-	github.com/blevesearch/zapx/v11 v11.4.2 // indirect
-	github.com/blevesearch/zapx/v12 v12.4.2 // indirect
-	github.com/blevesearch/zapx/v13 v13.4.2 // indirect
-	github.com/blevesearch/zapx/v14 v14.4.2 // indirect
-	github.com/blevesearch/zapx/v15 v15.4.2 // indirect
-	github.com/blevesearch/zapx/v16 v16.2.8 // indirect
+	github.com/blevesearch/zapx/v11 v11.4.1 // indirect
+	github.com/blevesearch/zapx/v12 v12.4.1 // indirect
+	github.com/blevesearch/zapx/v13 v13.4.1 // indirect
+	github.com/blevesearch/zapx/v14 v14.4.1 // indirect
+	github.com/blevesearch/zapx/v15 v15.4.1 // indirect
+	github.com/blevesearch/zapx/v16 v16.2.2 // indirect
 	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/blugelabs/ice v1.0.0 // indirect
 	github.com/blugelabs/ice/v2 v2.0.1 // indirect
@@ -443,6 +443,7 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
 	github.com/gomodule/redigo v1.8.9 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.1 // indirect
@@ -931,14 +931,14 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/blevesearch/bleve/v2 v2.5.7 h1:2d9YrL5zrX5EBBW++GOaEKjE+NPWeZGaX77IM26m1Z8=
-github.com/blevesearch/bleve/v2 v2.5.7/go.mod h1:yj0NlS7ocGC4VOSAedqDDMktdh2935v2CSWOCDMHdSA=
-github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E=
-github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
-github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
-github.com/blevesearch/geo v0.2.4/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
-github.com/blevesearch/go-faiss v1.0.26 h1:4dRLolFgjPyjkaXwff4NfbZFdE/dfywbzDqporeQvXI=
-github.com/blevesearch/go-faiss v1.0.26/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
+github.com/blevesearch/bleve/v2 v2.5.0 h1:HzYqBy/5/M9Ul9ESEmXzN/3Jl7YpmWBdHM/+zzv/3k4=
+github.com/blevesearch/bleve/v2 v2.5.0/go.mod h1:PcJzTPnEynO15dCf9isxOga7YFRa/cMSsbnRwnszXUk=
+github.com/blevesearch/bleve_index_api v1.2.7 h1:c8r9vmbaYQroAMSGag7zq5gEVPiuXrUQDqfnj7uYZSY=
+github.com/blevesearch/bleve_index_api v1.2.7/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/geo v0.1.20 h1:paaSpu2Ewh/tn5DKn/FB5SzvH0EWupxHEIwbCk/QPqM=
+github.com/blevesearch/geo v0.1.20/go.mod h1:DVG2QjwHNMFmjo+ZgzrIq2sfCh6rIHzy9d9d0B59I6w=
+github.com/blevesearch/go-faiss v1.0.25 h1:lel1rkOUGbT1CJ0YgzKwC7k+XH0XVBHnCVWahdCXk4U=
+github.com/blevesearch/go-faiss v1.0.25/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y=
@@ -947,8 +947,8 @@ github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+
 github.com/blevesearch/mmap-go v1.0.3/go.mod h1:pYvKl/grLQrBxuaRYgoTssa4rVujYYeenDp++2E+yvs=
 github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
 github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13 h1:ZPjv/4VwWvHJZKeMSgScCapOy8+DdmsmRyLmSB88UoY=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13/go.mod h1:ENk2LClTehOuMS8XzN3UxBEErYmtwkE7MAArFTXs9Vc=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.9 h1:X6nJXnNHl7nasXW+U6y2Ns2Aw8F9STszkYkyBfQ+p0o=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.9/go.mod h1:IrzspZlVjhf4X29oJiEhBxEteTqOY9RlYlk1lCmYHr4=
 github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ=
 github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
 github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
@@ -960,18 +960,18 @@ github.com/blevesearch/vellum v1.0.5/go.mod h1:atE0EH3fvk43zzS7t1YNdNC7DbmcC3uz+
 github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
 github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
 github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
-github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
-github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
-github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
-github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
-github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
-github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
-github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
-github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
-github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
-github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
-github.com/blevesearch/zapx/v16 v16.2.8 h1:SlnzF0YGtSlrsOE3oE7EgEX6BIepGpeqxs1IjMbHLQI=
-github.com/blevesearch/zapx/v16 v16.2.8/go.mod h1:murSoCJPCk25MqURrcJaBQ1RekuqSCSfMjXH4rHyA14=
+github.com/blevesearch/zapx/v11 v11.4.1 h1:qFCPlFbsEdwbbckJkysptSQOsHn4s6ZOHL5GMAIAVHA=
+github.com/blevesearch/zapx/v11 v11.4.1/go.mod h1:qNOGxIqdPC1MXauJCD9HBG487PxviTUUbmChFOAosGs=
+github.com/blevesearch/zapx/v12 v12.4.1 h1:K77bhypII60a4v8mwvav7r4IxWA8qxhNjgF9xGdb9eQ=
+github.com/blevesearch/zapx/v12 v12.4.1/go.mod h1:QRPrlPOzAxBNMI0MkgdD+xsTqx65zbuPr3Ko4Re49II=
+github.com/blevesearch/zapx/v13 v13.4.1 h1:EnkEMZFUK0lsW/jOJJF2xOcp+W8TjEsyeN5BeAZEYYE=
+github.com/blevesearch/zapx/v13 v13.4.1/go.mod h1:e6duBMlCvgbH9rkzNMnUa9hRI9F7ri2BRcHfphcmGn8=
+github.com/blevesearch/zapx/v14 v14.4.1 h1:G47kGCshknBZzZAtjcnIAMn3oNx8XBLxp8DMq18ogyE=
+github.com/blevesearch/zapx/v14 v14.4.1/go.mod h1:O7sDxiaL2r2PnCXbhh1Bvm7b4sP+jp4unE9DDPWGoms=
+github.com/blevesearch/zapx/v15 v15.4.1 h1:B5IoTMUCEzFdc9FSQbhVOxAY+BO17c05866fNruiI7g=
+github.com/blevesearch/zapx/v15 v15.4.1/go.mod h1:b/MreHjYeQoLjyY2+UaM0hGZZUajEbE0xhnr1A2/Q6Y=
+github.com/blevesearch/zapx/v16 v16.2.2 h1:MifKJVRTEhMTgSlle2bDRTb39BGc9jXFRLPZc6r0Rzk=
+github.com/blevesearch/zapx/v16 v16.2.2/go.mod h1:B9Pk4G1CqtErgQV9DyCSA9Lb7WZe4olYfGw7fVDZ4sk=
 github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
 github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
 github.com/blugelabs/bluge v0.2.2 h1:gat8CqE6P6tOgeX30XGLOVNTC26cpM2RWVcreXWtYcM=
@@ -1442,6 +1442,8 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2V
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
+github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
@@ -520,40 +520,14 @@ github.com/benbjohnson/immutable v0.4.0 h1:CTqXbEerYso8YzVPxmWxh2gnoRQbbB9X1quUC
 github.com/benbjohnson/immutable v0.4.0/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
-github.com/blevesearch/bleve/v2 v2.5.7 h1:2d9YrL5zrX5EBBW++GOaEKjE+NPWeZGaX77IM26m1Z8=
-github.com/blevesearch/bleve/v2 v2.5.7/go.mod h1:yj0NlS7ocGC4VOSAedqDDMktdh2935v2CSWOCDMHdSA=
-github.com/blevesearch/bleve_index_api v1.2.8/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
-github.com/blevesearch/bleve_index_api v1.2.11 h1:bXQ54kVuwP8hdrXUSOnvTQfgK0KI1+f9A0ITJT8tX1s=
-github.com/blevesearch/bleve_index_api v1.2.11/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
-github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E=
-github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
-github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
-github.com/blevesearch/geo v0.2.4/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
-github.com/blevesearch/go-faiss v1.0.26/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:kDy+zgJFJJoJYBvdfBSiZYBbdsUL0XcjHYWezpQBGPA=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:9eJDeqxJ3E7WnLebQUlPD7ZjSce7AnDb9vjGmMCbD0A=
 github.com/blevesearch/goleveldb v1.0.1 h1:iAtV2Cu5s0GD1lwUiekkFHe2gTMCCNVj2foPclDLIFI=
 github.com/blevesearch/goleveldb v1.0.1/go.mod h1:WrU8ltZbIp0wAoig/MHbrPCXSOLpe79nz5lv5nqfYrQ=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.10/go.mod h1:Z3e6ChN3qyN35yaQpl00MfI5s8AxUJbpTR/DL8QOQ+8=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13 h1:ZPjv/4VwWvHJZKeMSgScCapOy8+DdmsmRyLmSB88UoY=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13/go.mod h1:ENk2LClTehOuMS8XzN3UxBEErYmtwkE7MAArFTXs9Vc=
 github.com/blevesearch/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A=
 github.com/blevesearch/snowball v0.6.1/go.mod h1:ZF0IBg5vgpeoUhnMza2v0A/z8m1cWPlwhke08LpNusg=
 github.com/blevesearch/stempel v0.2.0 h1:CYzVPaScODMvgE9o+kf6D4RJ/VRomyi9uHF+PtB+Afc=
 github.com/blevesearch/stempel v0.2.0/go.mod h1:wjeTHqQv+nQdbPuJ/YcvOjTInA2EIc6Ks1FoSUzSLvc=
-github.com/blevesearch/vellum v1.0.10/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k=
-github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
-github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
-github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
-github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
-github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
-github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
-github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
-github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
-github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
-github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
-github.com/blevesearch/zapx/v16 v16.2.8 h1:SlnzF0YGtSlrsOE3oE7EgEX6BIepGpeqxs1IjMbHLQI=
-github.com/blevesearch/zapx/v16 v16.2.8/go.mod h1:murSoCJPCk25MqURrcJaBQ1RekuqSCSfMjXH4rHyA14=
 github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
 github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
@@ -1024,6 +998,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250331083058-4563aec7a975
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250331083058-4563aec7a975/go.mod h1:FGdGvhI40Dq+CTQaSzK9evuve774cgOUdGfVO04OXkw=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36 h1:AjZ58JRw1ZieFH/SdsddF5BXtsDKt5kSrKNPWrzYz3Y=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20260112162805-d29cc9cf7f0f h1:9tRhudagkQO2s61SLFLSziIdCm7XlkfypVKDxpcHokg=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20260112162805-d29cc9cf7f0f/go.mod h1:AsVdCBeDFN9QbgpJg+8voDAcgsW0RmNvBd70ecMMdC0=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
 github.com/grafana/sqlds/v4 v4.2.4/go.mod h1:BQRjUG8rOqrBI4NAaeoWrIMuoNgfi8bdhCJ+5cgEfLU=
@@ -1116,7 +1092,6 @@ github.com/jon-whit/go-grpc-prometheus v1.4.0/go.mod h1:iTPm+Iuhh3IIqR0iGZ91JJEg
 github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a h1:sfe532Ipn7GX0V6mHdynBk393rDmqgI0QmjLK7ct7TU=
 github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a/go.mod h1:dNKs71rs2VJGBAmttu7fouEsRQlRjxy0p1Sx+T5wbpY=
 github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
-github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
 github.com/jsternberg/zap-logfmt v1.3.0 h1:z1n1AOHVVydOOVuyphbOKyR4NICDQFiJMn1IK5hVQ5Y=
 github.com/jsternberg/zap-logfmt v1.3.0/go.mod h1:N3DENp9WNmCZxvkBD/eReWwz1149BK6jEN9cQ4fNwZE=
@@ -82,7 +82,6 @@ module.exports = {
    // Decoupled plugins run their own tests so ignoring them here.
    '<rootDir>/public/app/plugins/datasource/azuremonitor',
    '<rootDir>/public/app/plugins/datasource/cloud-monitoring',
-    '<rootDir>/public/app/plugins/datasource/elasticsearch',
    '<rootDir>/public/app/plugins/datasource/grafana-postgresql-datasource',
    '<rootDir>/public/app/plugins/datasource/grafana-pyroscope-datasource',
    '<rootDir>/public/app/plugins/datasource/grafana-testdata-datasource',
@@ -237,8 +237,6 @@ lineage: schemas: [{
 			text: string | [...string]
 			// Value of the option
 			value: string | [...string]
-			// Additional properties for multi-props variables
-			properties?: {[string]: string}
 		} @cuetsy(kind="interface")

 		// Options to config when to refresh a variable
@@ -293,8 +293,8 @@
    "@grafana/plugin-ui": "^0.11.1",
    "@grafana/prometheus": "workspace:*",
    "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "6.52.2",
-    "@grafana/scenes-react": "6.52.2",
+    "@grafana/scenes": "v6.52.1",
+    "@grafana/scenes-react": "v6.52.1",
    "@grafana/schema": "workspace:*",
    "@grafana/sql": "workspace:*",
    "@grafana/ui": "workspace:*",
@@ -35,14 +35,6 @@
    },
    "./test": {
      "@grafana-app/source": "./test/index.ts"
-    },
-    "./themes/schema.generated.json": {
-      "@grafana-app/source": "./src/themes/schema.generated.json",
-      "default": "./dist/esm/themes/schema.generated.json"
-    },
-    "./themes/definitions/*.json": {
-      "@grafana-app/source": "./src/themes/themeDefinitions/*.json",
-      "default": "./dist/esm/themes/themeDefinitions/*.json"
    }
  },
  "publishConfig": {
@@ -60,7 +52,7 @@
    "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 ./scripts/generateSchema.ts"
+    "themes-schema": "tsx ./src/themes/scripts/generateSchema.ts"
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
@@ -110,7 +102,6 @@
    "react-dom": "18.3.1",
    "rimraf": "6.0.1",
    "rollup": "^4.22.4",
-    "rollup-plugin-copy": "3.5.0",
    "rollup-plugin-esbuild": "6.2.1",
    "rollup-plugin-node-externals": "^8.0.0",
    "tsx": "^4.21.0",
@@ -1,40 +1,21 @@
 import json from '@rollup/plugin-json';
 import { createRequire } from 'node:module';
-import copy from 'rollup-plugin-copy';

 import { entryPoint, plugins, esmOutput, cjsOutput } from '../rollup.config.parts';

 const rq = createRequire(import.meta.url);
 const pkg = rq('./package.json');

-const grafanaDataPlugins = [
-  ...plugins,
-  copy({
-    targets: [
-      {
-        src: 'src/themes/schema.generated.json',
-        dest: 'dist/esm/',
-      },
-      {
-        src: 'src/themes/themeDefinitions/*.json',
-        dest: 'dist/esm/',
-      },
-    ],
-    flatten: false,
-  }),
-  json(),
-];
-
 export default [
  {
    input: entryPoint,
-    plugins: grafanaDataPlugins,
+    plugins: [...plugins, json()],
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
  {
    input: 'src/unstable.ts',
-    plugins: grafanaDataPlugins,
+    plugins: [...plugins, json()],
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
@@ -1,22 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import { NewThemeOptionsSchema } from '../src/themes/createTheme';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const jsonOut = path.join(__dirname, '..', 'src', 'themes', 'schema.generated.json');
-
-fs.writeFileSync(
-  jsonOut,
-  JSON.stringify(
-    NewThemeOptionsSchema.toJSONSchema({
-      target: 'draft-07',
-    }),
-    undefined,
-    2
-  )
-);
-
-console.log('Successfully generated theme schema');
@@ -844,6 +844,7 @@ export {
  DataLinkConfigOrigin,
  SupportedTransformationType,
  type InternalDataLink,
+  type LinkTarget,
  type LinkModel,
  type LinkModelSupplier,
  VariableOrigin,
@@ -851,7 +852,6 @@ export {
  VariableSuggestionsScope,
  OneClickMode,
 } from './types/dataLink';
-export { type LinkTarget } from './types/linkTarget';
 export {
  type Action,
  type ActionModel,
@@ -93,6 +93,7 @@ export { DataTransformerID } from '../transformations/transformers/ids';

 export { mergeTransformer } from '../transformations/transformers/merge';
 export { getThemeById } from '../themes/registry';
+export * as experimentalThemeDefinitions from '../themes/themeDefinitions';
 export { GrafanaEdition } from '../types/config';
 export { SIPrefix } from '../valueFormats/symbolFormatters';

@@ -1,18 +1,7 @@
 import { Registry, RegistryItem } from '../utils/Registry';

 import { createTheme, NewThemeOptionsSchema } from './createTheme';
-import aubergine from './themeDefinitions/aubergine.json';
-import debug from './themeDefinitions/debug.json';
-import desertbloom from './themeDefinitions/desertbloom.json';
-import gildedgrove from './themeDefinitions/gildedgrove.json';
-import gloom from './themeDefinitions/gloom.json';
-import mars from './themeDefinitions/mars.json';
-import matrix from './themeDefinitions/matrix.json';
-import sapphiredusk from './themeDefinitions/sapphiredusk.json';
-import synthwave from './themeDefinitions/synthwave.json';
-import tron from './themeDefinitions/tron.json';
-import victorian from './themeDefinitions/victorian.json';
-import zen from './themeDefinitions/zen.json';
+import * as extraThemes from './themeDefinitions';
 import { GrafanaTheme2 } from './types';

 export interface ThemeRegistryItem extends RegistryItem {
@@ -20,21 +9,6 @@ export interface ThemeRegistryItem extends RegistryItem {
  build: () => GrafanaTheme2;
 }

-const extraThemes: { [key: string]: unknown } = {
-  aubergine,
-  debug,
-  desertbloom,
-  gildedgrove,
-  gloom,
-  mars,
-  matrix,
-  sapphiredusk,
-  synthwave,
-  tron,
-  victorian,
-  zen,
-};
-
 /**
 * @internal
 * Only for internal use, never use this from a plugin
@@ -0,0 +1,19 @@
+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
+  )
+);
@@ -0,0 +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';
@@ -32,7 +32,6 @@ export type AppPluginConfig = {
  path: string;
  version: string;
  preload: boolean;
-  /** @deprecated it will be removed in a future release */
  angular: AngularMeta;
  loadingStrategy: PluginLoadingStrategy;
  dependencies: PluginDependencies;
@@ -220,7 +219,6 @@ export interface GrafanaConfig {
  snapshotEnabled: boolean;
  datasources: { [str: string]: DataSourceInstanceSettings };
  panels: { [key: string]: PanelPluginMeta };
-  /** @deprecated it will be removed in a future release */
  apps: Record<string, AppPluginConfig>;
  auth: AuthSettings;
  minRefreshInterval: string;
@@ -1,6 +1,5 @@
 import { ScopedVars } from './ScopedVars';
 import { ExploreCorrelationHelperData, ExplorePanelsState } from './explore';
-import { LinkTarget } from './linkTarget';
 import { InterpolateFunction } from './panel';
 import { DataQuery } from './query';
 import { TimeRange } from './time';
@@ -89,6 +88,8 @@ export interface InternalDataLink<T extends DataQuery = any> {
  range?: TimeRange;
 }

+export type LinkTarget = '_blank' | '_self' | undefined;
+
 /**
 * Processed Link Model. The values are ready to use
 */
@@ -356,7 +356,7 @@ export interface FeatureToggles {
  */
  dashboardScene?: boolean;
  /**
-  * Enables new dashboard layouts
+  * Enables experimental new dashboard layouts
  */
  dashboardNewLayouts?: boolean;
  /**
@@ -531,10 +531,6 @@ export interface FeatureToggles {
  */
  alertingListViewV2?: boolean;
  /**
-  * Enables the new Alerting navigation structure with improved menu grouping
-  */
-  alertingNavigationV2?: boolean;
-  /**
  * Enables saved searches for alert rules list
  */
  alertingSavedSearches?: boolean;
@@ -988,11 +984,6 @@ export interface FeatureToggles {
  */
  recentlyViewedDashboards?: boolean;
  /**
-  * A/A test for recently viewed dashboards feature
-  * @default false
-  */
-  experimentRecentlyViewedDashboards?: boolean;
-  /**
  * Enable configuration of alert enrichments in Grafana Cloud.
  * @default false
  */
@@ -1255,8 +1246,4 @@ export interface FeatureToggles {
  * Enables profiles exemplars support in profiles drilldown
  */
  profilesExemplars?: boolean;
-  /**
-  * Use synchronized dispatch timer to minimize duplicate notifications across alertmanager HA pods
-  */
-  alertingSyncDispatchTimer?: boolean;
 }
@@ -1,4 +0,0 @@
-/**
- * Target for links - controls whether link opens in new tab or same tab
- */
-export type LinkTarget = '_blank' | '_self' | undefined;
@@ -1,7 +1,7 @@
 import { ComponentType } from 'react';

+import { LinkTarget } from './dataLink';
 import { IconName } from './icon';
-import { LinkTarget } from './linkTarget';

 export interface NavLinkDTO {
  id?: string;
@@ -11,7 +11,6 @@ import { DataFrame } from './dataFrame';
 import { DataQueryError, DataQueryRequest, DataQueryTimings } from './datasource';
 import { FieldConfigSource } from './fieldOverrides';
 import { IconName } from './icon';
-import { LinkTarget } from './linkTarget';
 import { OptionEditorConfig } from './options';
 import { PluginMeta } from './plugin';
 import { AbsoluteTimeRange, TimeRange, TimeZone } from './time';
@@ -192,7 +191,6 @@ export interface PanelMenuItem {
  onClick?: (event: React.MouseEvent) => void;
  shortcut?: string;
  href?: string;
-  target?: LinkTarget;
  subMenu?: PanelMenuItem[];
 }

@@ -53,7 +53,6 @@ export interface PluginError {
  pluginType?: PluginType;
 }

-/** @deprecated it will be removed in a future release */
 export interface AngularMeta {
  detected: boolean;
  hideDeprecation: boolean;
@@ -91,8 +91,6 @@ export interface VariableOption {
  text: string | string[];
  value: string | string[];
  isNone?: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  properties?: Record<string, any>;
 }

 export interface IntervalVariableModel extends VariableWithOptions {
@@ -120,7 +118,6 @@ export interface QueryVariableModel extends VariableWithMultiSupport {
  definition: string;
  sort: VariableSort;
  queryValue?: string;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  query: any;
  regex: string;
  regexApplyTo?: VariableRegexApplyTo;
@@ -196,7 +193,6 @@ export interface BaseVariableModel {
  skipUrlSync: boolean;
  index: number;
  state: LoadingState;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  error: any | null;
  description: string | null;
  usedInRepeat?: boolean;
@@ -9,4 +9,4 @@
 * and be subject to the standard policies
 */

-export {};
+export { default as themeJsonSchema } from './themes/schema.generated.json';
@@ -8,8 +8,7 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "rootDirs": ["."],
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true
+    "moduleResolution": "bundler"
  },
  "exclude": ["dist/**/*"],
  "include": [
@@ -86,7 +86,6 @@ export class GrafanaBootConfig {
  snapshotEnabled = true;
  datasources: { [str: string]: DataSourceInstanceSettings } = {};
  panels: { [key: string]: PanelPluginMeta } = {};
-  /** @deprecated it will be removed in a future release, use isAppPluginInstalled or getAppPluginVersion instead */
  apps: Record<string, AppPluginConfigGrafanaData> = {};
  auth: AuthSettings = {};
  minRefreshInterval = '';
@@ -77,5 +77,3 @@ export {
  getCorrelationsService,
  setCorrelationsService,
 } from './services/CorrelationsService';
-export { getAppPluginVersion, isAppPluginInstalled } from './services/pluginMeta/apps';
-export { useAppPluginInstalled, useAppPluginVersion } from './services/pluginMeta/hooks';
@@ -29,5 +29,3 @@ export {
 export { UserStorage } from '../utils/userStorage';

 export { initOpenFeature, evaluateBooleanFlag } from './openFeature';
-export { getAppPluginMeta, getAppPluginMetas, setAppPluginMetas } from '../services/pluginMeta/apps';
-export { useAppPluginMeta, useAppPluginMetas } from '../services/pluginMeta/hooks';
@@ -1,258 +0,0 @@
-import { evaluateBooleanFlag } from '../../internal/openFeature';
-
-import {
-  getAppPluginMeta,
-  getAppPluginMetas,
-  getAppPluginVersion,
-  isAppPluginInstalled,
-  setAppPluginMetas,
-} from './apps';
-import { initPluginMetas } from './plugins';
-import { app } from './test-fixtures/config.apps';
-
-jest.mock('./plugins', () => ({ ...jest.requireActual('./plugins'), initPluginMetas: jest.fn() }));
-jest.mock('../../internal/openFeature', () => ({
-  ...jest.requireActual('../../internal/openFeature'),
-  evaluateBooleanFlag: jest.fn(),
-}));
-
-const initPluginMetasMock = jest.mocked(initPluginMetas);
-const evaluateBooleanFlagMock = jest.mocked(evaluateBooleanFlag);
-
-describe('when useMTPlugins flag is enabled and apps is not initialized', () => {
-  beforeEach(() => {
-    setAppPluginMetas({});
-    jest.resetAllMocks();
-    initPluginMetasMock.mockResolvedValue({ items: [] });
-    evaluateBooleanFlagMock.mockReturnValue(true);
-  });
-
-  it('getAppPluginMetas should call initPluginMetas and return correct result', async () => {
-    const apps = await getAppPluginMetas();
-
-    expect(apps).toEqual([]);
-    expect(initPluginMetasMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('getAppPluginMeta should call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginMeta('myorg-someplugin-app');
-
-    expect(result).toEqual(null);
-    expect(initPluginMetasMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('isAppPluginInstalled should call initPluginMetas and return false', async () => {
-    const installed = await isAppPluginInstalled('myorg-someplugin-app');
-
-    expect(installed).toEqual(false);
-    expect(initPluginMetasMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('getAppPluginVersion should call initPluginMetas and return null', async () => {
-    const result = await getAppPluginVersion('myorg-someplugin-app');
-
-    expect(result).toEqual(null);
-    expect(initPluginMetasMock).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('when useMTPlugins flag is enabled and apps is initialized', () => {
-  beforeEach(() => {
-    setAppPluginMetas({ 'myorg-someplugin-app': app });
-    jest.resetAllMocks();
-    evaluateBooleanFlagMock.mockReturnValue(true);
-  });
-
-  it('getAppPluginMetas should not call initPluginMetas and return correct result', async () => {
-    const apps = await getAppPluginMetas();
-
-    expect(apps).toEqual([app]);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginMeta should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginMeta('myorg-someplugin-app');
-
-    expect(result).toEqual(app);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginMeta should return null if the pluginId is not found', async () => {
-    const result = await getAppPluginMeta('otherorg-otherplugin-app');
-
-    expect(result).toEqual(null);
-  });
-
-  it('isAppPluginInstalled should not call initPluginMetas and return true', async () => {
-    const installed = await isAppPluginInstalled('myorg-someplugin-app');
-
-    expect(installed).toEqual(true);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('isAppPluginInstalled should return false if the pluginId is not found', async () => {
-    const result = await isAppPluginInstalled('otherorg-otherplugin-app');
-
-    expect(result).toEqual(false);
-  });
-
-  it('getAppPluginVersion should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginVersion('myorg-someplugin-app');
-
-    expect(result).toEqual('1.0.0');
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginVersion should return null if the pluginId is not found', async () => {
-    const result = await getAppPluginVersion('otherorg-otherplugin-app');
-
-    expect(result).toEqual(null);
-  });
-});
-
-describe('when useMTPlugins flag is disabled and apps is not initialized', () => {
-  beforeEach(() => {
-    setAppPluginMetas({});
-    jest.resetAllMocks();
-    evaluateBooleanFlagMock.mockReturnValue(false);
-  });
-
-  it('getAppPluginMetas should not call initPluginMetas and return correct result', async () => {
-    const apps = await getAppPluginMetas();
-
-    expect(apps).toEqual([]);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginMeta should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginMeta('myorg-someplugin-app');
-
-    expect(result).toEqual(null);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('isAppPluginInstalled should not call initPluginMetas and return false', async () => {
-    const result = await isAppPluginInstalled('myorg-someplugin-app');
-
-    expect(result).toEqual(false);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginVersion should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginVersion('myorg-someplugin-app');
-
-    expect(result).toEqual(null);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-});
-
-describe('when useMTPlugins flag is disabled and apps is initialized', () => {
-  beforeEach(() => {
-    setAppPluginMetas({ 'myorg-someplugin-app': app });
-    jest.resetAllMocks();
-    evaluateBooleanFlagMock.mockReturnValue(false);
-  });
-
-  it('getAppPluginMetas should not call initPluginMetas and return correct result', async () => {
-    const apps = await getAppPluginMetas();
-
-    expect(apps).toEqual([app]);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginMeta should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginMeta('myorg-someplugin-app');
-
-    expect(result).toEqual(app);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginMeta should return null if the pluginId is not found', async () => {
-    const result = await getAppPluginMeta('otherorg-otherplugin-app');
-
-    expect(result).toEqual(null);
-  });
-
-  it('isAppPluginInstalled should not call initPluginMetas and return true', async () => {
-    const result = await isAppPluginInstalled('myorg-someplugin-app');
-
-    expect(result).toEqual(true);
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('isAppPluginInstalled should return false if the pluginId is not found', async () => {
-    const result = await isAppPluginInstalled('otherorg-otherplugin-app');
-
-    expect(result).toEqual(false);
-  });
-
-  it('getAppPluginVersion should not call initPluginMetas and return correct result', async () => {
-    const result = await getAppPluginVersion('myorg-someplugin-app');
-
-    expect(result).toEqual('1.0.0');
-    expect(initPluginMetasMock).not.toHaveBeenCalled();
-  });
-
-  it('getAppPluginVersion should return null if the pluginId is not found', async () => {
-    const result = await getAppPluginVersion('otherorg-otherplugin-app');
-
-    expect(result).toEqual(null);
-  });
-});
-
-describe('immutability', () => {
-  beforeEach(() => {
-    setAppPluginMetas({ 'myorg-someplugin-app': app });
-    jest.resetAllMocks();
-    evaluateBooleanFlagMock.mockReturnValue(false);
-  });
-
-  it('getAppPluginMetas should return a deep clone', async () => {
-    const mutatedApps = await getAppPluginMetas();
-
-    // assert we have correct props
-    expect(mutatedApps).toHaveLength(1);
-    expect(mutatedApps[0].dependencies.grafanaDependency).toEqual('>=10.4.0');
-    expect(mutatedApps[0].extensions.addedLinks).toHaveLength(0);
-
-    // mutate deep props
-    mutatedApps[0].dependencies.grafanaDependency = '';
-    mutatedApps[0].extensions.addedLinks.push({ targets: [], title: '', description: '' });
-
-    // assert we have mutated props
-    expect(mutatedApps[0].dependencies.grafanaDependency).toEqual('');
-    expect(mutatedApps[0].extensions.addedLinks).toHaveLength(1);
-    expect(mutatedApps[0].extensions.addedLinks[0]).toEqual({ targets: [], title: '', description: '' });
-
-    const apps = await getAppPluginMetas();
-
-    // assert that we have not mutated the source
-    expect(apps[0].dependencies.grafanaDependency).toEqual('>=10.4.0');
-    expect(apps[0].extensions.addedLinks).toHaveLength(0);
-  });
-
-  it('getAppPluginMeta should return a deep clone', async () => {
-    const mutatedApp = await getAppPluginMeta('myorg-someplugin-app');
-
-    // assert we have correct props
-    expect(mutatedApp).toBeDefined();
-    expect(mutatedApp!.dependencies.grafanaDependency).toEqual('>=10.4.0');
-    expect(mutatedApp!.extensions.addedLinks).toHaveLength(0);
-
-    // mutate deep props
-    mutatedApp!.dependencies.grafanaDependency = '';
-    mutatedApp!.extensions.addedLinks.push({ targets: [], title: '', description: '' });
-
-    // assert we have mutated props
-    expect(mutatedApp!.dependencies.grafanaDependency).toEqual('');
-    expect(mutatedApp!.extensions.addedLinks).toHaveLength(1);
-    expect(mutatedApp!.extensions.addedLinks[0]).toEqual({ targets: [], title: '', description: '' });
-
-    const result = await getAppPluginMeta('myorg-someplugin-app');
-
-    // assert that we have not mutated the source
-    expect(result).toBeDefined();
-    expect(result!.dependencies.grafanaDependency).toEqual('>=10.4.0');
-    expect(result!.extensions.addedLinks).toHaveLength(0);
-  });
-});
@@ -1,71 +0,0 @@
-import type { AppPluginConfig } from '@grafana/data';
-
-import { config } from '../../config';
-import { evaluateBooleanFlag } from '../../internal/openFeature';
-
-import { getAppPluginMapper } from './mappers/mappers';
-import { initPluginMetas } from './plugins';
-import type { AppPluginMetas } from './types';
-
-let apps: AppPluginMetas = {};
-
-function initialized(): boolean {
-  return Boolean(Object.keys(apps).length);
-}
-
-async function initAppPluginMetas(): Promise<void> {
-  if (!evaluateBooleanFlag('useMTPlugins', false)) {
-    // eslint-disable-next-line no-restricted-syntax
-    apps = config.apps;
-    return;
-  }
-
-  const metas = await initPluginMetas();
-  const mapper = getAppPluginMapper();
-  apps = mapper(metas);
-}
-
-export async function getAppPluginMetas(): Promise<AppPluginConfig[]> {
-  if (!initialized()) {
-    await initAppPluginMetas();
-  }
-
-  return Object.values(structuredClone(apps));
-}
-
-export async function getAppPluginMeta(pluginId: string): Promise<AppPluginConfig | null> {
-  if (!initialized()) {
-    await initAppPluginMetas();
-  }
-
-  const app = apps[pluginId];
-  return app ? structuredClone(app) : null;
-}
-
-/**
- * Check if an app plugin is installed. The function does not check if the app plugin is enabled.
- * @param pluginId - The id of the app plugin.
- * @returns True if the app plugin is installed, false otherwise.
- */
-export async function isAppPluginInstalled(pluginId: string): Promise<boolean> {
-  const app = await getAppPluginMeta(pluginId);
-  return Boolean(app);
-}
-
-/**
- * Get the version of an app plugin.
- * @param pluginId - The id of the app plugin.
- * @returns The version of the app plugin, or null if the plugin is not installed.
- */
-export async function getAppPluginVersion(pluginId: string): Promise<string | null> {
-  const app = await getAppPluginMeta(pluginId);
-  return app?.version ?? null;
-}
-
-export function setAppPluginMetas(override: AppPluginMetas): void {
-  if (process.env.NODE_ENV !== 'test') {
-    throw new Error('setAppPluginMetas() function can only be called from tests.');
-  }
-
-  apps = structuredClone(override);
-}
@@ -1,214 +0,0 @@
-import { renderHook, waitFor } from '@testing-library/react';
-
-import {
-  getAppPluginMeta,
-  getAppPluginMetas,
-  getAppPluginVersion,
-  isAppPluginInstalled,
-  setAppPluginMetas,
-} from './apps';
-import { useAppPluginMeta, useAppPluginMetas, useAppPluginInstalled, useAppPluginVersion } from './hooks';
-import { apps } from './test-fixtures/config.apps';
-
-const actualApps = jest.requireActual<typeof import('./apps')>('./apps');
-jest.mock('./apps', () => ({
-  ...jest.requireActual('./apps'),
-  getAppPluginMetas: jest.fn(),
-  getAppPluginMeta: jest.fn(),
-  isAppPluginInstalled: jest.fn(),
-  getAppPluginVersion: jest.fn(),
-}));
-const getAppPluginMetaMock = jest.mocked(getAppPluginMeta);
-const getAppPluginMetasMock = jest.mocked(getAppPluginMetas);
-const isAppPluginInstalledMock = jest.mocked(isAppPluginInstalled);
-const getAppPluginVersionMock = jest.mocked(getAppPluginVersion);
-
-describe('useAppPluginMeta', () => {
-  beforeEach(() => {
-    setAppPluginMetas(apps);
-    jest.resetAllMocks();
-    getAppPluginMetaMock.mockImplementation(actualApps.getAppPluginMeta);
-  });
-
-  it('should return correct default values', async () => {
-    const { result } = renderHook(() => useAppPluginMeta('grafana-exploretraces-app'));
-
-    expect(result.current.loading).toEqual(true);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toBeUndefined();
-
-    await waitFor(() => expect(result.current.loading).toEqual(true));
-  });
-
-  it('should return correct values after loading', async () => {
-    const { result } = renderHook(() => useAppPluginMeta('grafana-exploretraces-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(apps['grafana-exploretraces-app']);
-  });
-
-  it('should return correct values if the pluginId does not exist', async () => {
-    const { result } = renderHook(() => useAppPluginMeta('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(null);
-  });
-
-  it('should return correct values if useAppPluginMeta throws', async () => {
-    getAppPluginMetaMock.mockRejectedValue(new Error('Some error'));
-
-    const { result } = renderHook(() => useAppPluginMeta('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toEqual(new Error('Some error'));
-    expect(result.current.value).toBeUndefined();
-  });
-});
-
-describe('useAppPluginMetas', () => {
-  beforeEach(() => {
-    setAppPluginMetas(apps);
-    jest.resetAllMocks();
-    getAppPluginMetasMock.mockImplementation(actualApps.getAppPluginMetas);
-  });
-
-  it('should return correct default values', async () => {
-    const { result } = renderHook(() => useAppPluginMetas());
-
-    expect(result.current.loading).toEqual(true);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toBeUndefined();
-
-    await waitFor(() => expect(result.current.loading).toEqual(true));
-  });
-
-  it('should return correct values after loading', async () => {
-    const { result } = renderHook(() => useAppPluginMetas());
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(Object.values(apps));
-  });
-
-  it('should return correct values if useAppPluginMetas throws', async () => {
-    getAppPluginMetasMock.mockRejectedValue(new Error('Some error'));
-
-    const { result } = renderHook(() => useAppPluginMetas());
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toEqual(new Error('Some error'));
-    expect(result.current.value).toBeUndefined();
-  });
-});
-
-describe('useAppPluginInstalled', () => {
-  beforeEach(() => {
-    setAppPluginMetas(apps);
-    jest.resetAllMocks();
-    isAppPluginInstalledMock.mockImplementation(actualApps.isAppPluginInstalled);
-  });
-
-  it('should return correct default values', async () => {
-    const { result } = renderHook(() => useAppPluginInstalled('grafana-exploretraces-app'));
-
-    expect(result.current.loading).toEqual(true);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toBeUndefined();
-
-    await waitFor(() => expect(result.current.loading).toEqual(true));
-  });
-
-  it('should return correct values after loading', async () => {
-    const { result } = renderHook(() => useAppPluginInstalled('grafana-exploretraces-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(true);
-  });
-
-  it('should return correct values if the pluginId does not exist', async () => {
-    const { result } = renderHook(() => useAppPluginInstalled('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(false);
-  });
-
-  it('should return correct values if isAppPluginInstalled throws', async () => {
-    isAppPluginInstalledMock.mockRejectedValue(new Error('Some error'));
-
-    const { result } = renderHook(() => useAppPluginInstalled('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toEqual(new Error('Some error'));
-    expect(result.current.value).toBeUndefined();
-  });
-});
-
-describe('useAppPluginVersion', () => {
-  beforeEach(() => {
-    setAppPluginMetas(apps);
-    jest.resetAllMocks();
-    getAppPluginVersionMock.mockImplementation(actualApps.getAppPluginVersion);
-  });
-
-  it('should return correct default values', async () => {
-    const { result } = renderHook(() => useAppPluginVersion('grafana-exploretraces-app'));
-
-    expect(result.current.loading).toEqual(true);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toBeUndefined();
-
-    await waitFor(() => expect(result.current.loading).toEqual(true));
-  });
-
-  it('should return correct values after loading', async () => {
-    const { result } = renderHook(() => useAppPluginVersion('grafana-exploretraces-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual('1.2.2');
-  });
-
-  it('should return correct values if the pluginId does not exist', async () => {
-    const { result } = renderHook(() => useAppPluginVersion('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toBeUndefined();
-    expect(result.current.value).toEqual(null);
-  });
-
-  it('should return correct values if getAppPluginVersion throws', async () => {
-    getAppPluginVersionMock.mockRejectedValue(new Error('Some error'));
-
-    const { result } = renderHook(() => useAppPluginVersion('otherorg-otherplugin-app'));
-
-    await waitFor(() => expect(result.current.loading).toEqual(false));
-
-    expect(result.current.loading).toEqual(false);
-    expect(result.current.error).toEqual(new Error('Some error'));
-    expect(result.current.value).toBeUndefined();
-  });
-});
@@ -1,35 +0,0 @@
-import { useAsync } from 'react-use';
-
-import { getAppPluginMeta, getAppPluginMetas, getAppPluginVersion, isAppPluginInstalled } from './apps';
-
-export function useAppPluginMetas() {
-  const { loading, error, value } = useAsync(async () => getAppPluginMetas());
-  return { loading, error, value };
-}
-
-export function useAppPluginMeta(pluginId: string) {
-  const { loading, error, value } = useAsync(async () => getAppPluginMeta(pluginId));
-  return { loading, error, value };
-}
-
-/**
- * Hook that checks if an app plugin is installed. The hook does not check if the app plugin is enabled.
- * @param pluginId - The ID of the app plugin.
- * @returns loading, error, value of the app plugin installed status.
- * The value is true if the app plugin is installed, false otherwise.
- */
-export function useAppPluginInstalled(pluginId: string) {
-  const { loading, error, value } = useAsync(async () => isAppPluginInstalled(pluginId));
-  return { loading, error, value };
-}
-
-/**
- * Hook that gets the version of an app plugin.
- * @param pluginId - The ID of the app plugin.
- * @returns loading, error, value of the app plugin version.
- * The value is the version of the app plugin, or null if the plugin is not installed.
- */
-export function useAppPluginVersion(pluginId: string) {
-  const { loading, error, value } = useAsync(async () => getAppPluginVersion(pluginId));
-  return { loading, error, value };
-}
@@ -1,7 +0,0 @@
-import { AppPluginMetasMapper, PluginMetasResponse } from '../types';
-
-import { v0alpha1AppMapper } from './v0alpha1AppMapper';
-
-export function getAppPluginMapper(): AppPluginMetasMapper<PluginMetasResponse> {
-  return v0alpha1AppMapper;
-}
@@ -1,84 +0,0 @@
-import { apps } from '../test-fixtures/config.apps';
-import { v0alpha1Response } from '../test-fixtures/v0alpha1Response';
-
-import { v0alpha1AppMapper } from './v0alpha1AppMapper';
-
-const PLUGIN_IDS = v0alpha1Response.items
-  .filter((i) => i.spec.pluginJson.type === 'app')
-  .map((i) => ({ pluginId: i.spec.pluginJson.id }));
-
-describe('v0alpha1AppMapper', () => {
-  describe.each(PLUGIN_IDS)('when called for pluginId:$pluginId', ({ pluginId }) => {
-    it('should map id property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].id).toEqual(apps[pluginId].id);
-    });
-
-    it('should map path property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].path).toEqual(apps[pluginId].path);
-    });
-
-    it('should map version property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].version).toEqual(apps[pluginId].version);
-    });
-
-    it('should map preload property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].preload).toEqual(apps[pluginId].preload);
-    });
-
-    it('should map angular property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].angular).toEqual({});
-    });
-
-    it('should map loadingStrategy property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].loadingStrategy).toEqual(apps[pluginId].loadingStrategy);
-    });
-
-    it('should map dependencies property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].dependencies).toEqual(apps[pluginId].dependencies);
-    });
-
-    it('should map extensions property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].extensions.addedComponents).toEqual(apps[pluginId].extensions.addedComponents);
-      expect(result[pluginId].extensions.addedFunctions).toEqual(apps[pluginId].extensions.addedFunctions);
-      expect(result[pluginId].extensions.addedLinks).toEqual(apps[pluginId].extensions.addedLinks);
-      expect(result[pluginId].extensions.exposedComponents).toEqual(apps[pluginId].extensions.exposedComponents);
-      expect(result[pluginId].extensions.extensionPoints).toEqual(apps[pluginId].extensions.extensionPoints);
-    });
-
-    it('should map moduleHash property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].moduleHash).toEqual(apps[pluginId].moduleHash);
-    });
-
-    it('should map buildMode property correctly', () => {
-      const result = v0alpha1AppMapper(v0alpha1Response);
-
-      expect(result[pluginId].buildMode).toEqual(apps[pluginId].buildMode);
-    });
-  });
-
-  it('should only map specs with type app', () => {
-    const result = v0alpha1AppMapper(v0alpha1Response);
-
-    expect(v0alpha1Response.items).toHaveLength(58);
-    expect(Object.keys(result)).toHaveLength(5);
-    expect(Object.keys(result)).toEqual(Object.keys(apps));
-  });
-});
@@ -1,111 +0,0 @@
-import {
-  type AngularMeta,
-  type AppPluginConfig,
-  type PluginDependencies,
-  type PluginExtensions,
-  PluginLoadingStrategy,
-  type PluginType,
-} from '@grafana/data';
-
-import type { AppPluginMetas, AppPluginMetasMapper, PluginMetasResponse } from '../types';
-import type { Spec as v0alpha1Spec } from '../types/types.spec.gen';
-
-function angularyMapper(spec: v0alpha1Spec): AngularMeta {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return {} as AngularMeta;
-}
-
-function dependenciesMapper(spec: v0alpha1Spec): PluginDependencies {
-  const plugins = (spec.pluginJson.dependencies?.plugins ?? []).map((v) => ({
-    ...v,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    type: v.type as PluginType,
-    version: '',
-  }));
-
-  const dependencies: PluginDependencies = {
-    ...spec.pluginJson.dependencies,
-    extensions: {
-      exposedComponents: spec.pluginJson.dependencies.extensions?.exposedComponents ?? [],
-    },
-    grafanaDependency: spec.pluginJson.dependencies.grafanaDependency,
-    grafanaVersion: spec.pluginJson.dependencies.grafanaVersion ?? '',
-    plugins,
-  };
-
-  return dependencies;
-}
-
-function extensionsMapper(spec: v0alpha1Spec): PluginExtensions {
-  const addedComponents = spec.pluginJson.extensions?.addedComponents ?? [];
-  const addedFunctions = spec.pluginJson.extensions?.addedFunctions ?? [];
-  const addedLinks = spec.pluginJson.extensions?.addedLinks ?? [];
-  const exposedComponents = (spec.pluginJson.extensions?.exposedComponents ?? []).map((v) => ({
-    ...v,
-    description: v.description ?? '',
-    title: v.title ?? '',
-  }));
-  const extensionPoints = (spec.pluginJson.extensions?.extensionPoints ?? []).map((v) => ({
-    ...v,
-    description: v.description ?? '',
-    title: v.title ?? '',
-  }));
-
-  const extensions: PluginExtensions = {
-    addedComponents,
-    addedFunctions,
-    addedLinks,
-    exposedComponents,
-    extensionPoints,
-  };
-
-  return extensions;
-}
-
-function loadingStrategyMapper(spec: v0alpha1Spec): PluginLoadingStrategy {
-  const loadingStrategy = spec.module?.loadingStrategy ?? PluginLoadingStrategy.fetch;
-  if (loadingStrategy === PluginLoadingStrategy.script) {
-    return PluginLoadingStrategy.script;
-  }
-
-  return PluginLoadingStrategy.fetch;
-}
-
-function specMapper(spec: v0alpha1Spec): AppPluginConfig {
-  const { id, info, preload = false } = spec.pluginJson;
-  const angular = angularyMapper(spec);
-  const dependencies = dependenciesMapper(spec);
-  const extensions = extensionsMapper(spec);
-  const loadingStrategy = loadingStrategyMapper(spec);
-  const path = spec.module?.path ?? '';
-  const version = info.version;
-  const buildMode = spec.pluginJson.buildMode ?? 'production';
-  const moduleHash = spec.module?.hash;
-
-  return {
-    id,
-    angular,
-    dependencies,
-    extensions,
-    loadingStrategy,
-    path,
-    preload,
-    version,
-    buildMode,
-    moduleHash,
-  };
-}
-
-export const v0alpha1AppMapper: AppPluginMetasMapper<PluginMetasResponse> = (response) => {
-  const result: AppPluginMetas = {};
-
-  return response.items.reduce((acc, curr) => {
-    if (curr.spec.pluginJson.type !== 'app') {
-      return acc;
-    }
-
-    const config = specMapper(curr.spec);
-    acc[config.id] = config;
-    return acc;
-  }, result);
-};
@@ -1,153 +0,0 @@
-import { evaluateBooleanFlag } from '../../internal/openFeature';
-
-import { clearCache, initPluginMetas } from './plugins';
-import { v0alpha1Meta } from './test-fixtures/v0alpha1Response';
-
-jest.mock('../../internal/openFeature', () => ({
-  ...jest.requireActual('../../internal/openFeature'),
-  evaluateBooleanFlag: jest.fn(),
-}));
-
-const evaluateBooleanFlagMock = jest.mocked(evaluateBooleanFlag);
-
-describe('when useMTPlugins toggle is enabled and cache is not initialized', () => {
-  const originalFetch = global.fetch;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    clearCache();
-    evaluateBooleanFlagMock.mockReturnValue(true);
-  });
-
-  afterEach(() => {
-    global.fetch = originalFetch;
-  });
-
-  it('initPluginMetas should call loadPluginMetas and return correct result if response is ok', async () => {
-    global.fetch = jest.fn().mockResolvedValue({
-      ok: true,
-      status: 200,
-      json: () => Promise.resolve({ items: [v0alpha1Meta] }),
-    });
-
-    const response = await initPluginMetas();
-
-    expect(response.items).toHaveLength(1);
-    expect(response.items[0]).toEqual(v0alpha1Meta);
-    expect(global.fetch).toHaveBeenCalledTimes(1);
-    expect(global.fetch).toHaveBeenCalledWith('/apis/plugins.grafana.app/v0alpha1/namespaces/default/metas');
-  });
-
-  it('initPluginMetas should call loadPluginMetas and return correct result if response is not ok', async () => {
-    global.fetch = jest.fn().mockResolvedValue({
-      ok: false,
-      status: 404,
-      statusText: 'Not found',
-    });
-
-    await expect(initPluginMetas()).rejects.toThrow(new Error(`Failed to load plugin metas 404:Not found`));
-    expect(global.fetch).toHaveBeenCalledTimes(1);
-    expect(global.fetch).toHaveBeenCalledWith('/apis/plugins.grafana.app/v0alpha1/namespaces/default/metas');
-  });
-});
-
-describe('when useMTPlugins toggle is enabled and cache is initialized', () => {
-  const originalFetch = global.fetch;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    clearCache();
-    evaluateBooleanFlagMock.mockReturnValue(true);
-  });
-
-  afterEach(() => {
-    global.fetch = originalFetch;
-  });
-
-  it('initPluginMetas should return cache', async () => {
-    global.fetch = jest.fn().mockResolvedValue({
-      ok: true,
-      status: 200,
-      json: () => Promise.resolve({ items: [v0alpha1Meta] }),
-    });
-
-    const original = await initPluginMetas();
-    const cached = await initPluginMetas();
-
-    expect(original).toEqual(cached);
-    expect(global.fetch).toHaveBeenCalledTimes(1);
-  });
-
-  it('initPluginMetas should return inflight promise', async () => {
-    jest.useFakeTimers();
-
-    global.fetch = jest.fn().mockResolvedValue({
-      ok: true,
-      status: 200,
-      json: () => Promise.resolve({ items: [v0alpha1Meta] }),
-    });
-
-    const original = initPluginMetas();
-    const cached = initPluginMetas();
-    await jest.runAllTimersAsync();
-
-    expect(original).toEqual(cached);
-    expect(global.fetch).toHaveBeenCalledTimes(1);
-  });
-});
-
-describe('when useMTPlugins toggle is disabled and cache is not initialized', () => {
-  const originalFetch = global.fetch;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    clearCache();
-    global.fetch = jest.fn();
-    evaluateBooleanFlagMock.mockReturnValue(false);
-  });
-
-  afterEach(() => {
-    global.fetch = originalFetch;
-  });
-
-  it('initPluginMetas should call loadPluginMetas and return correct result if response is ok', async () => {
-    const response = await initPluginMetas();
-
-    expect(response.items).toHaveLength(0);
-    expect(global.fetch).not.toHaveBeenCalled();
-  });
-});
-
-describe('when useMTPlugins toggle is disabled and cache is initialized', () => {
-  const originalFetch = global.fetch;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    clearCache();
-    global.fetch = jest.fn();
-    evaluateBooleanFlagMock.mockReturnValue(false);
-  });
-
-  afterEach(() => {
-    global.fetch = originalFetch;
-  });
-
-  it('initPluginMetas should return cache', async () => {
-    const original = await initPluginMetas();
-    const cached = await initPluginMetas();
-
-    expect(original).toEqual(cached);
-    expect(global.fetch).not.toHaveBeenCalled();
-  });
-
-  it('initPluginMetas should return inflight promise', async () => {
-    jest.useFakeTimers();
-
-    const original = initPluginMetas();
-    const cached = initPluginMetas();
-    await jest.runAllTimersAsync();
-
-    expect(original).toEqual(cached);
-    expect(global.fetch).not.toHaveBeenCalled();
-  });
-});
@@ -1,41 +0,0 @@
-import { config } from '../../config';
-import { evaluateBooleanFlag } from '../../internal/openFeature';
-
-import type { PluginMetasResponse } from './types';
-
-let initPromise: Promise<PluginMetasResponse> | null = null;
-
-function getApiVersion(): string {
-  return 'v0alpha1';
-}
-
-async function loadPluginMetas(): Promise<PluginMetasResponse> {
-  if (!evaluateBooleanFlag('useMTPlugins', false)) {
-    const result = { items: [] };
-    return result;
-  }
-
-  const metas = await fetch(`/apis/plugins.grafana.app/${getApiVersion()}/namespaces/${config.namespace}/metas`);
-  if (!metas.ok) {
-    throw new Error(`Failed to load plugin metas ${metas.status}:${metas.statusText}`);
-  }
-
-  const result = await metas.json();
-  return result;
-}
-
-export function initPluginMetas(): Promise<PluginMetasResponse> {
-  if (!initPromise) {
-    initPromise = loadPluginMetas();
-  }
-
-  return initPromise;
-}
-
-export function clearCache() {
-  if (process.env.NODE_ENV !== 'test') {
-    throw new Error('clearCache() function can only be called from tests.');
-  }
-
-  initPromise = null;
-}
@@ -1,303 +0,0 @@
-import { cloneDeep } from 'lodash';
-
-import { AngularMeta, AppPluginConfig, PluginLoadingStrategy } from '@grafana/data';
-
-import { AppPluginMetas } from '../types';
-
-export const app: AppPluginConfig = cloneDeep({
-  id: 'myorg-someplugin-app',
-  path: 'public/plugins/myorg-someplugin-app/module.js',
-  version: '1.0.0',
-  preload: false,
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  angular: { detected: false } as AngularMeta,
-  loadingStrategy: PluginLoadingStrategy.script,
-  extensions: {
-    addedLinks: [],
-    addedComponents: [],
-    exposedComponents: [],
-    extensionPoints: [],
-    addedFunctions: [],
-  },
-  dependencies: {
-    grafanaDependency: '>=10.4.0',
-    grafanaVersion: '*',
-    plugins: [],
-    extensions: {
-      exposedComponents: [],
-    },
-  },
-  buildMode: 'production',
-});
-
-export const apps: AppPluginMetas = cloneDeep({
-  'grafana-exploretraces-app': {
-    id: 'grafana-exploretraces-app',
-    path: 'public/plugins/grafana-exploretraces-app/module.js',
-    version: '1.2.2',
-    preload: true,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    angular: { detected: false } as AngularMeta,
-    loadingStrategy: PluginLoadingStrategy.script,
-    extensions: {
-      addedLinks: [
-        {
-          targets: ['grafana/dashboard/panel/menu'],
-          title: 'Open in Traces Drilldown',
-          description: 'Open current query in the Traces Drilldown app',
-        },
-        {
-          targets: ['grafana/explore/toolbar/action'],
-          title: 'Open in Grafana Traces Drilldown',
-          description: 'Try our new queryless experience for traces',
-        },
-      ],
-      addedComponents: [
-        {
-          targets: ['grafana-asserts-app/entity-assertions-widget/v1'],
-          title: 'Asserts widget',
-          description: 'A block with assertions for a given service',
-        },
-        {
-          targets: ['grafana-asserts-app/insights-timeline-widget/v1'],
-          title: 'Insights Timeline Widget',
-          description: 'Widget for displaying insights timeline in other apps',
-        },
-      ],
-      exposedComponents: [
-        {
-          id: 'grafana-exploretraces-app/open-in-explore-traces-button/v1',
-          title: 'Open in Traces Drilldown button',
-          description: 'A button that opens a traces view in the Traces Drilldown app.',
-        },
-        {
-          id: 'grafana-exploretraces-app/embedded-trace-exploration/v1',
-          title: 'Embedded Trace Exploration',
-          description:
-            'A component that renders a trace exploration view that can be embedded in other parts of Grafana.',
-        },
-      ],
-      extensionPoints: [
-        {
-          id: 'grafana-exploretraces-app/investigation/v1',
-          title: '',
-          description: '',
-        },
-        {
-          id: 'grafana-exploretraces-app/get-logs-drilldown-link/v1',
-          title: '',
-          description: '',
-        },
-      ],
-      addedFunctions: [],
-    },
-    dependencies: {
-      grafanaDependency: '>=11.5.0',
-      grafanaVersion: '*',
-      plugins: [],
-      extensions: {
-        exposedComponents: [
-          'grafana-asserts-app/entity-assertions-widget/v1',
-          'grafana-asserts-app/insights-timeline-widget/v1',
-        ],
-      },
-    },
-    buildMode: 'production',
-  },
-  'grafana-lokiexplore-app': {
-    id: 'grafana-lokiexplore-app',
-    path: 'public/plugins/grafana-lokiexplore-app/module.js',
-    version: '1.0.32',
-    preload: true,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    angular: { detected: false } as AngularMeta,
-    loadingStrategy: PluginLoadingStrategy.script,
-    extensions: {
-      addedLinks: [
-        {
-          targets: [
-            'grafana/dashboard/panel/menu',
-            'grafana/explore/toolbar/action',
-            'grafana-metricsdrilldown-app/open-in-logs-drilldown/v1',
-            'grafana-assistant-app/navigateToDrilldown/v1',
-          ],
-          title: 'Open in Grafana Logs Drilldown',
-          description: 'Open current query in the Grafana Logs Drilldown view',
-        },
-      ],
-      addedComponents: [
-        {
-          targets: ['grafana-asserts-app/insights-timeline-widget/v1'],
-          title: 'Insights Timeline Widget',
-          description: 'Widget for displaying insights timeline in other apps',
-        },
-      ],
-      exposedComponents: [
-        {
-          id: 'grafana-lokiexplore-app/open-in-explore-logs-button/v1',
-          title: 'Open in Logs Drilldown button',
-          description: 'A button that opens a logs view in the Logs Drilldown app.',
-        },
-        {
-          id: 'grafana-lokiexplore-app/embedded-logs-exploration/v1',
-          title: 'Embedded Logs Exploration',
-          description:
-            'A component that renders a logs exploration view that can be embedded in other parts of Grafana.',
-        },
-      ],
-      extensionPoints: [
-        {
-          id: 'grafana-lokiexplore-app/investigation/v1',
-          title: '',
-          description: '',
-        },
-      ],
-      addedFunctions: [
-        {
-          targets: ['grafana-exploretraces-app/get-logs-drilldown-link/v1'],
-          title: 'Open Logs Drilldown',
-          description: 'Returns url to logs drilldown app',
-        },
-      ],
-    },
-    dependencies: {
-      grafanaDependency: '>=11.6.0',
-      grafanaVersion: '*',
-      plugins: [],
-      extensions: {
-        exposedComponents: [
-          'grafana-adaptivelogs-app/temporary-exemptions/v1',
-          'grafana-lokiexplore-app/embedded-logs-exploration/v1',
-          'grafana-asserts-app/insights-timeline-widget/v1',
-          'grafana/add-to-dashboard-form/v1',
-        ],
-      },
-    },
-    buildMode: 'production',
-  },
-  'grafana-metricsdrilldown-app': {
-    id: 'grafana-metricsdrilldown-app',
-    path: 'public/plugins/grafana-metricsdrilldown-app/module.js',
-    version: '1.0.26',
-    preload: true,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    angular: { detected: false } as AngularMeta,
-    loadingStrategy: PluginLoadingStrategy.script,
-    extensions: {
-      addedLinks: [
-        {
-          targets: [
-            'grafana/dashboard/panel/menu',
-            'grafana/explore/toolbar/action',
-            'grafana-assistant-app/navigateToDrilldown/v1',
-            'grafana/alerting/alertingrule/queryeditor',
-          ],
-          title: 'Open in Grafana Metrics Drilldown',
-          description: 'Open current query in the Grafana Metrics Drilldown view',
-        },
-        {
-          targets: ['grafana-metricsdrilldown-app/grafana-assistant-app/navigateToDrilldown/v0-alpha'],
-          title: 'Navigate to metrics drilldown',
-          description: 'Build a url path to the metrics drilldown',
-        },
-        {
-          targets: ['grafana/datasources/config/actions', 'grafana/datasources/config/status'],
-          title: 'Open in Metrics Drilldown',
-          description: 'Browse metrics in Grafana Metrics Drilldown',
-        },
-      ],
-      addedComponents: [],
-      exposedComponents: [
-        {
-          id: 'grafana-metricsdrilldown-app/label-breakdown-component/v1',
-          title: 'Label Breakdown',
-          description: 'A metrics label breakdown view from the Metrics Drilldown app.',
-        },
-        {
-          id: 'grafana-metricsdrilldown-app/knowledge-graph-insight-metrics/v1',
-          title: 'Knowledge Graph Source Metrics',
-          description: 'Explore the underlying metrics related to a Knowledge Graph insight',
-        },
-      ],
-      extensionPoints: [
-        {
-          id: 'grafana-exploremetrics-app/investigation/v1',
-          title: '',
-          description: '',
-        },
-        {
-          id: 'grafana-metricsdrilldown-app/open-in-logs-drilldown/v1',
-          title: '',
-          description: '',
-        },
-      ],
-      addedFunctions: [],
-    },
-    dependencies: {
-      grafanaDependency: '>=11.6.0',
-      grafanaVersion: '*',
-      plugins: [],
-      extensions: {
-        exposedComponents: ['grafana/add-to-dashboard-form/v1'],
-      },
-    },
-    buildMode: 'production',
-  },
-  'grafana-pyroscope-app': {
-    id: 'grafana-pyroscope-app',
-    path: 'public/plugins/grafana-pyroscope-app/module.js',
-    version: '1.14.2',
-    preload: true,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    angular: { detected: false } as AngularMeta,
-    loadingStrategy: PluginLoadingStrategy.script,
-    extensions: {
-      addedLinks: [
-        {
-          targets: [
-            'grafana/explore/toolbar/action',
-            'grafana/traceview/details',
-            'grafana-assistant-app/navigateToDrilldown/v1',
-          ],
-          title: 'Open in Grafana Profiles Drilldown',
-          description: 'Try our new queryless experience for profiles',
-        },
-      ],
-      addedComponents: [],
-      exposedComponents: [
-        {
-          id: 'grafana-pyroscope-app/embedded-profiles-exploration/v1',
-          title: 'Embedded Profiles Exploration',
-          description:
-            'A component that renders a profiles exploration view that can be embedded in other parts of Grafana.',
-        },
-      ],
-      extensionPoints: [
-        {
-          id: 'grafana-pyroscope-app/investigation/v1',
-          title: '',
-          description: '',
-        },
-        {
-          id: 'grafana-pyroscope-app/settings/v1',
-          title: '',
-          description: '',
-        },
-      ],
-      addedFunctions: [],
-    },
-    dependencies: {
-      grafanaDependency: '>=11.5.0',
-      grafanaVersion: '*',
-      plugins: [],
-      extensions: {
-        exposedComponents: [
-          'grafana-o11yinsights-app/insights-launcher/v1',
-          'grafana-adaptiveprofiles-app/resolution-boost/v1',
-        ],
-      },
-    },
-    buildMode: 'production',
-  },
-  [app.id]: app,
-});
@@ -1,10 +0,0 @@
-import type { AppPluginConfig } from '@grafana/data';
-
-import type { Meta } from './types/meta_object_gen';
-
-export type AppPluginMetas = Record<string, AppPluginConfig>;
-
-export type AppPluginMetasMapper<T> = (response: T) => AppPluginMetas;
-export interface PluginMetasResponse {
-  items: Meta[];
-}
@@ -1,49 +0,0 @@
-/*
- * This file was generated by grafana-app-sdk. DO NOT EDIT.
- */
-import { Spec } from './types.spec.gen';
-import { Status } from './types.status.gen';
-
-export interface Metadata {
-    name: string;
-    namespace: string;
-    generateName?: string;
-    selfLink?: string;
-    uid?: string;
-    resourceVersion?: string;
-    generation?: number;
-    creationTimestamp?: string;
-    deletionTimestamp?: string;
-    deletionGracePeriodSeconds?: number;
-    labels?: Record<string, string>;
-    annotations?: Record<string, string>;
-    ownerReferences?: OwnerReference[];
-    finalizers?: string[];
-    managedFields?: ManagedFieldsEntry[];
-}
-
-export interface OwnerReference {
-    apiVersion: string;
-    kind: string;
-    name: string;
-    uid: string;
-    controller?: boolean;
-    blockOwnerDeletion?: boolean;
-}
-
-export interface ManagedFieldsEntry {
-    manager?: string;
-    operation?: string;
-    apiVersion?: string;
-    time?: string;
-    fieldsType?: string;
-    subresource?: string;
-}
-
-export interface Meta {
-    kind: string;
-    apiVersion: string;
-    metadata: Metadata;
-    spec: Spec;
-    status: Status;
-}
@@ -1,278 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-// JSON configuration schema for Grafana plugins
-// Converted from: https://github.com/grafana/grafana/blob/main/docs/sources/developers/plugins/plugin.schema.json
-export interface JSONData {
-	// Unique name of the plugin
-	id: string;
-	// Plugin type
-	type: "app" | "datasource" | "panel" | "renderer";
-	// Human-readable name of the plugin
-	name: string;
-	// Metadata for the plugin
-	info: Info;
-	// Dependency information
-	dependencies: Dependencies;
-	// Optional fields
-	alerting?: boolean;
-	annotations?: boolean;
-	autoEnabled?: boolean;
-	backend?: boolean;
-	buildMode?: string;
-	builtIn?: boolean;
-	category?: "tsdb" | "logging" | "cloud" | "tracing" | "profiling" | "sql" | "enterprise" | "iot" | "other";
-	enterpriseFeatures?: EnterpriseFeatures;
-	executable?: string;
-	hideFromList?: boolean;
-	// +listType=atomic
-	includes?: Include[];
-	logs?: boolean;
-	metrics?: boolean;
-	multiValueFilterOperators?: boolean;
-	pascalName?: string;
-	preload?: boolean;
-	queryOptions?: QueryOptions;
-	// +listType=atomic
-	routes?: Route[];
-	skipDataQuery?: boolean;
-	state?: "alpha" | "beta";
-	streaming?: boolean;
-	suggestions?: boolean;
-	tracing?: boolean;
-	iam?: IAM;
-	// +listType=atomic
-	roles?: Role[];
-	extensions?: Extensions;
-}
-
-export const defaultJSONData = (): JSONData => ({
-	id: "",
-	type: "app",
-	name: "",
-	info: defaultInfo(),
-	dependencies: defaultDependencies(),
-});
-
-export interface Info {
-	// Required fields
-	// +listType=set
-	keywords: string[];
-	logos: {
-		small: string;
-		large: string;
-	};
-	updated: string;
-	version: string;
-	// Optional fields
-	author?: {
-		name?: string;
-		email?: string;
-		url?: string;
-	};
-	description?: string;
-	// +listType=atomic
-	links?: {
-		name?: string;
-		url?: string;
-	}[];
-	// +listType=atomic
-	screenshots?: {
-		name?: string;
-		path?: string;
-	}[];
-}
-
-export const defaultInfo = (): Info => ({
-	keywords: [],
-	logos: {
-	small: "",
-	large: "",
-},
-	updated: "",
-	version: "",
-});
-
-export interface Dependencies {
-	// Required field
-	grafanaDependency: string;
-	// Optional fields
-	grafanaVersion?: string;
-	// +listType=set
-	// +listMapKey=id
-	plugins?: {
-		id: string;
-		type: "app" | "datasource" | "panel";
-		name: string;
-	}[];
-	extensions?: {
-		// +listType=set
-		exposedComponents?: string[];
-	};
-}
-
-export const defaultDependencies = (): Dependencies => ({
-	grafanaDependency: "",
-});
-
-export interface EnterpriseFeatures {
-	// Allow additional properties
-	healthDiagnosticsErrors?: boolean;
-}
-
-export const defaultEnterpriseFeatures = (): EnterpriseFeatures => ({
-	healthDiagnosticsErrors: false,
-});
-
-export interface Include {
-	uid?: string;
-	type?: "dashboard" | "page" | "panel" | "datasource";
-	name?: string;
-	component?: string;
-	role?: "Admin" | "Editor" | "Viewer" | "None";
-	action?: string;
-	path?: string;
-	addToNav?: boolean;
-	defaultNav?: boolean;
-	icon?: string;
-}
-
-export const defaultInclude = (): Include => ({
-});
-
-export interface QueryOptions {
-	maxDataPoints?: boolean;
-	minInterval?: boolean;
-	cacheTimeout?: boolean;
-}
-
-export const defaultQueryOptions = (): QueryOptions => ({
-});
-
-export interface Route {
-	path?: string;
-	method?: string;
-	url?: string;
-	reqSignedIn?: boolean;
-	reqRole?: string;
-	reqAction?: string;
-	// +listType=atomic
-	headers?: string[];
-	body?: Record<string, any>;
-	tokenAuth?: {
-		url?: string;
-		// +listType=set
-		scopes?: string[];
-		params?: Record<string, any>;
-	};
-	jwtTokenAuth?: {
-		url?: string;
-		// +listType=set
-		scopes?: string[];
-		params?: Record<string, any>;
-	};
-	// +listType=atomic
-	urlParams?: {
-		name?: string;
-		content?: string;
-	}[];
-}
-
-export const defaultRoute = (): Route => ({
-});
-
-export interface IAM {
-	// +listType=atomic
-	permissions?: {
-		action?: string;
-		scope?: string;
-	}[];
-}
-
-export const defaultIAM = (): IAM => ({
-});
-
-export interface Role {
-	role?: {
-		name?: string;
-		description?: string;
-		// +listType=atomic
-		permissions?: {
-			action?: string;
-			scope?: string;
-		}[];
-	};
-	// +listType=set
-	grants?: string[];
-}
-
-export const defaultRole = (): Role => ({
-});
-
-export interface Extensions {
-	// +listType=atomic
-	addedComponents?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=atomic
-	addedLinks?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=atomic
-	addedFunctions?: {
-		// +listType=set
-		targets: string[];
-		title: string;
-		description?: string;
-	}[];
-	// +listType=set
-	// +listMapKey=id
-	exposedComponents?: {
-		id: string;
-		title?: string;
-		description?: string;
-	}[];
-	// +listType=set
-	// +listMapKey=id
-	extensionPoints?: {
-		id: string;
-		title?: string;
-		description?: string;
-	}[];
-}
-
-export const defaultExtensions = (): Extensions => ({
-});
-
-export interface Spec {
-	pluginJson: JSONData;
-	class: "core" | "external";
-	module?: {
-		path: string;
-		hash?: string;
-		loadingStrategy?: "fetch" | "script";
-	};
-	baseURL?: string;
-	signature?: {
-		status: "internal" | "valid" | "invalid" | "modified" | "unsigned";
-		type?: "grafana" | "commercial" | "community" | "private" | "private-glob";
-		org?: string;
-	};
-	angular?: {
-		detected: boolean;
-	};
-	translations?: Record<string, string>;
-	// +listType=atomic
-	children?: string[];
-}
-
-export const defaultSpec = (): Spec => ({
-	pluginJson: defaultJSONData(),
-	class: "core",
-});
-
@@ -1,30 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-export interface OperatorState {
-	// lastEvaluation is the ResourceVersion last evaluated
-	lastEvaluation: string;
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	state: "success" | "in_progress" | "failed";
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	descriptiveState?: string;
-	// details contains any extra information that is operator-specific
-	details?: Record<string, any>;
-}
-
-export const defaultOperatorState = (): OperatorState => ({
-	lastEvaluation: "",
-	state: "success",
-});
-
-export interface Status {
-	// operatorStates is a map of operator ID to operator state evaluations.
-	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	operatorStates?: Record<string, OperatorState>;
-	// additionalFields is reserved for future use
-	additionalFields?: Record<string, any>;
-}
-
-export const defaultStatus = (): Status => ({
-});
-
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "%VERSION%";
+export const pluginVersion = "12.4.0-pre";

 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);

@@ -231,10 +231,6 @@ export const defaultVariableModel: Partial<VariableModel> = {
 * Option to be selected in a variable.
 */
 export interface VariableOption {
-  /**
-   * Additional properties for multi-props variables
-   */
-  properties?: Record<string, string>;
  /**
   * Whether the option is selected or not
   */
@@ -715,9 +715,7 @@ VariableOption: {
  // Text to be displayed for the option
  text: string | [...string]
  // Value of the option
-  value: string | [...string]
-  // Additional properties for multi-props variables
-  properties?: {[string]: string}
+value: string | [...string]
 }

 // Query variable specification
@@ -0,0 +1,78 @@
+import { render, screen } from '@testing-library/react';
+
+import { VizLegendTable } from './VizLegendTable';
+import { VizLegendItem } from './types';
+
+describe('VizLegendTable', () => {
+  const mockItems: VizLegendItem[] = [
+    { label: 'Series 1', color: 'red', yAxis: 1 },
+    { label: 'Series 2', color: 'blue', yAxis: 1 },
+    { label: 'Series 3', color: 'green', yAxis: 1 },
+  ];
+
+  it('renders without crashing', () => {
+    const { container } = render(<VizLegendTable items={mockItems} placement="bottom" />);
+    expect(container.querySelector('table')).toBeInTheDocument();
+  });
+
+  it('renders all items', () => {
+    render(<VizLegendTable items={mockItems} placement="bottom" />);
+    expect(screen.getByText('Series 1')).toBeInTheDocument();
+    expect(screen.getByText('Series 2')).toBeInTheDocument();
+    expect(screen.getByText('Series 3')).toBeInTheDocument();
+  });
+
+  it('renders table headers when items have display values', () => {
+    const itemsWithStats: VizLegendItem[] = [
+      {
+        label: 'Series 1',
+        color: 'red',
+        yAxis: 1,
+        getDisplayValues: () => [
+          { numeric: 100, text: '100', title: 'Max' },
+          { numeric: 50, text: '50', title: 'Min' },
+        ],
+      },
+    ];
+    render(<VizLegendTable items={itemsWithStats} placement="bottom" />);
+    expect(screen.getByText('Max')).toBeInTheDocument();
+    expect(screen.getByText('Min')).toBeInTheDocument();
+  });
+
+  it('renders sort icon when sorted', () => {
+    const { container } = render(
+      <VizLegendTable items={mockItems} placement="bottom" sortBy="Name" sortDesc={false} />
+    );
+    expect(container.querySelector('svg')).toBeInTheDocument();
+  });
+
+  it('calls onToggleSort when header is clicked', () => {
+    const onToggleSort = jest.fn();
+    render(<VizLegendTable items={mockItems} placement="bottom" onToggleSort={onToggleSort} isSortable={true} />);
+    const header = screen.getByText('Name');
+    header.click();
+    expect(onToggleSort).toHaveBeenCalledWith('Name');
+  });
+
+  it('does not call onToggleSort when not sortable', () => {
+    const onToggleSort = jest.fn();
+    render(<VizLegendTable items={mockItems} placement="bottom" onToggleSort={onToggleSort} isSortable={false} />);
+    const header = screen.getByText('Name');
+    header.click();
+    expect(onToggleSort).not.toHaveBeenCalled();
+  });
+
+  it('renders with long labels', () => {
+    const itemsWithLongLabels: VizLegendItem[] = [
+      {
+        label: 'This is a very long series name that should be scrollable within its table cell',
+        color: 'red',
+        yAxis: 1,
+      },
+    ];
+    render(<VizLegendTable items={itemsWithLongLabels} placement="bottom" />);
+    expect(
+      screen.getByText('This is a very long series name that should be scrollable within its table cell')
+    ).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,112 @@
+import { render, screen } from '@testing-library/react';
+
+import { LegendTableItem } from './VizLegendTableItem';
+import { VizLegendItem } from './types';
+
+describe('LegendTableItem', () => {
+  const mockItem: VizLegendItem = {
+    label: 'Series 1',
+    color: 'red',
+    yAxis: 1,
+  };
+
+  it('renders without crashing', () => {
+    const { container } = render(
+      <table>
+        <tbody>
+          <LegendTableItem item={mockItem} />
+        </tbody>
+      </table>
+    );
+    expect(container.querySelector('tr')).toBeInTheDocument();
+  });
+
+  it('renders label text', () => {
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={mockItem} />
+        </tbody>
+      </table>
+    );
+    expect(screen.getByText('Series 1')).toBeInTheDocument();
+  });
+
+  it('renders with long label text', () => {
+    const longLabelItem: VizLegendItem = {
+      ...mockItem,
+      label: 'This is a very long series name that should be scrollable in the table cell',
+    };
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={longLabelItem} />
+        </tbody>
+      </table>
+    );
+    expect(
+      screen.getByText('This is a very long series name that should be scrollable in the table cell')
+    ).toBeInTheDocument();
+  });
+
+  it('renders stat values when provided', () => {
+    const itemWithStats: VizLegendItem = {
+      ...mockItem,
+      getDisplayValues: () => [
+        { numeric: 100, text: '100', title: 'Max' },
+        { numeric: 50, text: '50', title: 'Min' },
+      ],
+    };
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={itemWithStats} />
+        </tbody>
+      </table>
+    );
+    expect(screen.getByText('100')).toBeInTheDocument();
+    expect(screen.getByText('50')).toBeInTheDocument();
+  });
+
+  it('renders right y-axis indicator when yAxis is 2', () => {
+    const rightAxisItem: VizLegendItem = {
+      ...mockItem,
+      yAxis: 2,
+    };
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={rightAxisItem} />
+        </tbody>
+      </table>
+    );
+    expect(screen.getByText('(right y-axis)')).toBeInTheDocument();
+  });
+
+  it('calls onLabelClick when label is clicked', () => {
+    const onLabelClick = jest.fn();
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={mockItem} onLabelClick={onLabelClick} />
+        </tbody>
+      </table>
+    );
+    const button = screen.getByRole('button');
+    button.click();
+    expect(onLabelClick).toHaveBeenCalledWith(mockItem, expect.any(Object));
+  });
+
+  it('does not call onClick when readonly', () => {
+    const onLabelClick = jest.fn();
+    render(
+      <table>
+        <tbody>
+          <LegendTableItem item={mockItem} onLabelClick={onLabelClick} readonly={true} />
+        </tbody>
+      </table>
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+  });
+});
@@ -69,7 +69,7 @@ export const LegendTableItem = ({

  return (
    <tr className={cx(styles.row, className)}>
-      <td>
+      <td className={styles.labelCell}>
        <span className={styles.itemWrapper}>
          <VizLegendSeriesIcon
            color={item.color}
@@ -77,24 +77,26 @@ export const LegendTableItem = ({
            readonly={readonly}
            lineStyle={item.lineStyle}
          />
-          <button
-            disabled={readonly}
-            type="button"
-            title={item.label}
-            onBlur={onMouseOut}
-            onFocus={onMouseOver}
-            onMouseOver={onMouseOver}
-            onMouseOut={onMouseOut}
-            onClick={!readonly ? onClick : undefined}
-            className={cx(styles.label, item.disabled && styles.labelDisabled)}
-          >
-            {item.label}{' '}
-            {item.yAxis === 2 && (
-              <span className={styles.yAxisLabel}>
-                <Trans i18nKey="grafana-ui.viz-legend.right-axis-indicator">(right y-axis)</Trans>
-              </span>
-            )}
-          </button>
+          <div className={styles.labelCellInner}>
+            <button
+              disabled={readonly}
+              type="button"
+              title={item.label}
+              onBlur={onMouseOut}
+              onFocus={onMouseOver}
+              onMouseOver={onMouseOver}
+              onMouseOut={onMouseOut}
+              onClick={!readonly ? onClick : undefined}
+              className={cx(styles.label, item.disabled && styles.labelDisabled)}
+            >
+              {item.label}{' '}
+              {item.yAxis === 2 && (
+                <span className={styles.yAxisLabel}>
+                  <Trans i18nKey="grafana-ui.viz-legend.right-axis-indicator">(right y-axis)</Trans>
+                </span>
+              )}
+            </button>
+          </div>
        </span>
      </td>
      {item.getDisplayValues &&
@@ -128,6 +130,28 @@ const getStyles = (theme: GrafanaTheme2) => {
        background: rowHoverBg,
      },
    }),
+    labelCell: css({
+      label: 'LegendLabelCell',
+      maxWidth: 0,
+      width: '100%',
+      minWidth: theme.spacing(16),
+    }),
+    labelCellInner: css({
+      label: 'LegendLabelCellInner',
+      display: 'block',
+      flex: 1,
+      minWidth: 0,
+      overflowX: 'auto',
+      overflowY: 'hidden',
+      paddingRight: theme.spacing(3),
+      scrollbarWidth: 'none',
+      msOverflowStyle: 'none',
+      maskImage: `linear-gradient(to right, black calc(100% - ${theme.spacing(3)}), transparent 100%)`,
+      WebkitMaskImage: `linear-gradient(to right, black calc(100% - ${theme.spacing(3)}), transparent 100%)`,
+      '&::-webkit-scrollbar': {
+        display: 'none',
+      },
+    }),
    label: css({
      label: 'LegendLabel',
      whiteSpace: 'nowrap',
@@ -135,9 +159,6 @@ const getStyles = (theme: GrafanaTheme2) => {
      border: 'none',
      fontSize: 'inherit',
      padding: 0,
-      maxWidth: '600px',
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
      userSelect: 'text',
    }),
    labelDisabled: css({
@@ -1,5 +1,4 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e

 PERMISSIONS_OK=0

@@ -27,14 +26,14 @@ if [ ! -d "$GF_PATHS_PLUGINS" ]; then
 fi

 if [ ! -z ${GF_AWS_PROFILES+x} ]; then
-    :> "$GF_PATHS_HOME/.aws/credentials"
+    > "$GF_PATHS_HOME/.aws/credentials"

    for profile in ${GF_AWS_PROFILES}; do
        access_key_varname="GF_AWS_${profile}_ACCESS_KEY_ID"
        secret_key_varname="GF_AWS_${profile}_SECRET_ACCESS_KEY"
        region_varname="GF_AWS_${profile}_REGION"

-        if [ ! -z "${!access_key_varname}" ] && [ ! -z "${!secret_key_varname}" ]; then
+        if [ ! -z "${!access_key_varname}" -a ! -z "${!secret_key_varname}" ]; then
            echo "[${profile}]" >> "$GF_PATHS_HOME/.aws/credentials"
            echo "aws_access_key_id = ${!access_key_varname}" >> "$GF_PATHS_HOME/.aws/credentials"
            echo "aws_secret_access_key = ${!secret_key_varname}" >> "$GF_PATHS_HOME/.aws/credentials"
@@ -161,7 +161,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 			AliasIDs:        panel.AliasIDs,
 			Info:            panel.Info,
 			Module:          panel.Module,
-			ModuleHash:      hs.pluginAssets.ModuleHash(c.Req.Context(), panel),
+			ModuleHash:      panel.ModuleHash,
 			BaseURL:         panel.BaseURL,
 			SkipDataQuery:   panel.SkipDataQuery,
 			Suggestions:     panel.Suggestions,
@@ -170,7 +170,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 			Signature:       string(panel.Signature),
 			Sort:            getPanelSort(panel.ID),
 			Angular:         panel.Angular,
-			LoadingStrategy: hs.pluginAssets.LoadingStrategy(c.Req.Context(), panel),
+			LoadingStrategy: panel.LoadingStrategy,
 			Translations:    panel.Translations,
 		}
 	}
@@ -527,11 +527,11 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, availablePlug
 			JSONData:                  plugin.JSONData,
 			Signature:                 plugin.Signature,
 			Module:                    plugin.Module,
-			ModuleHash:                hs.pluginAssets.ModuleHash(c.Req.Context(), plugin),
+			ModuleHash:                plugin.ModuleHash,
 			BaseURL:                   plugin.BaseURL,
 			Angular:                   plugin.Angular,
 			MultiValueFilterOperators: plugin.MultiValueFilterOperators,
-			LoadingStrategy:           hs.pluginAssets.LoadingStrategy(c.Req.Context(), plugin),
+			LoadingStrategy:           plugin.LoadingStrategy,
 			Translations:              plugin.Translations,
 		}

@@ -638,10 +638,10 @@ func (hs *HTTPServer) newAppDTO(ctx context.Context, plugin pluginstore.Plugin,
 		Path:            plugin.Module,
 		Preload:         false,
 		Angular:         plugin.Angular,
-		LoadingStrategy: hs.pluginAssets.LoadingStrategy(ctx, plugin),
+		LoadingStrategy: plugin.LoadingStrategy,
 		Extensions:      plugin.Extensions,
 		Dependencies:    plugin.Dependencies,
-		ModuleHash:      hs.pluginAssets.ModuleHash(ctx, plugin),
+		ModuleHash:      plugin.ModuleHash,
 		Translations:    plugin.Translations,
 		BuildMode:       plugin.BuildMode,
 	}
@@ -20,8 +20,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/manager/pluginfakes"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
@@ -33,7 +31,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/licensing"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/managedplugins"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/rendering"
@@ -46,7 +43,7 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )

-func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.FeatureToggles, pstore pluginstore.Store, psettings pluginsettings.Service, passets *pluginassets.Service) (*web.Mux, *HTTPServer) {
+func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.FeatureToggles, pstore pluginstore.Store, psettings pluginsettings.Service) (*web.Mux, *HTTPServer) {
 	t.Helper()
 	db.InitTestDB(t)
 	// nolint:staticcheck
@@ -77,12 +74,6 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.F
 		pluginsSettings = &pluginsettings.FakePluginSettings{}
 	}

-	var pluginsAssets = passets
-	if pluginsAssets == nil {
-		sig := signature.ProvideService(pluginsCfg, statickey.New())
-		pluginsAssets = pluginassets.ProvideService(pluginsCfg, pluginsCDN, sig, pluginStore)
-	}
-
 	hs := &HTTPServer{
 		authnService: &authntest.FakeService{},
 		Cfg:          cfg,
@@ -99,7 +90,6 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.F
 		AccessControl:         accesscontrolmock.New(),
 		PluginSettings:        pluginsSettings,
 		pluginsCDNService:     pluginsCDN,
-		pluginAssets:          pluginsAssets,
 		namespacer:            request.GetNamespaceMapper(cfg),
 		SocialService:         socialimpl.ProvideService(cfg, features, &usagestats.UsageStatsMock{}, supportbundlestest.NewFakeBundleService(), remotecache.NewFakeCacheStorage(), nil, ssosettingstests.NewFakeService()),
 		managedPluginsService: managedplugins.NewNoop(),
@@ -132,7 +122,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testi
 	cfg.BuildVersion = "7.8.9"
 	cfg.BuildCommit = "01234567"

-	m, hs := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), nil, nil, nil)
+	m, hs := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), nil, nil)

 	req := httptest.NewRequest(http.MethodGet, "/api/frontend/settings", nil)

@@ -224,7 +214,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_pluginsCDNBaseURL(t *testing.
 			if test.mutateCfg != nil {
 				test.mutateCfg(cfg)
 			}
-			m, _ := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), nil, nil, nil)
+			m, _ := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), nil, nil)
 			req := httptest.NewRequest(http.MethodGet, "/api/frontend/settings", nil)

 			recorder := httptest.NewRecorder()
@@ -249,7 +239,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 		desc           string
 		pluginStore    func() pluginstore.Store
 		pluginSettings func() pluginsettings.Service
-		pluginAssets   func() *pluginassets.Service
 		expected       settings
 	}{
 		{
@@ -266,7 +255,8 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 								Type:    plugins.TypeApp,
 								Preload: true,
 							},
-							FS: &pluginfakes.FakePluginFS{},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -276,7 +266,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 					Plugins: newAppSettings("test-app", false),
 				}
 			},
-			pluginAssets: newPluginAssets(),
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
@@ -304,7 +293,8 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 								Type:    plugins.TypeApp,
 								Preload: true,
 							},
-							FS: &pluginfakes.FakePluginFS{},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -314,7 +304,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 					Plugins: newAppSettings("test-app", true),
 				}
 			},
-			pluginAssets: newPluginAssets(),
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
@@ -341,8 +330,9 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 								Type:    plugins.TypeApp,
 								Preload: true,
 							},
-							Angular: plugins.AngularMeta{Detected: true},
-							FS:      &pluginfakes.FakePluginFS{},
+							Angular:         plugins.AngularMeta{Detected: true},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyFetch,
 						},
 					},
 				}
@@ -352,7 +342,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 					Plugins: newAppSettings("test-app", true),
 				}
 			},
-			pluginAssets: newPluginAssets(),
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
@@ -379,6 +368,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 								Type:    plugins.TypeApp,
 								Preload: true,
 							},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -388,13 +378,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 					Plugins: newAppSettings("test-app", true),
 				}
 			},
-			pluginAssets: newPluginAssetsWithConfig(&config.PluginManagementCfg{
-				PluginSettings: map[string]map[string]string{
-					"test-app": {
-						pluginassets.CreatePluginVersionCfgKey: pluginassets.CreatePluginVersionScriptSupportEnabled,
-					},
-				},
-			}),
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
@@ -424,6 +407,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 							FS: &pluginfakes.FakePluginFS{TypeFunc: func() plugins.FSType {
 								return plugins.FSTypeCDN
 							}},
+							LoadingStrategy: plugins.LoadingStrategyFetch,
 						},
 					},
 				}
@@ -433,7 +417,6 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 					Plugins: newAppSettings("test-app", true),
 				}
 			},
-			pluginAssets: newPluginAssets(),
 			expected: settings{
 				Apps: map[string]*plugins.AppDTO{
 					"test-app": {
@@ -451,7 +434,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_apps(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
-			m, _ := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), test.pluginStore(), test.pluginSettings(), test.pluginAssets())
+			m, _ := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), test.pluginStore(), test.pluginSettings())
 			req := httptest.NewRequest(http.MethodGet, "/api/frontend/settings", nil)

 			recorder := httptest.NewRecorder()
@@ -552,7 +535,8 @@ func TestIntegrationHTTPServer_GetFrontendSettings_translations(t *testing.T) {
 								"en-US": "public/plugins/test-app/locales/en-US/test-app.json",
 								"pt-BR": "public/plugins/test-app/locales/pt-BR/test-app.json",
 							},
-							FS: &pluginfakes.FakePluginFS{},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -602,7 +586,8 @@ func TestIntegrationHTTPServer_GetFrontendSettings_translations(t *testing.T) {
 								"en-US": "public/plugins/test-app/locales/en-US/test-app.json",
 								"pt-BR": "public/plugins/test-app/locales/pt-BR/test-app.json",
 							},
-							FS: &pluginfakes.FakePluginFS{},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -642,7 +627,8 @@ func TestIntegrationHTTPServer_GetFrontendSettings_translations(t *testing.T) {
 								"en-US": "public/plugins/test-app/locales/en-US/test-app.json",
 								"pt-BR": "public/plugins/test-app/locales/pt-BR/test-app.json",
 							},
-							FS: &pluginfakes.FakePluginFS{},
+							FS:              &pluginfakes.FakePluginFS{},
+							LoadingStrategy: plugins.LoadingStrategyScript,
 						},
 					},
 				}
@@ -670,7 +656,7 @@ func TestIntegrationHTTPServer_GetFrontendSettings_translations(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
 			cfg := setting.NewCfg()
-			m, hs := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), test.pluginStore(), nil, nil)
+			m, hs := setupTestEnvironment(t, cfg, featuremgmt.WithFeatures(), test.pluginStore(), nil)

 			// Create a request with the appropriate context
 			req := httptest.NewRequest(http.MethodGet, "/api/frontend/settings", nil)
@@ -707,13 +693,3 @@ func TestIntegrationHTTPServer_GetFrontendSettings_translations(t *testing.T) {
 		})
 	}
 }
-
-func newPluginAssets() func() *pluginassets.Service {
-	return newPluginAssetsWithConfig(&config.PluginManagementCfg{})
-}
-
-func newPluginAssetsWithConfig(pCfg *config.PluginManagementCfg) func() *pluginassets.Service {
-	return func() *pluginassets.Service {
-		return pluginassets.ProvideService(pCfg, pluginscdn.ProvideService(pCfg), signature.ProvideService(pCfg, statickey.New()), &pluginstore.FakePluginStore{})
-	}
-}
@@ -82,7 +82,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/playlist"
 	"github.com/grafana/grafana/pkg/services/plugindashboards"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/managedplugins"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginchecker"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -151,7 +150,6 @@ type HTTPServer struct {
 	pluginDashboardService       plugindashboards.Service
 	pluginStaticRouteResolver    plugins.StaticRouteResolver
 	pluginErrorResolver          plugins.ErrorResolver
-	pluginAssets                 *pluginassets.Service
 	pluginPreinstall             pluginchecker.Preinstall
 	SearchService                search.Service
 	ShortURLService              shorturls.Service
@@ -255,7 +253,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	encryptionService encryption.Internal, grafanaUpdateChecker *updatemanager.GrafanaService,
 	pluginsUpdateChecker *updatemanager.PluginsService, searchUsersService searchusers.Service,
 	dataSourcesService datasources.DataSourceService, queryDataService query.Service, pluginFileStore plugins.FileStore,
-	serviceaccountsService serviceaccounts.Service, pluginAssets *pluginassets.Service,
+	serviceaccountsService serviceaccounts.Service,
 	authInfoService login.AuthInfoService, storageService store.StorageService,
 	notificationService notifications.Service, dashboardService dashboards.DashboardService,
 	dashboardProvisioningService dashboards.DashboardProvisioningService, folderService folder.Service,
@@ -294,7 +292,6 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		pluginStore:                  pluginStore,
 		pluginStaticRouteResolver:    pluginStaticRouteResolver,
 		pluginDashboardService:       pluginDashboardService,
-		pluginAssets:                 pluginAssets,
 		pluginErrorResolver:          pluginErrorResolver,
 		pluginFileStore:              pluginFileStore,
 		grafanaUpdateChecker:         grafanaUpdateChecker,
@@ -201,7 +201,7 @@ func (hs *HTTPServer) GetPluginSettingByID(c *contextmodel.ReqContext) response.
 		Includes:         plugin.Includes,
 		BaseUrl:          plugin.BaseURL,
 		Module:           plugin.Module,
-		ModuleHash:       hs.pluginAssets.ModuleHash(c.Req.Context(), plugin),
+		ModuleHash:       plugin.ModuleHash,
 		DefaultNavUrl:    path.Join(hs.Cfg.AppSubURL, plugin.DefaultNavURL),
 		State:            plugin.State,
 		Signature:        plugin.Signature,
@@ -209,7 +209,7 @@ func (hs *HTTPServer) GetPluginSettingByID(c *contextmodel.ReqContext) response.
 		SignatureOrg:     plugin.SignatureOrg,
 		SecureJsonFields: map[string]bool{},
 		AngularDetected:  plugin.Angular.Detected,
-		LoadingStrategy:  hs.pluginAssets.LoadingStrategy(c.Req.Context(), plugin),
+		LoadingStrategy:  plugin.LoadingStrategy,
 		Extensions:       plugin.Extensions,
 		Translations:     plugin.Translations,
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Will Browne	c3c5229986	undo go.mod change	2026-01-13 16:22:49 +00:00
Will Browne	7a2775b1a7	make update-workspace	2026-01-13 16:06:59 +00:00
Will Browne	d25a8f5e72	fix lint issues	2026-01-13 15:59:06 +00:00
Will Browne	48d032e5aa	undo stale comment	2026-01-13 15:58:25 +00:00
Will Browne	ae06690681	move loading strategy into pkg/plugins	2026-01-13 15:46:34 +00:00