undo go.mod change

.github/CODEOWNERS

@@ -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
@@ -658,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

apps/dashboard/pkg/migration/conversion/v2alpha1_to_v1beta1.go

@@ -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:

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-piechart/panel_test_piechart.v42.json

@@ -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"
     },
     {

apps/plugins/Makefile

@@ -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

apps/plugins/README.md

@@ -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
 

apps/plugins/go.mod

@@ -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

apps/plugins/go.sum

@@ -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=

apps/plugins/kinds/manifest.cue

@@ -11,7 +11,7 @@ manifest: {
 v0alpha1Version: {
 	served: true
 	codegen: {
-		ts: {enabled: true}
+		ts: {enabled: false}
 		go: {enabled: true}
 	}
 	kinds: [

apps/plugins/pkg/app/meta/local.go

@@ -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,

apps/plugins/plugin/src/generated/meta/v0alpha1/meta_object_gen.ts

@@ -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;
-}

apps/plugins/plugin/src/generated/meta/v0alpha1/types.metadata.gen.ts

@@ -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: {},
-});
-

apps/plugins/plugin/src/generated/meta/v0alpha1/types.spec.gen.ts

@@ -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",
-});
-

apps/plugins/plugin/src/generated/meta/v0alpha1/types.status.gen.ts

@@ -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 => ({
-});
-

apps/plugins/plugin/src/generated/plugin/v0alpha1/plugin_object_gen.ts

@@ -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;
-}

apps/plugins/plugin/src/generated/plugin/v0alpha1/types.metadata.gen.ts

@@ -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: {},
-});
-

apps/plugins/plugin/src/generated/plugin/v0alpha1/types.spec.gen.ts

@@ -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: "",
-});
-

apps/plugins/plugin/src/generated/plugin/v0alpha1/types.status.gen.ts

@@ -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 => ({
-});
-

devenv/dev-dashboards/panel-piechart/panel_test_piechart.json

@@ -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"
     },
     {

docs/sources/administration/roles-and-permissions/_index.md

@@ -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/).

docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md

@@ -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.

docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md

@@ -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:**

docs/sources/setup-grafana/configure-grafana/_index.md

@@ -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)

e2e-playwright/dashboard-new-layouts/dashboards-repeats-custom-grid.spec.ts

@@ -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();
-    });
   }
 );

e2e-playwright/dashboard-new-layouts/utils.ts

@@ -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,

e2e-playwright/dashboards/V2DashWithRowRepeats.json

@@ -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": {}
-}

eslint-suppressions.json

@@ -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

eslint.config.js

@@ -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',
-        },
       ],
     },
   },

packages/grafana-data/src/types/config.ts

@@ -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;

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -984,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
   */

packages/grafana-data/src/types/plugin.ts

@@ -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;

packages/grafana-runtime/src/config.ts

@@ -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 = '';

packages/grafana-runtime/src/index.ts

@@ -77,5 +77,3 @@ export {
   getCorrelationsService,
   setCorrelationsService,
 } from './services/CorrelationsService';
-export { getAppPluginVersion, isAppPluginInstalled } from './services/pluginMeta/apps';
-export { useAppPluginInstalled, useAppPluginVersion } from './services/pluginMeta/hooks';

packages/grafana-runtime/src/internal/index.ts

@@ -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';

packages/grafana-runtime/src/services/pluginMeta/apps.test.ts

@@ -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);
-  });
-});

packages/grafana-runtime/src/services/pluginMeta/apps.ts

@@ -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);
-}

packages/grafana-runtime/src/services/pluginMeta/hooks.test.tsx

@@ -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();
-  });
-});

packages/grafana-runtime/src/services/pluginMeta/hooks.tsx

@@ -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 };
-}

packages/grafana-runtime/src/services/pluginMeta/mappers/mappers.ts

@@ -1,7 +0,0 @@
-import { AppPluginMetasMapper, PluginMetasResponse } from '../types';
-
-import { v0alpha1AppMapper } from './v0alpha1AppMapper';
-
-export function getAppPluginMapper(): AppPluginMetasMapper<PluginMetasResponse> {
-  return v0alpha1AppMapper;
-}

packages/grafana-runtime/src/services/pluginMeta/mappers/v0alpha1AppMapper.test.ts

@@ -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));
-  });
-});

packages/grafana-runtime/src/services/pluginMeta/mappers/v0alpha1AppMapper.ts

@@ -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);
-};

packages/grafana-runtime/src/services/pluginMeta/plugins.test.ts

@@ -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();
-  });
-});

packages/grafana-runtime/src/services/pluginMeta/plugins.ts

@@ -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;
-}

packages/grafana-runtime/src/services/pluginMeta/test-fixtures/config.apps.ts

@@ -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,
-});

packages/grafana-runtime/src/services/pluginMeta/types.ts

@@ -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[];
-}

packages/grafana-runtime/src/services/pluginMeta/types/meta_object_gen.ts

@@ -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;
-}

packages/grafana-runtime/src/services/pluginMeta/types/types.spec.gen.ts

@@ -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",
-});
-

packages/grafana-runtime/src/services/pluginMeta/types/types.status.gen.ts

@@ -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 => ({
-});
-

packages/grafana-ui/src/components/VizLegend/VizLegendTable.test.tsx

@@ -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();
+  });
+});

packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.test.tsx

@@ -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();
+  });
+});

packages/grafana-ui/src/components/VizLegend/VizLegendTableItem.tsx

@@ -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({

packaging/docker/run.sh

@@ -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"

pkg/api/frontendsettings.go

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

pkg/api/frontendsettings_test.go

@@ -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{})
-	}
-}

pkg/api/http_server.go

@@ -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,

pkg/api/plugins.go

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

pkg/api/plugins_test.go

@@ -28,8 +28,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/manager/filestore"
 	"github.com/grafana/grafana/pkg/plugins/manager/pluginfakes"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature"
-	"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
 	"github.com/grafana/grafana/pkg/plugins/pluginerrs"
 	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -43,7 +41,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/managedplugins"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginchecker"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
@@ -677,9 +674,10 @@ func Test_PluginsList_AccessControl(t *testing.T) {
 
 func createPlugin(jd plugins.JSONData, class plugins.Class, files plugins.FS) *plugins.Plugin {
 	return &plugins.Plugin{
-		JSONData: jd,
-		Class:    class,
-		FS:       files,
+		JSONData:        jd,
+		Class:           class,
+		FS:              files,
+		LoadingStrategy: plugins.LoadingStrategyScript,
 	}
 }
 
@@ -846,10 +844,6 @@ func Test_PluginsSettings(t *testing.T) {
 						ErrorCode: tc.errCode,
 					})
 				}
-				pCfg := &config.PluginManagementCfg{}
-				pluginCDN := pluginscdn.ProvideService(pCfg)
-				sig := signature.ProvideService(pCfg, statickey.New())
-				hs.pluginAssets = pluginassets.ProvideService(pCfg, pluginCDN, sig, hs.pluginStore)
 				hs.pluginErrorResolver = pluginerrs.ProvideStore(errTracker)
 				hs.pluginsUpdateChecker, err = updatemanager.ProvidePluginsService(
 					hs.Cfg,

pkg/plugins/go.mod

@@ -4,6 +4,7 @@ go 1.25.5
 
 require (
 	github.com/Machiel/slugify v1.0.1
+	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/ProtonMail/go-crypto v1.3.0
 	github.com/gobwas/glob v0.2.3
 	github.com/google/go-cmp v0.7.0

pkg/plugins/go.sum

@@ -2,6 +2,8 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 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/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=

pkg/plugins/ifaces.go

@@ -140,7 +140,9 @@ type Licensing interface {
 }
 
 type SignatureCalculator interface {
-	Calculate(ctx context.Context, src PluginSource, plugin FoundPlugin) (Signature, error)
+	// Calculate calculates the signature and returns both the signature and the manifest.
+	// The manifest may be nil if the plugin is unsigned or if an error occurred.
+	Calculate(ctx context.Context, src PluginSource, plugin FoundPlugin) (Signature, *PluginManifest, error)
 }
 
 type KeyStore interface {

pkg/plugins/manager/loader/loader_test.go

@@ -129,6 +129,7 @@ func TestLoader_Load(t *testing.T) {
 					Class:           plugins.ClassCore,
 					SkipHostEnvVars: true,
 					Translations:    map[string]string{},
+					LoadingStrategy: plugins.LoadingStrategyScript,
 				},
 			},
 		},
@@ -216,15 +217,33 @@ func TestLoader_Load(t *testing.T) {
 							ExtensionPoints:   []plugins.ExtensionPoint{},
 						},
 					},
-					Class:           plugins.ClassExternal,
-					Module:          "public/plugins/test-app/module.js",
-					BaseURL:         "public/plugins/test-app",
-					FS:              mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/includes-symlinks")),
+					Class:   plugins.ClassExternal,
+					Module:  "public/plugins/test-app/module.js",
+					BaseURL: "public/plugins/test-app",
+					FS:      mustNewStaticFSForTests(t, filepath.Join(parentDir, "testdata/includes-symlinks")),
+					Manifest: &plugins.PluginManifest{
+						Plugin:  "test-app",
+						Version: "1.0.0",
+						KeyID:   "7e4d0c6a708866e7",
+						Time:    1622547655175,
+						Files: map[string]string{
+							"dashboards/connections.json":  "bea86da4be970b98dc4681802ab55cdef3441dc3eb3c654cb207948d17b25303",
+							"dashboards/extra/memory.json": "7c042464941084caa91d0a9a2f188b05315a9796308a652ccdee31ca4fbcbfee",
+							"plugin.json":                  "c59a51bf6d7ecd7a99608ccb99353390c8b973672a938a0247164324005c0caf",
+							"symlink_to_txt":               "9f32c171bf78a85d5cb77a48ab44f85578ee2942a1fc9f9ec4fde194ae4ff048",
+							"text.txt":                     "9f32c171bf78a85d5cb77a48ab44f85578ee2942a1fc9f9ec4fde194ae4ff048",
+						},
+						ManifestVersion: "2.0.0",
+						SignatureType:   plugins.SignatureTypeGrafana,
+						SignedByOrg:     "grafana",
+						SignedByOrgName: "Grafana Labs",
+					},
 					Signature:       "valid",
 					SignatureType:   plugins.SignatureTypeGrafana,
 					SignatureOrg:    "Grafana Labs",
 					SkipHostEnvVars: true,
 					Translations:    map[string]string{},
+					LoadingStrategy: plugins.LoadingStrategyScript,
 				},
 			},
 		},
@@ -277,6 +296,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:       "unsigned",
 					SkipHostEnvVars: true,
 					Translations:    map[string]string{},
+					LoadingStrategy: plugins.LoadingStrategyScript,
 				},
 			},
 		},
@@ -336,6 +356,7 @@ func TestLoader_Load(t *testing.T) {
 					Signature:       plugins.SignatureStatusUnsigned,
 					SkipHostEnvVars: true,
 					Translations:    map[string]string{},
+					LoadingStrategy: plugins.LoadingStrategyScript,
 				},
 			},
 		},
@@ -434,6 +455,7 @@ func TestLoader_Load(t *testing.T) {
 					BaseURL:         "public/plugins/test-app",
 					SkipHostEnvVars: true,
 					Translations:    map[string]string{},
+					LoadingStrategy: plugins.LoadingStrategyScript,
 				},
 			},
 		},

pkg/plugins/manager/pipeline/bootstrap/bootstrap.go

@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/manager/signature"
 	"github.com/grafana/grafana/pkg/plugins/pluginassets"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 	"github.com/grafana/grafana/pkg/plugins/tracing"
 	"github.com/grafana/grafana/pkg/semconv"
 )
@@ -54,7 +55,7 @@ func New(cfg *config.PluginManagementCfg, opts Opts) *Bootstrap {
 	}
 
 	if opts.DecorateFuncs == nil {
-		opts.DecorateFuncs = DefaultDecorateFuncs(cfg)
+		opts.DecorateFuncs = DefaultDecorateFuncs(cfg, pluginscdn.ProvideService(cfg))
 	}
 
 	return &Bootstrap{

pkg/plugins/manager/pipeline/bootstrap/steps.go

@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/config"
 	"github.com/grafana/grafana/pkg/plugins/log"
 	"github.com/grafana/grafana/pkg/plugins/pluginassets"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
 )
 
 // DefaultConstructor implements the default ConstructFunc used for the Construct step of the Bootstrap stage.
@@ -28,12 +29,14 @@ func DefaultConstructFunc(cfg *config.PluginManagementCfg, signatureCalculator p
 }
 
 // DefaultDecorateFuncs are the default DecorateFuncs used for the Decorate step of the Bootstrap stage.
-func DefaultDecorateFuncs(cfg *config.PluginManagementCfg) []DecorateFunc {
+func DefaultDecorateFuncs(cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) []DecorateFunc {
 	return []DecorateFunc{
 		AppDefaultNavURLDecorateFunc,
 		TemplateDecorateFunc,
 		AppChildDecorateFunc(),
 		SkipHostEnvVarsDecorateFunc(cfg),
+		ModuleHashDecorateFunc(cfg, cdn),
+		LoadingStrategyDecorateFunc(cfg, cdn),
 	}
 }
 
@@ -48,19 +51,30 @@ func NewDefaultConstructor(cfg *config.PluginManagementCfg, signatureCalculator
 
 // Construct will calculate the plugin's signature state and create the plugin using the pluginFactoryFunc.
 func (c *DefaultConstructor) Construct(ctx context.Context, src plugins.PluginSource, bundle *plugins.FoundBundle) ([]*plugins.Plugin, error) {
-	sig, err := c.signatureCalculator.Calculate(ctx, src, bundle.Primary)
+	// Calculate signature and cache manifest
+	sig, manifest, err := c.signatureCalculator.Calculate(ctx, src, bundle.Primary)
 	if err != nil {
 		c.log.Warn("Could not calculate plugin signature state", "pluginId", bundle.Primary.JSONData.ID, "error", err)
 		return nil, err
 	}
+
 	plugin, err := c.pluginFactoryFunc(bundle, src.PluginClass(ctx), sig)
 	if err != nil {
 		c.log.Error("Could not create primary plugin base", "pluginId", bundle.Primary.JSONData.ID, "error", err)
 		return nil, err
 	}
+
+	plugin.Manifest = manifest
+
 	res := make([]*plugins.Plugin, 0, len(plugin.Children)+1)
 	res = append(res, plugin)
-	res = append(res, plugin.Children...)
+	for _, child := range plugin.Children {
+		// Child plugins use the parent's manifest
+		if child.Parent != nil && child.Parent.Manifest != nil {
+			child.Manifest = child.Parent.Manifest
+		}
+		res = append(res, child)
+	}
 	return res, nil
 }
 
@@ -145,3 +159,19 @@ func SkipHostEnvVarsDecorateFunc(cfg *config.PluginManagementCfg) DecorateFunc {
 		return p, nil
 	}
 }
+
+// ModuleHashDecorateFunc returns a DecorateFunc that calculates and sets the module hash for the plugin.
+func ModuleHashDecorateFunc(cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) DecorateFunc {
+	return func(_ context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
+		p.ModuleHash = pluginassets.CalculateModuleHash(p, cfg, cdn)
+		return p, nil
+	}
+}
+
+// LoadingStrategyDecorateFunc returns a DecorateFunc that calculates and sets the loading strategy for the plugin.
+func LoadingStrategyDecorateFunc(cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) DecorateFunc {
+	return func(_ context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
+		p.LoadingStrategy = pluginassets.CalculateLoadingStrategy(p, cfg, cdn)
+		return p, nil
+	}
+}

pkg/plugins/manager/signature/manifest.go

@@ -14,7 +14,6 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
-	"strings"
 
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
@@ -37,26 +36,6 @@ var (
 	fromSlash = filepath.FromSlash
 )
 
-// PluginManifest holds details for the file manifest
-type PluginManifest struct {
-	Plugin  string            `json:"plugin"`
-	Version string            `json:"version"`
-	KeyID   string            `json:"keyId"`
-	Time    int64             `json:"time"`
-	Files   map[string]string `json:"files"`
-
-	// V2 supported fields
-	ManifestVersion string                `json:"manifestVersion"`
-	SignatureType   plugins.SignatureType `json:"signatureType"`
-	SignedByOrg     string                `json:"signedByOrg"`
-	SignedByOrgName string                `json:"signedByOrgName"`
-	RootURLs        []string              `json:"rootUrls"`
-}
-
-func (m *PluginManifest) IsV2() bool {
-	return strings.HasPrefix(m.ManifestVersion, "2.")
-}
-
 type Signature struct {
 	kr  plugins.KeyRetriever
 	cfg *config.PluginManagementCfg
@@ -87,14 +66,14 @@ func DefaultCalculator(cfg *config.PluginManagementCfg) *Signature {
 
 // readPluginManifest attempts to read and verify the plugin manifest
 // if any error occurs or the manifest is not valid, this will return an error
-func (s *Signature) readPluginManifest(ctx context.Context, body []byte) (*PluginManifest, error) {
+func (s *Signature) readPluginManifest(ctx context.Context, body []byte) (*plugins.PluginManifest, error) {
 	block, _ := clearsign.Decode(body)
 	if block == nil {
 		return nil, errors.New("unable to decode manifest")
 	}
 
 	// Convert to a well typed object
-	var manifest PluginManifest
+	var manifest plugins.PluginManifest
 	err := json.Unmarshal(block.Plaintext, &manifest)
 	if err != nil {
 		return nil, fmt.Errorf("%v: %w", "Error parsing manifest JSON", err)
@@ -111,7 +90,7 @@ var ErrSignatureTypeUnsigned = errors.New("plugin is unsigned")
 
 // ReadPluginManifestFromFS reads the plugin manifest from the provided plugins.FS.
 // If the manifest is not found, it will return an error wrapping ErrSignatureTypeUnsigned.
-func (s *Signature) ReadPluginManifestFromFS(ctx context.Context, pfs plugins.FS) (*PluginManifest, error) {
+func (s *Signature) ReadPluginManifestFromFS(ctx context.Context, pfs plugins.FS) (*plugins.PluginManifest, error) {
 	f, err := pfs.Open("MANIFEST.txt")
 	if err != nil {
 		if errors.Is(err, plugins.ErrFileNotExist) {
@@ -140,9 +119,9 @@ func (s *Signature) ReadPluginManifestFromFS(ctx context.Context, pfs plugins.FS
 	return manifest, nil
 }
 
-func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plugin plugins.FoundPlugin) (plugins.Signature, error) {
+func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plugin plugins.FoundPlugin) (plugins.Signature, *plugins.PluginManifest, error) {
 	if defaultSignature, exists := src.DefaultSignature(ctx, plugin.JSONData.ID); exists {
-		return defaultSignature, nil
+		return defaultSignature, nil, nil
 	}
 
 	manifest, err := s.ReadPluginManifestFromFS(ctx, plugin.FS)
@@ -151,29 +130,29 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		s.log.Warn("Plugin is unsigned", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureStatusUnsigned,
-		}, nil
+		}, nil, nil
 	case err != nil:
 		s.log.Warn("Plugin signature is invalid", "id", plugin.JSONData.ID, "err", err)
 		return plugins.Signature{
 			Status: plugins.SignatureStatusInvalid,
-		}, nil
+		}, nil, nil
 	}
 
 	if !manifest.IsV2() {
 		return plugins.Signature{
 			Status: plugins.SignatureStatusInvalid,
-		}, nil
+		}, nil, nil
 	}
 
 	fsFiles, err := plugin.FS.Files()
 	if err != nil {
-		return plugins.Signature{}, fmt.Errorf("files: %w", err)
+		return plugins.Signature{}, nil, fmt.Errorf("files: %w", err)
 	}
 	if len(fsFiles) == 0 {
 		s.log.Warn("No plugin file information in directory", "pluginId", plugin.JSONData.ID)
 		return plugins.Signature{
 			Status: plugins.SignatureStatusInvalid,
-		}, nil
+		}, nil, nil
 	}
 
 	// Make sure the versions all match
@@ -181,20 +160,20 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		s.log.Debug("Plugin signature invalid because ID or Version mismatch", "pluginId", plugin.JSONData.ID, "manifestPluginId", manifest.Plugin, "pluginVersion", plugin.JSONData.Info.Version, "manifestPluginVersion", manifest.Version)
 		return plugins.Signature{
 			Status: plugins.SignatureStatusModified,
-		}, nil
+		}, nil, nil
 	}
 
 	// Validate that plugin is running within defined root URLs
 	if len(manifest.RootURLs) > 0 {
 		if match, err := urlMatch(manifest.RootURLs, s.cfg.GrafanaAppURL, manifest.SignatureType); err != nil {
 			s.log.Warn("Could not verify if root URLs match", "plugin", plugin.JSONData.ID, "rootUrls", manifest.RootURLs)
-			return plugins.Signature{}, err
+			return plugins.Signature{}, nil, err
 		} else if !match {
 			s.log.Warn("Could not find root URL that matches running application URL", "plugin", plugin.JSONData.ID,
 				"appUrl", s.cfg.GrafanaAppURL, "rootUrls", manifest.RootURLs)
 			return plugins.Signature{
 				Status: plugins.SignatureStatusInvalid,
-			}, nil
+			}, nil, nil
 		}
 	}
 
@@ -207,7 +186,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 			s.log.Debug("Plugin signature invalid", "pluginId", plugin.JSONData.ID, "error", err)
 			return plugins.Signature{
 				Status: plugins.SignatureStatusModified,
-			}, nil
+			}, nil, nil
 		}
 
 		manifestFiles[p] = struct{}{}
@@ -236,7 +215,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		s.log.Warn("The following files were not included in the signature", "plugin", plugin.JSONData.ID, "files", unsignedFiles)
 		return plugins.Signature{
 			Status: plugins.SignatureStatusModified,
-		}, nil
+		}, nil, nil
 	}
 
 	s.log.Debug("Plugin signature valid", "id", plugin.JSONData.ID)
@@ -244,7 +223,7 @@ func (s *Signature) Calculate(ctx context.Context, src plugins.PluginSource, plu
 		Status:     plugins.SignatureStatusValid,
 		Type:       manifest.SignatureType,
 		SigningOrg: manifest.SignedByOrgName,
-	}, nil
+	}, manifest, nil
 }
 
 func verifyHash(mlog log.Logger, plugin plugins.FoundPlugin, path, hash string) error {
@@ -321,7 +300,7 @@ func (r invalidFieldErr) Error() string {
 	return fmt.Sprintf("valid manifest field %s is required", r.field)
 }
 
-func (s *Signature) validateManifest(ctx context.Context, m PluginManifest, block *clearsign.Block) error {
+func (s *Signature) validateManifest(ctx context.Context, m plugins.PluginManifest, block *clearsign.Block) error {
 	if len(m.Plugin) == 0 {
 		return invalidFieldErr{field: "plugin"}
 	}

pkg/plugins/manager/signature/manifest_test.go

@@ -164,7 +164,7 @@ func TestCalculate(t *testing.T) {
 		for _, tc := range tcs {
 			basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
 			s := provideTestServiceWithConfig(&config.PluginManagementCfg{GrafanaAppURL: tc.appURL})
-			sig, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
+			sig, _, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
 				PluginClassFunc: func(ctx context.Context) plugins.Class {
 					return plugins.ClassExternal
 				},
@@ -192,7 +192,7 @@ func TestCalculate(t *testing.T) {
 
 		runningWindows = true
 		s := provideDefaultTestService()
-		sig, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
+		sig, _, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
 			PluginClassFunc: func(ctx context.Context) plugins.Class {
 				return plugins.ClassExternal
 			},
@@ -260,7 +260,7 @@ func TestCalculate(t *testing.T) {
 				require.NoError(t, err)
 				pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs)
 				require.NoError(t, err)
-				sig, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
+				sig, _, err := s.Calculate(context.Background(), &pluginfakes.FakePluginSource{
 					PluginClassFunc: func(ctx context.Context) plugins.Class {
 						return plugins.ClassExternal
 					},
@@ -396,7 +396,7 @@ func TestFSPathSeparatorFiles(t *testing.T) {
 	}
 }
 
-func fileList(manifest *PluginManifest) []string {
+func fileList(manifest *plugins.PluginManifest) []string {
 	keys := make([]string, 0, len(manifest.Files))
 	for k := range manifest.Files {
 		keys = append(keys, k)
@@ -682,52 +682,52 @@ func Test_urlMatch_private(t *testing.T) {
 func Test_validateManifest(t *testing.T) {
 	tcs := []struct {
 		name        string
-		manifest    *PluginManifest
+		manifest    *plugins.PluginManifest
 		expectedErr string
 	}{
 		{
 			name:        "Empty plugin field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.Plugin = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.Plugin = "" }),
 			expectedErr: "valid manifest field plugin is required",
 		},
 		{
 			name:        "Empty keyId field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.KeyID = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.KeyID = "" }),
 			expectedErr: "valid manifest field keyId is required",
 		},
 		{
 			name:        "Empty signedByOrg field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.SignedByOrg = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.SignedByOrg = "" }),
 			expectedErr: "valid manifest field signedByOrg is required",
 		},
 		{
 			name:        "Empty signedByOrgName field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.SignedByOrgName = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.SignedByOrgName = "" }),
 			expectedErr: "valid manifest field SignedByOrgName is required",
 		},
 		{
 			name:        "Empty signatureType field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.SignatureType = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.SignatureType = "" }),
 			expectedErr: "valid manifest field signatureType is required",
 		},
 		{
 			name:        "Invalid signatureType field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.SignatureType = "invalidSignatureType" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.SignatureType = "invalidSignatureType" }),
 			expectedErr: "valid manifest field signatureType is required",
 		},
 		{
 			name:        "Empty files field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.Files = map[string]string{} }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.Files = map[string]string{} }),
 			expectedErr: "valid manifest field files is required",
 		},
 		{
 			name:        "Empty time field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.Time = 0 }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.Time = 0 }),
 			expectedErr: "valid manifest field time is required",
 		},
 		{
 			name:        "Empty version field",
-			manifest:    createV2Manifest(t, func(m *PluginManifest) { m.Version = "" }),
+			manifest:    createV2Manifest(t, func(m *plugins.PluginManifest) { m.Version = "" }),
 			expectedErr: "valid manifest field version is required",
 		},
 	}
@@ -740,10 +740,10 @@ func Test_validateManifest(t *testing.T) {
 	}
 }
 
-func createV2Manifest(t *testing.T, cbs ...func(*PluginManifest)) *PluginManifest {
+func createV2Manifest(t *testing.T, cbs ...func(*plugins.PluginManifest)) *plugins.PluginManifest {
 	t.Helper()
 
-	m := &PluginManifest{
+	m := &plugins.PluginManifest{
 		Plugin:  "grafana-test-app",
 		Version: "2.5.3",
 		KeyID:   "7e4d0c6a708866e7",

pkg/plugins/pluginassets/loadingstrategy.go

@@ -0,0 +1,67 @@
+package pluginassets
+
+import (
+	"github.com/Masterminds/semver/v3"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
+)
+
+const (
+	CreatePluginVersionCfgKey               = "create_plugin_version"
+	CreatePluginVersionScriptSupportEnabled = "4.15.0"
+)
+
+var (
+	scriptLoadingMinSupportedVersion = semver.MustParse(CreatePluginVersionScriptSupportEnabled)
+)
+
+// CalculateLoadingStrategy calculates the loading strategy for a plugin.
+// If a plugin has plugin setting `create_plugin_version` >= 4.15.0, set loadingStrategy to "script".
+// If a plugin is not loaded via the CDN and is not Angular, set loadingStrategy to "script".
+// Otherwise, set loadingStrategy to "fetch".
+func CalculateLoadingStrategy(p *plugins.Plugin, cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) plugins.LoadingStrategy {
+	if cfg != nil && cfg.PluginSettings != nil {
+		if pCfg, ok := cfg.PluginSettings[p.ID]; ok {
+			if compatibleCreatePluginVersion(pCfg) {
+				return plugins.LoadingStrategyScript
+			}
+		}
+
+		// If the plugin has a parent
+		if p.Parent != nil {
+			// Check the parent's create_plugin_version setting
+			if pCfg, ok := cfg.PluginSettings[p.Parent.ID]; ok {
+				if compatibleCreatePluginVersion(pCfg) {
+					return plugins.LoadingStrategyScript
+				}
+			}
+
+			// Since the parent plugin is not explicitly configured as script loading compatible,
+			// If the plugin is either loaded from the CDN (via its parent) or contains Angular, we should use fetch
+			if cdnEnabled(p.Parent, cdn) || p.Angular.Detected {
+				return plugins.LoadingStrategyFetch
+			}
+		}
+	}
+
+	if !cdnEnabled(p, cdn) && !p.Angular.Detected {
+		return plugins.LoadingStrategyScript
+	}
+
+	return plugins.LoadingStrategyFetch
+}
+
+// compatibleCreatePluginVersion checks if the create_plugin_version setting is >= 4.15.0
+func compatibleCreatePluginVersion(ps map[string]string) bool {
+	if cpv, ok := ps[CreatePluginVersionCfgKey]; ok {
+		createPluginVer, err := semver.NewVersion(cpv)
+		if err != nil {
+			// Invalid semver, treat as incompatible
+			return false
+		}
+		return !createPluginVer.LessThan(scriptLoadingMinSupportedVersion)
+	}
+	return false
+}

pkg/plugins/pluginassets/loadingstrategy_test.go

@@ -0,0 +1,216 @@
+package pluginassets
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
+)
+
+// cdnFS is a simple mock FS that returns CDN type
+type cdnFS struct {
+	plugins.FS
+}
+
+func (f *cdnFS) Type() plugins.FSType {
+	return plugins.FSTypeCDN
+}
+
+func TestCalculateLoadingStrategy(t *testing.T) {
+	const pluginID = "grafana-test-datasource"
+
+	const (
+		incompatVersion = "4.14.0"
+		compatVersion   = CreatePluginVersionScriptSupportEnabled
+		futureVersion   = "5.0.0"
+	)
+
+	tcs := []struct {
+		name           string
+		pluginSettings config.PluginSettings
+		plugin         *plugins.Plugin
+		expected       plugins.LoadingStrategy
+	}{
+		{
+			name: "Expected LoadingStrategyScript when create-plugin version is compatible and plugin is not angular",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: compatVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false)),
+			expected: plugins.LoadingStrategyScript,
+		},
+		{
+			name: "Expected LoadingStrategyScript when parent create-plugin version is compatible and plugin is not angular",
+			pluginSettings: newPluginSettings("parent-datasource", map[string]string{
+				CreatePluginVersionCfgKey: compatVersion,
+			}),
+			plugin: newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), func(p *plugins.Plugin) {
+				p.Parent = &plugins.Plugin{
+					JSONData: plugins.JSONData{ID: "parent-datasource"},
+					FS:       plugins.NewFakeFS(),
+				}
+			}),
+			expected: plugins.LoadingStrategyScript,
+		},
+		{
+			name: "Expected LoadingStrategyScript when create-plugin version is future compatible and plugin is not angular",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: futureVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyScript,
+		},
+		{
+			name:           "Expected LoadingStrategyScript when create-plugin version is not provided, plugin is not angular and is not configured as CDN enabled",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{}),
+			plugin:         newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected:       plugins.LoadingStrategyScript,
+		},
+		{
+			name: "Expected LoadingStrategyScript when create-plugin version is not compatible, plugin is not angular, is not configured as CDN enabled and does not have a CDN fs",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: incompatVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withClassForLoadingStrategy(plugins.ClassExternal), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyScript,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when parent create-plugin version is not set, is configured as CDN enabled and plugin is not angular",
+			pluginSettings: config.PluginSettings{
+				"parent-datasource": {
+					"cdn": "true",
+				},
+			},
+			plugin: newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), func(p *plugins.Plugin) {
+				p.Parent = &plugins.Plugin{
+					JSONData: plugins.JSONData{ID: "parent-datasource"},
+					FS:       plugins.NewFakeFS(),
+				}
+			}),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when parent create-plugin version is not set, is configured as CDN enabled and plugin is angular",
+			pluginSettings: config.PluginSettings{
+				"parent-datasource": {
+					"cdn": "true",
+				},
+			},
+			plugin: newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(true), func(p *plugins.Plugin) {
+				p.Parent = &plugins.Plugin{
+					JSONData: plugins.JSONData{ID: "parent-datasource"},
+					FS:       plugins.NewFakeFS(),
+				}
+			}),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name:           "Expected LoadingStrategyFetch when parent create-plugin version is not set, is not configured as CDN enabled and plugin is angular",
+			pluginSettings: config.PluginSettings{},
+			plugin: newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(true), withFSForLoadingStrategy(plugins.NewFakeFS()), func(p *plugins.Plugin) {
+				p.Parent = &plugins.Plugin{
+					JSONData: plugins.JSONData{ID: "parent-datasource"},
+					FS:       plugins.NewFakeFS(),
+				}
+			}),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when create-plugin version is not compatible, plugin is not angular, and plugin is configured as CDN enabled",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				"cdn":                     "true",
+				CreatePluginVersionCfgKey: incompatVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withClassForLoadingStrategy(plugins.ClassExternal), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when create-plugin version is not compatible and plugin is angular",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: incompatVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(true), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when create-plugin version is not compatible, plugin is not angular and plugin is configured as CDN enabled",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				"cdn":                     "true",
+				CreatePluginVersionCfgKey: incompatVersion,
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyFetch when create-plugin version is not compatible, plugin is not angular and has a CDN fs",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: incompatVersion,
+			}),
+			plugin: newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withFSForLoadingStrategy(
+				&cdnFS{FS: plugins.NewFakeFS()},
+			)),
+			expected: plugins.LoadingStrategyFetch,
+		},
+		{
+			name: "Expected LoadingStrategyScript when plugin setting create-plugin version is badly formatted, plugin is not configured as CDN enabled and does not have a CDN fs",
+			pluginSettings: newPluginSettings(pluginID, map[string]string{
+				CreatePluginVersionCfgKey: "invalidSemver",
+			}),
+			plugin:   newPluginForLoadingStrategy(pluginID, withAngularForLoadingStrategy(false), withFSForLoadingStrategy(plugins.NewFakeFS())),
+			expected: plugins.LoadingStrategyScript,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg := &config.PluginManagementCfg{
+				PluginSettings: tc.pluginSettings,
+			}
+			cdn := pluginscdn.ProvideService(&config.PluginManagementCfg{
+				PluginsCDNURLTemplate: "http://cdn.example.com", // required for cdn.PluginSupported check
+				PluginSettings:        tc.pluginSettings,
+			})
+
+			got := CalculateLoadingStrategy(tc.plugin, cfg, cdn)
+			assert.Equal(t, tc.expected, got, "unexpected loading strategy")
+		})
+	}
+}
+
+func newPluginForLoadingStrategy(pluginID string, cbs ...func(*plugins.Plugin)) *plugins.Plugin {
+	p := &plugins.Plugin{
+		JSONData: plugins.JSONData{
+			ID: pluginID,
+		},
+	}
+	for _, cb := range cbs {
+		cb(p)
+	}
+	return p
+}
+
+func withAngularForLoadingStrategy(angular bool) func(*plugins.Plugin) {
+	return func(p *plugins.Plugin) {
+		p.Angular = plugins.AngularMeta{Detected: angular}
+	}
+}
+
+func withFSForLoadingStrategy(fs plugins.FS) func(*plugins.Plugin) {
+	return func(p *plugins.Plugin) {
+		p.FS = fs
+	}
+}
+
+func withClassForLoadingStrategy(class plugins.Class) func(*plugins.Plugin) {
+	return func(p *plugins.Plugin) {
+		p.Class = class
+	}
+}
+
+func newPluginSettings(pluginID string, kv map[string]string) config.PluginSettings {
+	return config.PluginSettings{
+		pluginID: kv,
+	}
+}

pkg/plugins/pluginassets/modulehash.go

@@ -0,0 +1,90 @@
+package pluginassets
+
+import (
+	"encoding/base64"
+	"encoding/hex"
+	"path"
+	"path/filepath"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
+)
+
+// CalculateModuleHash calculates the module.js SHA256 hash for a plugin in the format expected by the browser for SRI checks.
+// The module hash is read from the plugin's cached manifest.
+// For nested plugins, the module hash is read from the root parent plugin's manifest.
+// If the plugin is unsigned or not a CDN plugin, an empty string is returned.
+func CalculateModuleHash(p *plugins.Plugin, cfg *config.PluginManagementCfg, cdn *pluginscdn.Service) string {
+	if cfg == nil || !cfg.Features.SriChecksEnabled {
+		return ""
+	}
+
+	if !p.Signature.IsValid() {
+		return ""
+	}
+
+	rootParent := findRootParent(p)
+	if rootParent.Manifest == nil {
+		return ""
+	}
+
+	if !rootParent.Manifest.IsV2() {
+		return ""
+	}
+
+	if !cdnEnabled(rootParent, cdn) {
+		return ""
+	}
+
+	modulePath := getModulePathInManifest(p, rootParent)
+	moduleHash, ok := rootParent.Manifest.Files[modulePath]
+	if !ok {
+		return ""
+	}
+
+	return convertHashForSRI(moduleHash)
+}
+
+// findRootParent returns the root parent plugin (the one that contains the manifest).
+// For non-nested plugins, it returns the plugin itself.
+func findRootParent(p *plugins.Plugin) *plugins.Plugin {
+	root := p
+	for root.Parent != nil {
+		root = root.Parent
+	}
+	return root
+}
+
+// getModulePathInManifest returns the path to module.js as it appears in the manifest.
+// For nested plugins, this is the relative path from the root parent to the plugin's module.js.
+// For non-nested plugins, this is simply "module.js".
+func getModulePathInManifest(p *plugins.Plugin, rootParent *plugins.Plugin) string {
+	if p == rootParent {
+		return "module.js"
+	}
+
+	// Calculate the relative path from root parent to this plugin
+	relPath, err := rootParent.FS.Rel(p.FS.Base())
+	if err != nil {
+		return ""
+	}
+
+	// MANIFEST.txt uses forward slashes as path separators
+	pluginRootPath := filepath.ToSlash(relPath)
+	return path.Join(pluginRootPath, "module.js")
+}
+
+// convertHashForSRI takes a SHA256 hash string and returns it as expected by the browser for SRI checks.
+func convertHashForSRI(h string) string {
+	hb, err := hex.DecodeString(h)
+	if err != nil {
+		return ""
+	}
+	return "sha256-" + base64.StdEncoding.EncodeToString(hb)
+}
+
+// cdnEnabled checks if a plugin is loaded via CDN
+func cdnEnabled(p *plugins.Plugin, cdn *pluginscdn.Service) bool {
+	return p.FS.Type().CDN() || cdn.PluginSupported(p.ID)
+}

pkg/plugins/pluginassets/modulehash_test.go

@@ -0,0 +1,356 @@
+package pluginassets
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/config"
+	"github.com/grafana/grafana/pkg/plugins/pluginscdn"
+)
+
+func TestConvertHashForSRI(t *testing.T) {
+	for _, tc := range []struct {
+		hash    string
+		expHash string
+		expErr  bool
+	}{
+		{
+			hash:    "ddfcb449445064e6c39f0c20b15be3cb6a55837cf4781df23d02de005f436811",
+			expHash: "sha256-3fy0SURQZObDnwwgsVvjy2pVg3z0eB3yPQLeAF9DaBE=",
+		},
+		{
+			hash:   "not-a-valid-hash",
+			expErr: true,
+		},
+	} {
+		t.Run(tc.hash, func(t *testing.T) {
+			r := convertHashForSRI(tc.hash)
+			if tc.expErr {
+				// convertHashForSRI returns empty string on error
+				require.Empty(t, r)
+			} else {
+				require.Equal(t, tc.expHash, r)
+			}
+		})
+	}
+}
+
+func TestCalculateModuleHash(t *testing.T) {
+	const (
+		pluginID       = "grafana-test-datasource"
+		parentPluginID = "grafana-test-app"
+	)
+
+	// Helper to create a plugin with manifest
+	createPluginWithManifest := func(id string, manifest *plugins.PluginManifest, parent *plugins.Plugin) *plugins.Plugin {
+		p := &plugins.Plugin{
+			JSONData: plugins.JSONData{
+				ID: id,
+			},
+			Signature: plugins.SignatureStatusValid,
+			Manifest:  manifest,
+		}
+		if parent != nil {
+			p.Parent = parent
+		}
+		return p
+	}
+
+	// Helper to create a v2 manifest
+	createV2Manifest := func(files map[string]string) *plugins.PluginManifest {
+		return &plugins.PluginManifest{
+			ManifestVersion: "2.0.0",
+			Files:           files,
+		}
+	}
+
+	for _, tc := range []struct {
+		name          string
+		plugin        *plugins.Plugin
+		cfg           *config.PluginManagementCfg
+		cdn           *pluginscdn.Service
+		expModuleHash string
+	}{
+		{
+			name: "should return empty string when cfg is nil",
+			plugin: createPluginWithManifest(pluginID, createV2Manifest(map[string]string{
+				"module.js": "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03",
+			}), nil),
+			cfg:           nil,
+			cdn:           nil,
+			expModuleHash: "",
+		},
+		{
+			name: "should return empty string when SRI checks are disabled",
+			plugin: createPluginWithManifest(pluginID, createV2Manifest(map[string]string{
+				"module.js": "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03",
+			}), nil),
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: false}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "should return empty string for unsigned plugin",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusUnsigned,
+				Manifest:  createV2Manifest(map[string]string{"module.js": "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03"}),
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "should return module hash for valid plugin",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest:  createV2Manifest(map[string]string{"module.js": "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03"}),
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid")),
+			},
+			cfg: &config.PluginManagementCfg{
+				PluginsCDNURLTemplate: "https://cdn.example.com",
+				Features:              config.Features{SriChecksEnabled: true},
+				PluginSettings: config.PluginSettings{
+					pluginID: {"cdn": "true"},
+				},
+			},
+			cdn: func() *pluginscdn.Service {
+				cfg := &config.PluginManagementCfg{
+					PluginsCDNURLTemplate: "https://cdn.example.com",
+					PluginSettings: config.PluginSettings{
+						pluginID: {"cdn": "true"},
+					},
+				}
+				return pluginscdn.ProvideService(cfg)
+			}(),
+			expModuleHash: "sha256-WJG1tSLV3whtD/CxEPvZ0hu0/HFjrzTQgoai6Eb2vgM=",
+		},
+		{
+			name: "should return empty string when manifest is nil",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest:  nil,
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "should return empty string for v1 manifest",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest: &plugins.PluginManifest{
+					ManifestVersion: "1.0.0",
+					Files:           map[string]string{"module.js": "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03"},
+				},
+				FS: plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "should return empty string when module.js is not in manifest",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest:  createV2Manifest(map[string]string{"plugin.json": "129fab4e0584d18c778ebdfa5fe1a68edf2e5c5aeb8290b2c68182c857cb59f8"}),
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "missing module.js entry from MANIFEST.txt should not return module hash",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest:  createV2Manifest(map[string]string{"plugin.json": "129fab4e0584d18c778ebdfa5fe1a68edf2e5c5aeb8290b2c68182c857cb59f8"}),
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-no-module-js")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			name: "signed status but missing MANIFEST.txt should not return module hash",
+			plugin: &plugins.Plugin{
+				JSONData:  plugins.JSONData{ID: pluginID},
+				Signature: plugins.SignatureStatusValid,
+				Manifest:  nil,
+				FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-no-manifest-txt")),
+			},
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+		{
+			// parentPluginID           (/)
+			// └── pluginID             (/datasource)
+			name: "nested plugin should return module hash from parent MANIFEST.txt",
+			plugin: func() *plugins.Plugin {
+				parent := &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: parentPluginID},
+					Signature: plugins.SignatureStatusValid,
+					Manifest: createV2Manifest(map[string]string{
+						"module.js":            "266c19bc148b22ddef2a288fc5f8f40855bda22ccf60be53340b4931e469ae2a",
+						"datasource/module.js": "04d70db091d96c4775fb32ba5a8f84cc22893eb43afdb649726661d4425c6711",
+					}),
+					FS: plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested")),
+				}
+				return &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: pluginID},
+					Signature: plugins.SignatureStatusValid,
+					Parent:    parent,
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested", "datasource")),
+				}
+			}(),
+			cfg: &config.PluginManagementCfg{
+				PluginsCDNURLTemplate: "https://cdn.example.com",
+				Features:              config.Features{SriChecksEnabled: true},
+				PluginSettings: config.PluginSettings{
+					pluginID:       {"cdn": "true"},
+					parentPluginID: {"cdn": "true"},
+				},
+			},
+			cdn: func() *pluginscdn.Service {
+				cfg := &config.PluginManagementCfg{
+					PluginsCDNURLTemplate: "https://cdn.example.com",
+					PluginSettings: config.PluginSettings{
+						pluginID:       {"cdn": "true"},
+						parentPluginID: {"cdn": "true"},
+					},
+				}
+				return pluginscdn.ProvideService(cfg)
+			}(),
+			expModuleHash: "sha256-BNcNsJHZbEd1+zK6Wo+EzCKJPrQ6/bZJcmZh1EJcZxE=",
+		},
+		{
+			// parentPluginID           (/)
+			// └── pluginID             (/panels/one)
+			name: "nested plugin deeper than one subfolder should return module hash from parent MANIFEST.txt",
+			plugin: func() *plugins.Plugin {
+				parent := &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: parentPluginID},
+					Signature: plugins.SignatureStatusValid,
+					Manifest: createV2Manifest(map[string]string{
+						"module.js":            "266c19bc148b22ddef2a288fc5f8f40855bda22ccf60be53340b4931e469ae2a",
+						"panels/one/module.js": "cbd1ac2284645a0e1e9a8722a729f5bcdd2b831222728709c6360beecdd6143f",
+						"datasource/module.js": "04d70db091d96c4775fb32ba5a8f84cc22893eb43afdb649726661d4425c6711",
+					}),
+					FS: plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested")),
+				}
+				return &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: pluginID},
+					Signature: plugins.SignatureStatusValid,
+					Parent:    parent,
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested", "panels", "one")),
+				}
+			}(),
+			cfg: &config.PluginManagementCfg{
+				PluginsCDNURLTemplate: "https://cdn.example.com",
+				Features:              config.Features{SriChecksEnabled: true},
+				PluginSettings: config.PluginSettings{
+					pluginID:       {"cdn": "true"},
+					parentPluginID: {"cdn": "true"},
+				},
+			},
+			cdn: func() *pluginscdn.Service {
+				cfg := &config.PluginManagementCfg{
+					PluginsCDNURLTemplate: "https://cdn.example.com",
+					PluginSettings: config.PluginSettings{
+						pluginID:       {"cdn": "true"},
+						parentPluginID: {"cdn": "true"},
+					},
+				}
+				return pluginscdn.ProvideService(cfg)
+			}(),
+			expModuleHash: "sha256-y9GsIoRkWg4emocipyn1vN0rgxIicocJxjYL7s3WFD8=",
+		},
+		{
+			// grand-parent-app         (/)
+			// ├── parent-datasource    (/datasource)
+			// │   └── child-panel      (/datasource/panels/one)
+			name: "nested plugin of a nested plugin should return module hash from grandparent MANIFEST.txt",
+			plugin: func() *plugins.Plugin {
+				grandparent := &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: "grand-parent-app"},
+					Signature: plugins.SignatureStatusValid,
+					Manifest: createV2Manifest(map[string]string{
+						"module.js":                       "266c19bc148b22ddef2a288fc5f8f40855bda22ccf60be53340b4931e469ae2a",
+						"datasource/module.js":            "04d70db091d96c4775fb32ba5a8f84cc22893eb43afdb649726661d4425c6711",
+						"datasource/panels/one/module.js": "cbd1ac2284645a0e1e9a8722a729f5bcdd2b831222728709c6360beecdd6143f",
+					}),
+					FS: plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-deeply-nested")),
+				}
+				parent := &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: "parent-datasource"},
+					Signature: plugins.SignatureStatusValid,
+					Parent:    grandparent,
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-deeply-nested", "datasource")),
+				}
+				return &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: "child-panel"},
+					Signature: plugins.SignatureStatusValid,
+					Parent:    parent,
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-deeply-nested", "datasource", "panels", "one")),
+				}
+			}(),
+			cfg: &config.PluginManagementCfg{
+				PluginsCDNURLTemplate: "https://cdn.example.com",
+				Features:              config.Features{SriChecksEnabled: true},
+				PluginSettings: config.PluginSettings{
+					"child-panel":       {"cdn": "true"},
+					"parent-datasource": {"cdn": "true"},
+					"grand-parent-app":  {"cdn": "true"},
+				},
+			},
+			cdn: func() *pluginscdn.Service {
+				cfg := &config.PluginManagementCfg{
+					PluginsCDNURLTemplate: "https://cdn.example.com",
+					PluginSettings: config.PluginSettings{
+						"child-panel":       {"cdn": "true"},
+						"parent-datasource": {"cdn": "true"},
+						"grand-parent-app":  {"cdn": "true"},
+					},
+				}
+				return pluginscdn.ProvideService(cfg)
+			}(),
+			expModuleHash: "sha256-y9GsIoRkWg4emocipyn1vN0rgxIicocJxjYL7s3WFD8=",
+		},
+		{
+			name: "nested plugin should not return module hash when parent manifest is nil",
+			plugin: func() *plugins.Plugin {
+				parent := &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: parentPluginID},
+					Signature: plugins.SignatureStatusValid,
+					Manifest:  nil, // Parent has no manifest
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested")),
+				}
+				return &plugins.Plugin{
+					JSONData:  plugins.JSONData{ID: pluginID},
+					Signature: plugins.SignatureStatusValid,
+					Parent:    parent,
+					FS:        plugins.NewLocalFS(filepath.Join("testdata", "module-hash-valid-nested", "panels", "one")),
+				}
+			}(),
+			cfg:           &config.PluginManagementCfg{Features: config.Features{SriChecksEnabled: true}},
+			cdn:           pluginscdn.ProvideService(&config.PluginManagementCfg{}),
+			expModuleHash: "",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			result := CalculateModuleHash(tc.plugin, tc.cfg, tc.cdn)
+			require.Equal(t, tc.expModuleHash, result)
+		})
+	}
+}

pkg/plugins/plugins.go

@@ -40,6 +40,7 @@ type Plugin struct {
 	Pinned          bool
 
 	// Signature fields
+	Manifest      *PluginManifest
 	Signature     SignatureStatus
 	SignatureType SignatureType
 	SignatureOrg  string
@@ -48,8 +49,10 @@ type Plugin struct {
 	Error         *Error
 
 	// SystemJS fields
-	Module  string
-	BaseURL string
+	Module          string
+	ModuleHash      string
+	LoadingStrategy LoadingStrategy
+	BaseURL         string
 
 	Angular AngularMeta
 
@@ -532,3 +535,24 @@ func (pt Type) IsValid() bool {
 	}
 	return false
 }
+
+// PluginManifest holds details for the file manifest
+type PluginManifest struct {
+	Plugin  string            `json:"plugin"`
+	Version string            `json:"version"`
+	KeyID   string            `json:"keyId"`
+	Time    int64             `json:"time"`
+	Files   map[string]string `json:"files"`
+
+	// V2 supported fields
+	ManifestVersion string        `json:"manifestVersion"`
+	SignatureType   SignatureType `json:"signatureType"`
+	SignedByOrg     string        `json:"signedByOrg"`
+	SignedByOrgName string        `json:"signedByOrgName"`
+	RootURLs        []string      `json:"rootUrls"`
+}
+
+// IsV2 returns true if the manifest is version 2.x
+func (m *PluginManifest) IsV2() bool {
+	return strings.HasPrefix(m.ManifestVersion, "2.")
+}

pkg/registry/apis/datasource/converter.go

@@ -42,7 +42,7 @@ func (r *converter) asDataSource(ds *datasources.DataSource) (*datasourceV0.Data
 			Generation: int64(ds.Version),
 		},
 		Spec:   datasourceV0.UnstructuredSpec{},
-		Secure: ToInlineSecureValues("", ds.UID, maps.Keys(ds.SecureJsonData)),
+		Secure: ToInlineSecureValues(ds.Type, ds.UID, maps.Keys(ds.SecureJsonData)),
 	}
 	obj.UID = gapiutil.CalculateClusterWideUID(obj)
 	obj.Spec.SetTitle(ds.Name).
@@ -82,11 +82,18 @@ func (r *converter) asDataSource(ds *datasources.DataSource) (*datasourceV0.Data
 
 // ToInlineSecureValues converts secure json into InlineSecureValues with reference names
 // The names are predictable and can be used while we implement dual writing for secrets
-func ToInlineSecureValues(_ string, dsUID string, keys iter.Seq[string]) common.InlineSecureValues {
+func ToInlineSecureValues(dsType string, dsUID string, keys iter.Seq[string]) common.InlineSecureValues {
 	values := make(common.InlineSecureValues)
 	for k := range keys {
+		h := sha256.New()
+		h.Write([]byte(dsType)) // plugin id
+		h.Write([]byte("|"))
+		h.Write([]byte(dsUID)) // unique identifier
+		h.Write([]byte("|"))
+		h.Write([]byte(k)) // property name
+		n := hex.EncodeToString(h.Sum(nil))
 		values[k] = common.InlineSecureValue{
-			Name: getLegacySecureValueName(dsUID, k),
+			Name: "ds-" + n[0:10], // predictable name for dual writing
 		}
 	}
 	if len(values) == 0 {
@@ -95,15 +102,6 @@ func ToInlineSecureValues(_ string, dsUID string, keys iter.Seq[string]) common.
 	return values
 }
 
-func getLegacySecureValueName(dsUID string, key string) string {
-	h := sha256.New()
-	h.Write([]byte(dsUID)) // unique identifier
-	h.Write([]byte("|"))
-	h.Write([]byte(key)) // property name
-	n := hex.EncodeToString(h.Sum(nil))
-	return "ds-" + n[0:10] // predictable name for dual writing
-}
-
 func (r *converter) toAddCommand(ds *datasourceV0.DataSource) (*datasources.AddDataSourceCommand, error) {
 	if r.group != "" && ds.APIVersion != "" && !strings.HasPrefix(ds.APIVersion, r.group) {
 		return nil, fmt.Errorf("expecting APIGroup: %s", r.group)

pkg/registry/apis/datasource/legacy_store.go

@@ -11,11 +11,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/rest"
 
-	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
-	"github.com/grafana/grafana/pkg/storage/legacysql/dualwrite"
 )
 
 var (
@@ -92,20 +90,6 @@ func (s *legacyStorage) Create(ctx context.Context, obj runtime.Object, createVa
 	if !ok {
 		return nil, fmt.Errorf("expected a datasource object")
 	}
-
-	// Verify the secure value commands
-	for _, v := range ds.Secure {
-		if v.Create.IsZero() {
-			return nil, fmt.Errorf("secure values must use create when creating a new datasource")
-		}
-		if v.Remove {
-			return nil, fmt.Errorf("secure values can not use remove when creating a new datasource")
-		}
-		if v.Name != "" {
-			return nil, fmt.Errorf("secure values can not specify a name when creating a new datasource")
-		}
-	}
-
 	return s.datasources.CreateDataSource(ctx, ds)
 }
 
@@ -138,26 +122,6 @@ func (s *legacyStorage) Update(ctx context.Context, name string, objInfo rest.Up
 		return nil, false, fmt.Errorf("expected a datasource object (old)")
 	}
 
-	// Expose any secure value changes to the dual writer
-	var secureChanges common.InlineSecureValues
-	for k, v := range ds.Secure {
-		if v.Remove || v.Create != "" {
-			if secureChanges == nil {
-				secureChanges = make(common.InlineSecureValues)
-			}
-			secureChanges[k] = v
-			dualwrite.SetUpdatedSecureValues(ctx, ds.Secure)
-			continue
-		}
-
-		// The legacy store must use fixed names generated by the internal system
-		// we can not support external shared secrets when using the SQL backing for datasources
-		validName := getLegacySecureValueName(name, k)
-		if v.Name != validName {
-			return nil, false, fmt.Errorf("invalid secure value name %q, expected %q", v.Name, validName)
-		}
-	}
-
 	// Keep all the old secure values
 	if len(oldDS.Secure) > 0 {
 		for k, v := range oldDS.Secure {

pkg/registry/apis/datasource/register.go

@@ -30,7 +30,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apiserver/builder"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/storage/unified/apistore"
 	"github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds"
 )
 
@@ -103,10 +102,10 @@ func RegisterAPIService(
 			datasources.GetDatasourceProvider(pluginJSON),
 			contextProvider,
 			accessControl,
-			//nolint:staticcheck // not yet migrated to OpenFeature
 			DataSourceAPIBuilderConfig{
+				//nolint:staticcheck // not yet migrated to OpenFeature
 				LoadQueryTypes: features.IsEnabledGlobally(featuremgmt.FlagDatasourceQueryTypes),
-				UseDualWriter:  features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs),
+				UseDualWriter:  false,
 			},
 		)
 		if err != nil {
@@ -225,12 +224,6 @@ func (b *DataSourceAPIBuilder) AllowedV0Alpha1Resources() []string {
 }
 
 func (b *DataSourceAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserver.APIGroupInfo, opts builder.APIGroupOptions) error {
-	opts.StorageOptsRegister(b.datasourceResourceInfo.GroupResource(), apistore.StorageOptions{
-		EnableFolderSupport: false,
-
-		Scheme: opts.Scheme, // allows for generic Type applied to multiple groups
-	})
-
 	storage := map[string]rest.Storage{}
 
 	// Register the raw datasource connection

pkg/registry/apis/datasource/testdata/convert-dto-testdata-to-resource.json

@@ -33,7 +33,7 @@
   },
   "secure": {
     "password": {
-      "name": "ds-0d27eff323"
+      "name": "ds-d5c1b093af"
     }
   }
 }

pkg/registry/apis/datasource/testdata/convert-resource-full-to-cmd-update-roundtrip.json

@@ -22,10 +22,10 @@
   },
   "secure": {
     "extra": {
-      "name": "ds-6ed1b76e5d"
+      "name": "ds-bb8b5d8b32"
     },
     "password": {
-      "name": "ds-edc8fde0ac"
+      "name": "ds-973a1eb29d"
     }
   }
 }

pkg/registry/apis/secret/inline/inline_secure_value.go

@@ -60,7 +60,7 @@ func (s *LocalInlineSecureValueService) CanReference(ctx context.Context, owner
 	}
 
 	if owner.APIGroup == "" || owner.APIVersion == "" || owner.Kind == "" || owner.Name == "" {
-		return fmt.Errorf("owner reference must have a valid API group, API version, kind and name [CanReference]")
+		return fmt.Errorf("owner reference must have a valid API group, API version, kind and name")
 	}
 
 	if len(names) == 0 {
@@ -167,7 +167,7 @@ func (s *LocalInlineSecureValueService) verifyOwnerAndAuth(ctx context.Context,
 	}
 
 	if owner.Namespace == "" || owner.APIGroup == "" || owner.APIVersion == "" || owner.Kind == "" || owner.Name == "" {
-		return nil, fmt.Errorf("owner reference must have a valid API group, API version, kind, namespace and name [verifyOwnerAndAuth:%+v]", owner)
+		return nil, fmt.Errorf("owner reference must have a valid API group, API version, kind, namespace and name")
 	}
 
 	return authInfo, nil

pkg/registry/apps/plugins/register.go

@@ -14,7 +14,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/apiserver/appinstaller"
 	grafanaauthorizer "github.com/grafana/grafana/pkg/services/apiserver/auth/authorizer"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 )
 
@@ -35,7 +34,6 @@ func ProvideAppInstaller(
 	cfgProvider configprovider.ConfigProvider,
 	restConfigProvider apiserver.RestConfigProvider,
 	pluginStore pluginstore.Store,
-	pluginAssetsService *pluginassets.Service,
 	accessControlService accesscontrol.Service, accessClient authlib.AccessClient,
 	features featuremgmt.FeatureToggles,
 ) (*AppInstaller, error) {
@@ -46,7 +44,7 @@ func ProvideAppInstaller(
 		}
 	}
 
-	localProvider := meta.NewLocalProvider(pluginStore, pluginAssetsService)
+	localProvider := meta.NewLocalProvider(pluginStore)
 	metaProviderManager := meta.NewProviderManager(localProvider)
 	authorizer := grafanaauthorizer.NewResourceAuthorizer(accessClient)
 	i, err := pluginsapp.ProvideAppInstaller(authorizer, metaProviderManager)

pkg/server/wire_gen.go

@@ -187,7 +187,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/managedplugins"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pipeline"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
-	pluginassets2 "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginassets"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginchecker"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginconfig"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
@@ -376,7 +375,8 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	keyretrieverService := keyretriever.ProvideService(keyRetriever)
 	signatureSignature := signature.ProvideService(pluginManagementCfg, keyretrieverService)
 	localProvider := pluginassets.NewLocalProvider()
-	bootstrap := pipeline.ProvideBootstrapStage(pluginManagementCfg, signatureSignature, localProvider)
+	pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg)
+	bootstrap := pipeline.ProvideBootstrapStage(pluginManagementCfg, signatureSignature, localProvider, pluginscdnService)
 	unsignedPluginAuthorizer := signature.ProvideOSSAuthorizer(pluginManagementCfg)
 	validation := signature.ProvideValidatorService(unsignedPluginAuthorizer)
 	angularpatternsstoreService := angularpatternsstore.ProvideService(kvStore)
@@ -714,8 +714,6 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	if err != nil {
 		return nil, err
 	}
-	pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg)
-	pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, signatureSignature, pluginstoreService)
 	avatarCacheServer := avatar.ProvideAvatarCacheServer(cfg)
 	prefService := prefimpl.ProvideService(sqlStore, cfg)
 	dashboardPermissionsService, err := ossaccesscontrol.ProvideDashboardPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, dashboardService, folderimplService, acimplService, teamService, userService, actionSetService, dashboardServiceImpl, eventualRestConfigProvider)
@@ -753,7 +751,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	}
 	idimplService := idimpl.ProvideService(cfg, localSigner, remoteCache, authnService, registerer, tracer)
 	verifier := userimpl.ProvideVerifier(cfg, userService, tempuserService, notificationService, idimplService)
-	httpServer, err := api.ProvideHTTPServer(apiOpts, cfg, routeRegisterImpl, inProcBus, renderingService, ossLicensingService, hooksService, cacheService, sqlStore, ossDataSourceRequestValidator, pluginstoreService, service14, pluginstoreService, middlewareHandler, pluginerrsStore, pluginInstaller, ossImpl, cacheServiceImpl, userAuthTokenService, cleanUpService, shortURLService, queryHistoryService, correlationsService, remoteCache, provisioningServiceImpl, accessControl, dataSourceProxyService, searchSearchService, grafanaLive, gateway, plugincontextProvider, contexthandlerContextHandler, logger, featureToggles, alertNG, libraryPanelService, libraryElementService, quotaService, socialService, tracingService, serviceService, grafanaService, pluginsService, ossService, service15, queryServiceImpl, filestoreService, serviceAccountsProxy, pluginassetsService, authinfoimplService, storageService, notificationService, dashboardService, dashboardProvisioningService, folderimplService, ossProvider, serviceImpl, service13, avatarCacheServer, prefService, folderPermissionsService, dashboardPermissionsService, dashverService, starService, csrfCSRF, managedpluginsNoop, playlistService, apikeyService, kvStore, secretsMigrator, secretsService, secretMigrationProviderImpl, secretsKVStore, apiApi, userService, tempuserService, loginattemptimplService, orgService, deletionService, teamService, acimplService, navtreeService, repositoryImpl, tagimplService, searchHTTPService, oauthtokenService, statsService, authnService, pluginscdnService, gatherer, apiAPI, registerer, eventualRestConfigProvider, anonDeviceService, verifier, preinstallImpl)
+	httpServer, err := api.ProvideHTTPServer(apiOpts, cfg, routeRegisterImpl, inProcBus, renderingService, ossLicensingService, hooksService, cacheService, sqlStore, ossDataSourceRequestValidator, pluginstoreService, service14, pluginstoreService, middlewareHandler, pluginerrsStore, pluginInstaller, ossImpl, cacheServiceImpl, userAuthTokenService, cleanUpService, shortURLService, queryHistoryService, correlationsService, remoteCache, provisioningServiceImpl, accessControl, dataSourceProxyService, searchSearchService, grafanaLive, gateway, plugincontextProvider, contexthandlerContextHandler, logger, featureToggles, alertNG, libraryPanelService, libraryElementService, quotaService, socialService, tracingService, serviceService, grafanaService, pluginsService, ossService, service15, queryServiceImpl, filestoreService, serviceAccountsProxy, authinfoimplService, storageService, notificationService, dashboardService, dashboardProvisioningService, folderimplService, ossProvider, serviceImpl, service13, avatarCacheServer, prefService, folderPermissionsService, dashboardPermissionsService, dashverService, starService, csrfCSRF, managedpluginsNoop, playlistService, apikeyService, kvStore, secretsMigrator, secretsService, secretMigrationProviderImpl, secretsKVStore, apiApi, userService, tempuserService, loginattemptimplService, orgService, deletionService, teamService, acimplService, navtreeService, repositoryImpl, tagimplService, searchHTTPService, oauthtokenService, statsService, authnService, pluginscdnService, gatherer, apiAPI, registerer, eventualRestConfigProvider, anonDeviceService, verifier, preinstallImpl)
 	if err != nil {
 		return nil, err
 	}
@@ -786,7 +784,7 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api
 	if err != nil {
 		return nil, err
 	}
-	appInstaller, err := plugins.ProvideAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, pluginassetsService, acimplService, accessClient, featureToggles)
+	appInstaller, err := plugins.ProvideAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, acimplService, accessClient, featureToggles)
 	if err != nil {
 		return nil, err
 	}
@@ -1042,7 +1040,8 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	keyretrieverService := keyretriever.ProvideService(keyRetriever)
 	signatureSignature := signature.ProvideService(pluginManagementCfg, keyretrieverService)
 	localProvider := pluginassets.NewLocalProvider()
-	bootstrap := pipeline.ProvideBootstrapStage(pluginManagementCfg, signatureSignature, localProvider)
+	pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg)
+	bootstrap := pipeline.ProvideBootstrapStage(pluginManagementCfg, signatureSignature, localProvider, pluginscdnService)
 	unsignedPluginAuthorizer := signature.ProvideOSSAuthorizer(pluginManagementCfg)
 	validation := signature.ProvideValidatorService(unsignedPluginAuthorizer)
 	angularpatternsstoreService := angularpatternsstore.ProvideService(kvStore)
@@ -1382,8 +1381,6 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	if err != nil {
 		return nil, err
 	}
-	pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg)
-	pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, signatureSignature, pluginstoreService)
 	avatarCacheServer := avatar.ProvideAvatarCacheServer(cfg)
 	prefService := prefimpl.ProvideService(sqlStore, cfg)
 	dashboardPermissionsService, err := ossaccesscontrol.ProvideDashboardPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, dashboardService, folderimplService, acimplService, teamService, userService, actionSetService, dashboardServiceImpl, eventualRestConfigProvider)
@@ -1421,7 +1418,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	}
 	idimplService := idimpl.ProvideService(cfg, localSigner, remoteCache, authnService, registerer, tracer)
 	verifier := userimpl.ProvideVerifier(cfg, userService, tempuserService, notificationServiceMock, idimplService)
-	httpServer, err := api.ProvideHTTPServer(apiOpts, cfg, routeRegisterImpl, inProcBus, renderingService, ossLicensingService, hooksService, cacheService, sqlStore, ossDataSourceRequestValidator, pluginstoreService, service14, pluginstoreService, middlewareHandler, pluginerrsStore, pluginInstaller, ossImpl, cacheServiceImpl, userAuthTokenService, cleanUpService, shortURLService, queryHistoryService, correlationsService, remoteCache, provisioningServiceImpl, accessControl, dataSourceProxyService, searchSearchService, grafanaLive, gateway, plugincontextProvider, contexthandlerContextHandler, logger, featureToggles, alertNG, libraryPanelService, libraryElementService, quotaService, socialService, tracingService, serviceService, grafanaService, pluginsService, ossService, service15, queryServiceImpl, filestoreService, serviceAccountsProxy, pluginassetsService, authinfoimplService, storageService, notificationServiceMock, dashboardService, dashboardProvisioningService, folderimplService, ossProvider, serviceImpl, service13, avatarCacheServer, prefService, folderPermissionsService, dashboardPermissionsService, dashverService, starService, csrfCSRF, managedpluginsNoop, playlistService, apikeyService, kvStore, secretsMigrator, secretsService, secretMigrationProviderImpl, secretsKVStore, apiApi, userService, tempuserService, loginattemptimplService, orgService, deletionService, teamService, acimplService, navtreeService, repositoryImpl, tagimplService, searchHTTPService, oauthtokentestService, statsService, authnService, pluginscdnService, gatherer, apiAPI, registerer, eventualRestConfigProvider, anonDeviceService, verifier, preinstallImpl)
+	httpServer, err := api.ProvideHTTPServer(apiOpts, cfg, routeRegisterImpl, inProcBus, renderingService, ossLicensingService, hooksService, cacheService, sqlStore, ossDataSourceRequestValidator, pluginstoreService, service14, pluginstoreService, middlewareHandler, pluginerrsStore, pluginInstaller, ossImpl, cacheServiceImpl, userAuthTokenService, cleanUpService, shortURLService, queryHistoryService, correlationsService, remoteCache, provisioningServiceImpl, accessControl, dataSourceProxyService, searchSearchService, grafanaLive, gateway, plugincontextProvider, contexthandlerContextHandler, logger, featureToggles, alertNG, libraryPanelService, libraryElementService, quotaService, socialService, tracingService, serviceService, grafanaService, pluginsService, ossService, service15, queryServiceImpl, filestoreService, serviceAccountsProxy, authinfoimplService, storageService, notificationServiceMock, dashboardService, dashboardProvisioningService, folderimplService, ossProvider, serviceImpl, service13, avatarCacheServer, prefService, folderPermissionsService, dashboardPermissionsService, dashverService, starService, csrfCSRF, managedpluginsNoop, playlistService, apikeyService, kvStore, secretsMigrator, secretsService, secretMigrationProviderImpl, secretsKVStore, apiApi, userService, tempuserService, loginattemptimplService, orgService, deletionService, teamService, acimplService, navtreeService, repositoryImpl, tagimplService, searchHTTPService, oauthtokentestService, statsService, authnService, pluginscdnService, gatherer, apiAPI, registerer, eventualRestConfigProvider, anonDeviceService, verifier, preinstallImpl)
 	if err != nil {
 		return nil, err
 	}
@@ -1454,7 +1451,7 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac
 	if err != nil {
 		return nil, err
 	}
-	appInstaller, err := plugins.ProvideAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, pluginassetsService, acimplService, accessClient, featureToggles)
+	appInstaller, err := plugins.ProvideAppInstaller(configProvider, eventualRestConfigProvider, pluginstoreService, acimplService, accessClient, featureToggles)
 	if err != nil {
 		return nil, err
 	}