none-scene

.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/advisor/pkg/app/checks/datasourcecheck/check.go

@@ -28,7 +28,7 @@ type check struct {
 	PluginStore               pluginstore.Store
 	PluginContextProvider     PluginContextProvider
 	PluginClient              plugins.Client
-	PluginRepo                checks.PluginInfoGetter
+	PluginRepo                repo.Service
 	GrafanaVersion            string
 	pluginCanBeInstalledCache map[string]bool
 	pluginExistsCacheMu       sync.RWMutex
@@ -39,7 +39,7 @@ func New(
 	pluginStore pluginstore.Store,
 	pluginContextProvider PluginContextProvider,
 	pluginClient plugins.Client,
-	pluginRepo checks.PluginInfoGetter,
+	pluginRepo repo.Service,
 	grafanaVersion string,
 ) checks.Check {
 	return &check{

apps/advisor/pkg/app/checks/datasourcecheck/missing_plugin_step.go

@@ -15,7 +15,7 @@ import (
 
 type missingPluginStep struct {
 	PluginStore    pluginstore.Store
-	PluginRepo     checks.PluginInfoGetter
+	PluginRepo     repo.Service
 	GrafanaVersion string
 }
 

apps/advisor/pkg/app/checks/ifaces.go

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

apps/advisor/pkg/app/checks/plugincheck/check.go

@@ -17,7 +17,7 @@ const (
 
 func New(
 	pluginStore pluginstore.Store,
-	pluginRepo checks.PluginInfoGetter,
+	pluginRepo repo.Service,
 	updateChecker pluginchecker.PluginUpdateChecker,
 	pluginErrorResolver plugins.ErrorResolver,
 	grafanaVersion string,
@@ -33,7 +33,7 @@ func New(
 
 type check struct {
 	PluginStore         pluginstore.Store
-	PluginRepo          checks.PluginInfoGetter
+	PluginRepo          repo.Service
 	updateChecker       pluginchecker.PluginUpdateChecker
 	pluginErrorResolver plugins.ErrorResolver
 	GrafanaVersion      string

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/kinds/manifest.cue

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

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

docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md

@@ -83,7 +83,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `reportingRetries`                | Enables rendering retries for the reporting feature                                                    |
 | `externalServiceAccounts`         | Automatic service account and token setup for plugins                                                  |
 | `cloudWatchBatchQueries`          | Runs CloudWatch metrics queries as separate batches                                                    |
-| `dashboardNewLayouts`             | Enables new dashboard layouts                                                                          |
 | `pdfTables`                       | Enables generating table data as PDF in reporting                                                      |
 | `canvasPanelPanZoom`              | Allow pan and zoom in canvas panel                                                                     |
 | `alertingSaveStateCompressed`     | Enables the compressed protobuf-based alert state storage. Default is enabled.                         |

docs/sources/visualizations/panels-visualizations/visualizations/datagrid/index.md

@@ -30,9 +30,7 @@ refs:
 
 # Datagrid
 
-{{< admonition type="caution" >}}
-Starting with Grafana 12.4, Datagrid is deprecated. It will be removed in version 13.0.
-{{< /admonition >}}
+{{< docs/experimental product="The datagrid visualization" featureFlag="`enableDatagridEditing`" >}}
 
 Datagrids offer you the ability to create, edit, and fine-tune data within Grafana. As such, this panel can act as a data source for other panels
 inside a dashboard.

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
@@ -2720,11 +2657,6 @@
       "count": 1
     }
   },
-  "public/app/features/inspector/InspectJSONTab.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
   "public/app/features/inspector/InspectStatsTab.tsx": {
     "@grafana/no-aria-label-selectors": {
       "count": 1
@@ -2952,71 +2884,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',
-        },
       ],
     },
   },

go.mod

@@ -32,14 +32,14 @@ require (
 	github.com/armon/go-radix v1.0.0 // @grafana/grafana-app-platform-squad
 	github.com/aws/aws-sdk-go v1.55.7 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2 v1.40.0 // @grafana/aws-datasources
-	github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // @grafana/grafana-operator-experience-squad
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // indirect; @grafana/grafana-operator-experience-squad
 	github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/oam v1.18.3 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6 // @grafana/aws-datasources
 	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 // @grafana/grafana-operator-experience-squad
-	github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // @grafana/grafana-operator-experience-squad
+	github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // indirect; @grafana/grafana-operator-experience-squad
 	github.com/aws/smithy-go v1.23.2 // @grafana/aws-datasources
 	github.com/beevik/etree v1.4.1 // @grafana/grafana-backend-group
 	github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-backend
@@ -120,7 +120,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // @grafana/identity-access-team
 	github.com/hashicorp/go-hclog v1.6.3 // @grafana/plugins-platform-backend
 	github.com/hashicorp/go-multierror v1.1.1 // @grafana/alerting-squad
-	github.com/hashicorp/go-plugin v1.7.0 // @grafana/plugins-platform-backend
+	github.com/hashicorp/go-plugin v1.7.0 // indirect; @grafana/plugins-platform-backend
 	github.com/hashicorp/go-version v1.7.0 // @grafana/grafana-backend-group
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // @grafana/alerting-backend
 	github.com/hashicorp/hcl/v2 v2.24.0 // @grafana/alerting-backend
@@ -251,6 +251,7 @@ require (
 	github.com/grafana/grafana/apps/iam v0.0.0 // @grafana/identity-access-team
 	github.com/grafana/grafana/apps/logsdrilldown v0.0.0 // @grafana/observability-logs
 	github.com/grafana/grafana/apps/playlist v0.0.0 // @grafana/grafana-app-platform-squad
+	github.com/grafana/grafana/apps/plugins v0.0.0 // @grafana/plugins-platform-backend
 	github.com/grafana/grafana/apps/preferences v0.0.0 // @grafana/grafana-app-platform-squad
 	github.com/grafana/grafana/apps/provisioning v0.0.0 // @grafana/grafana-app-platform-squad
 	github.com/grafana/grafana/apps/quotas v0.0.0-20251209183543-1013d74f13f2 // @grafana/grafana-search-and-storage
@@ -655,11 +656,6 @@ require (
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
-require (
-	github.com/grafana/grafana/apps/plugins v0.0.0-00010101000000-000000000000
-	kernel.org/pub/linux/libs/security/libcap/cap v1.2.77
-)
-
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/IBM/pgxpoolprometheus v1.1.2 // indirect
@@ -702,7 +698,6 @@ require (
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	kernel.org/pub/linux/libs/security/libcap/psx v1.2.77 // indirect
 )
 
 // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream

go.sum

@@ -3706,10 +3706,6 @@ k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e/go.mod h1:kdmbQkyfwUagLfX
 k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
 k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kernel.org/pub/linux/libs/security/libcap/cap v1.2.77 h1:iQtQTjFUOcTT19fI8sTCzYXsjeVs56et3D8AbKS2Uks=
-kernel.org/pub/linux/libs/security/libcap/cap v1.2.77/go.mod h1:oV+IO8kGh0B7TxErbydDe2+BRmi9g/W0CkpVV+QBTJU=
-kernel.org/pub/linux/libs/security/libcap/psx v1.2.77 h1:Z06sMOzc0GNCwp6efaVrIrz4ywGJ1v+DP0pjVkOfDuA=
-kernel.org/pub/linux/libs/security/libcap/psx v1.2.77/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=

package.json

@@ -293,8 +293,8 @@
     "@grafana/plugin-ui": "^0.11.1",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "6.52.2",
-    "@grafana/scenes-react": "6.52.2",
+    "@grafana/scenes": "v6.52.1",
+    "@grafana/scenes-react": "v6.52.1",
     "@grafana/schema": "workspace:*",
     "@grafana/sql": "workspace:*",
     "@grafana/ui": "workspace:*",

packages/grafana-data/src/index.ts

@@ -844,6 +844,7 @@ export {
   DataLinkConfigOrigin,
   SupportedTransformationType,
   type InternalDataLink,
+  type LinkTarget,
   type LinkModel,
   type LinkModelSupplier,
   VariableOrigin,
@@ -851,7 +852,6 @@ export {
   VariableSuggestionsScope,
   OneClickMode,
 } from './types/dataLink';
-export { type LinkTarget } from './types/linkTarget';
 export {
   type Action,
   type ActionModel,

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/dataLink.ts

@@ -1,6 +1,5 @@
 import { ScopedVars } from './ScopedVars';
 import { ExploreCorrelationHelperData, ExplorePanelsState } from './explore';
-import { LinkTarget } from './linkTarget';
 import { InterpolateFunction } from './panel';
 import { DataQuery } from './query';
 import { TimeRange } from './time';
@@ -89,6 +88,8 @@ export interface InternalDataLink<T extends DataQuery = any> {
   range?: TimeRange;
 }
 
+export type LinkTarget = '_blank' | '_self' | undefined;
+
 /**
  * Processed Link Model. The values are ready to use
  */

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

@@ -356,7 +356,7 @@ export interface FeatureToggles {
   */
   dashboardScene?: boolean;
   /**
-  * Enables new dashboard layouts
+  * Enables experimental new dashboard layouts
   */
   dashboardNewLayouts?: boolean;
   /**
@@ -531,10 +531,6 @@ export interface FeatureToggles {
   */
   alertingListViewV2?: boolean;
   /**
-  * Enables the new Alerting navigation structure with improved menu grouping
-  */
-  alertingNavigationV2?: boolean;
-  /**
   * Enables saved searches for alert rules list
   */
   alertingSavedSearches?: boolean;
@@ -1255,8 +1251,4 @@ export interface FeatureToggles {
   * Enables profiles exemplars support in profiles drilldown
   */
   profilesExemplars?: boolean;
-  /**
-  * Use synchronized dispatch timer to minimize duplicate notifications across alertmanager HA pods
-  */
-  alertingSyncDispatchTimer?: boolean;
 }

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

@@ -1,4 +0,0 @@
-/**
- * Target for links - controls whether link opens in new tab or same tab
- */
-export type LinkTarget = '_blank' | '_self' | undefined;

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

@@ -1,7 +1,7 @@
 import { ComponentType } from 'react';
 
+import { LinkTarget } from './dataLink';
 import { IconName } from './icon';
-import { LinkTarget } from './linkTarget';
 
 export interface NavLinkDTO {
   id?: string;

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

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

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

pkg/cmd/grafana/main.go

@@ -68,10 +68,6 @@ func MainApp() *cli.App {
 		if cmd != nil {
 			app.Commands = append(app.Commands, cmd)
 		}
-		sandbox := f.GetSandboxCommand()
-		if sandbox != nil {
-			app.Commands = append(app.Commands, sandbox)
-		}
 	}
 
 	return app

pkg/plugins/backendplugin/grpcplugin/client.go

@@ -1,10 +1,10 @@
 package grpcplugin
 
 import (
-	"os"
 	"os/exec"
 	"runtime"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend/grpcplugin"
 	"github.com/hashicorp/go-hclog"
 	goplugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/go-plugin/runner"
@@ -14,7 +14,6 @@ import (
 	"go.opentelemetry.io/otel/trace/embedded"
 	"google.golang.org/grpc"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend/grpcplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
 	"github.com/grafana/grafana/pkg/plugins/log"
@@ -66,7 +65,16 @@ func newClientConfig(descriptor PluginDescriptor, env []string, logger log.Logge
 	if runtime.GOOS == "linux" && descriptor.containerMode.enabled {
 		return containerClientConfig(executablePath, descriptor.containerMode.image, descriptor.containerMode.tag, logger, versionedPlugins, skipHostEnvVars, tracer)
 	}
-	cfg := &goplugin.ClientConfig{
+
+	logger.Debug("Using process mode", "os", runtime.GOOS, "executablePath", executablePath)
+
+	// We can ignore gosec G201 here, since the dynamic part of executablePath comes from the plugin definition
+	// nolint:gosec
+	cmd := exec.Command(executablePath, descriptor.executableArgs...)
+	cmd.Env = env
+
+	return &goplugin.ClientConfig{
+		Cmd:              cmd,
 		HandshakeConfig:  handshake,
 		VersionedPlugins: versionedPlugins,
 		SkipHostEnv:      skipHostEnvVars,
@@ -82,25 +90,6 @@ func newClientConfig(descriptor PluginDescriptor, env []string, logger log.Logge
 			grpc.WithStatsHandler(otelgrpc.NewClientHandler(otelgrpc.WithTracerProvider(newClientTracerProvider(tracer)))),
 		},
 	}
-
-	if descriptor.runnerFunc != nil {
-		cfg.RunnerFunc = descriptor.runnerFunc
-		td, err := os.MkdirTemp("", "plugin")
-		if err != nil {
-			// TODO: what do we do here?
-			td = "/tmp"
-		}
-		cfg.UnixSocketConfig = &goplugin.UnixSocketConfig{TempDir: td}
-		logger.Debug("Using runner mode", "os", runtime.GOOS, "executablePath", executablePath)
-	} else {
-		logger.Debug("Using process mode", "os", runtime.GOOS, "executablePath", executablePath)
-		// We can ignore gosec G201 here, since the dynamic part of executablePath comes from the plugin definition
-		// nolint:gosec
-		cfg.Cmd = exec.Command(executablePath, descriptor.executableArgs...)
-		cfg.Cmd.Env = env
-	}
-
-	return cfg
 }
 
 func containerClientConfig(executablePath, containerImage, containerTag string, logger log.Logger, versionedPlugins map[int]goplugin.PluginSet, skipHostEnvVars bool, tracer trace.Tracer) *goplugin.ClientConfig {
@@ -138,7 +127,6 @@ type PluginDescriptor struct {
 	skipHostEnvVars  bool
 	managed          bool
 	containerMode    containerModeOpts
-	runnerFunc       func(l hclog.Logger, cmd *exec.Cmd, tmpDir string) (runner.Runner, error)
 	versionedPlugins map[int]goplugin.PluginSet
 	startRendererFn  StartRendererFunc
 }

pkg/plugins/backendplugin/grpcplugin/client_proto.go

@@ -3,9 +3,6 @@ package grpcplugin
 import (
 	"context"
 	"errors"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-plugin/runner"
-	"os/exec"
 
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/grpc"
@@ -52,7 +49,6 @@ type ProtoClientOpts struct {
 	ExecutableArgs  []string
 	Env             []string
 	ContainerMode   ContainerModeOpts
-	RunnerFunc      func(l hclog.Logger, cmd *exec.Cmd, tmpDir string) (runner.Runner, error)
 	SkipHostEnvVars bool
 	Logger          log.Logger
 	Tracer          trace.Tracer
@@ -77,7 +73,6 @@ func NewProtoClient(opts ProtoClientOpts) (ProtoClient, error) {
 				image:   opts.ContainerMode.Image,
 				tag:     opts.ContainerMode.Tag,
 			},
-			runnerFunc:      opts.RunnerFunc,
 			skipHostEnvVars: opts.SkipHostEnvVars,
 		},
 		opts.Logger,

pkg/services/apiserver/standalone/factory.go

@@ -14,7 +14,6 @@ type BuildInfo struct {
 
 type APIServerFactory interface {
 	GetCLICommand(info BuildInfo) *cli.Command
-	GetSandboxCommand() *cli.Command
 }
 
 // NOOP
@@ -27,7 +26,3 @@ type NoOpAPIServerFactory struct{}
 func (f *NoOpAPIServerFactory) GetCLICommand(info BuildInfo) *cli.Command {
 	return nil
 }
-
-func (f *NoOpAPIServerFactory) GetSandboxCommand() *cli.Command {
-	return nil
-}

pkg/services/featuremgmt/registry.go

@@ -574,8 +574,8 @@ var (
 		},
 		{
 			Name:         "dashboardNewLayouts",
-			Description:  "Enables new dashboard layouts",
-			Stage:        FeatureStagePublicPreview,
+			Description:  "Enables experimental new dashboard layouts",
+			Stage:        FeatureStageExperimental,
 			FrontendOnly: false, // The restore backend feature changes behavior based on this flag
 			Owner:        grafanaDashboardsSquad,
 		},
@@ -879,13 +879,6 @@ var (
 			Owner:        grafanaAlertingSquad,
 			FrontendOnly: true,
 		},
-		{
-			Name:         "alertingNavigationV2",
-			Description:  "Enables the new Alerting navigation structure with improved menu grouping",
-			Stage:        FeatureStageExperimental,
-			Owner:        grafanaAlertingSquad,
-			FrontendOnly: false,
-		},
 		{
 			Name:         "alertingSavedSearches",
 			Description:  "Enables saved searches for alert rules list",
@@ -988,8 +981,7 @@ var (
 			Stage:       FeatureStageDeprecated,
 			Owner:       grafanaPartnerPluginsSquad,
 			Expression:  "true", // Enabled by default for now
-		},
-		{
+		}, {
 			Name:         "alertingFilterV2",
 			Description:  "Enable the new alerting search experience",
 			Stage:        FeatureStageExperimental,
@@ -2077,14 +2069,6 @@ var (
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 			FrontendOnly: false,
 		},
-		{
-			Name:            "alertingSyncDispatchTimer",
-			Description:     "Use synchronized dispatch timer to minimize duplicate notifications across alertmanager HA pods",
-			Stage:           FeatureStageExperimental,
-			Owner:           grafanaAlertingSquad,
-			RequiresRestart: true,
-			HideFromDocs:    true,
-		},
 	}
 )
 

pkg/services/featuremgmt/toggles_gen.csv

@@ -79,7 +79,7 @@ annotationPermissionUpdate,GA,@grafana/identity-access-team,false,false,false
 dashboardSceneForViewers,GA,@grafana/dashboards-squad,false,false,true
 dashboardSceneSolo,GA,@grafana/dashboards-squad,false,false,true
 dashboardScene,GA,@grafana/dashboards-squad,false,false,true
-dashboardNewLayouts,preview,@grafana/dashboards-squad,false,false,false
+dashboardNewLayouts,experimental,@grafana/dashboards-squad,false,false,false
 dashboardUndoRedo,experimental,@grafana/dashboards-squad,false,false,true
 unlimitedLayoutsNesting,experimental,@grafana/dashboards-squad,false,false,true
 drilldownRecommendations,experimental,@grafana/dashboards-squad,false,false,true
@@ -121,7 +121,6 @@ dashboardLibrary,experimental,@grafana/sharing-squad,false,false,false
 suggestedDashboards,experimental,@grafana/sharing-squad,false,false,false
 dashboardTemplates,preview,@grafana/sharing-squad,false,false,false
 alertingListViewV2,privatePreview,@grafana/alerting-squad,false,false,true
-alertingNavigationV2,experimental,@grafana/alerting-squad,false,false,false
 alertingSavedSearches,experimental,@grafana/alerting-squad,false,false,true
 alertingDisableSendAlertsExternal,experimental,@grafana/alerting-squad,false,false,false
 preserveDashboardStateWhenNavigating,experimental,@grafana/dashboards-squad,false,false,false
@@ -281,4 +280,3 @@ multiPropsVariables,experimental,@grafana/dashboards-squad,false,false,true
 smoothingTransformation,experimental,@grafana/datapro,false,false,true
 secretsManagementAppPlatformAwsKeeper,experimental,@grafana/grafana-operator-experience-squad,false,false,false
 profilesExemplars,experimental,@grafana/observability-traces-and-profiling,false,false,false
-alertingSyncDispatchTimer,experimental,@grafana/alerting-squad,false,true,false

pkg/services/featuremgmt/toggles_gen.go

@@ -260,7 +260,7 @@ const (
 	FlagAnnotationPermissionUpdate = "annotationPermissionUpdate"
 
 	// FlagDashboardNewLayouts
-	// Enables new dashboard layouts
+	// Enables experimental new dashboard layouts
 	FlagDashboardNewLayouts = "dashboardNewLayouts"
 
 	// FlagPdfTables
@@ -371,10 +371,6 @@ const (
 	// Enables a flow to get started with a new dashboard from a template
 	FlagDashboardTemplates = "dashboardTemplates"
 
-	// FlagAlertingNavigationV2
-	// Enables the new Alerting navigation structure with improved menu grouping
-	FlagAlertingNavigationV2 = "alertingNavigationV2"
-
 	// FlagAlertingDisableSendAlertsExternal
 	// Disables the ability to send alerts to an external Alertmanager datasource.
 	FlagAlertingDisableSendAlertsExternal = "alertingDisableSendAlertsExternal"
@@ -793,8 +789,4 @@ const (
 	// FlagProfilesExemplars
 	// Enables profiles exemplars support in profiles drilldown
 	FlagProfilesExemplars = "profilesExemplars"
-
-	// FlagAlertingSyncDispatchTimer
-	// Use synchronized dispatch timer to minimize duplicate notifications across alertmanager HA pods
-	FlagAlertingSyncDispatchTimer = "alertingSyncDispatchTimer"
 )

pkg/services/featuremgmt/toggles_gen.json

@@ -348,18 +348,6 @@
         "expression": "true"
       }
     },
-    {
-      "metadata": {
-        "name": "alertingNavigationV2",
-        "resourceVersion": "1768320918269",
-        "creationTimestamp": "2026-01-13T16:15:18Z"
-      },
-      "spec": {
-        "description": "Enables the new Alerting navigation structure with improved menu grouping",
-        "stage": "experimental",
-        "codeowner": "@grafana/alerting-squad"
-      }
-    },
     {
       "metadata": {
         "name": "alertingNotificationHistory",
@@ -523,20 +511,6 @@
         "frontend": true
       }
     },
-    {
-      "metadata": {
-        "name": "alertingSyncDispatchTimer",
-        "resourceVersion": "1766161788928",
-        "creationTimestamp": "2025-12-19T16:29:48Z"
-      },
-      "spec": {
-        "description": "Use synchronized dispatch timer to minimize duplicate notifications across alertmanager HA pods",
-        "stage": "experimental",
-        "codeowner": "@grafana/alerting-squad",
-        "requiresRestart": true,
-        "hideFromDocs": true
-      }
-    },
     {
       "metadata": {
         "name": "alertingTriage",
@@ -688,8 +662,7 @@
       "metadata": {
         "name": "auditLoggingAppPlatform",
         "resourceVersion": "1767013056996",
-        "creationTimestamp": "2025-12-29T12:57:36Z",
-        "deletionTimestamp": "2026-01-06T09:18:36Z"
+        "creationTimestamp": "2025-12-29T12:57:36Z"
       },
       "spec": {
         "description": "Enable audit logging with Kubernetes under app platform",
@@ -1042,15 +1015,12 @@
     {
       "metadata": {
         "name": "dashboardNewLayouts",
-        "resourceVersion": "1768382835527",
-        "creationTimestamp": "2024-10-23T08:55:45Z",
-        "annotations": {
-          "grafana.app/updatedTimestamp": "2026-01-14 09:27:15.527103 +0000 UTC"
-        }
+        "resourceVersion": "1764664939750",
+        "creationTimestamp": "2024-10-23T08:55:45Z"
       },
       "spec": {
-        "description": "Enables new dashboard layouts",
-        "stage": "preview",
+        "description": "Enables experimental new dashboard layouts",
+        "stage": "experimental",
         "codeowner": "@grafana/dashboards-squad"
       }
     },

pkg/services/navtree/navtreeimpl/admin.go

@@ -54,7 +54,8 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink
 	}
 	//nolint:staticcheck // not yet migrated to OpenFeature
 	if c.HasRole(identity.RoleAdmin) &&
-		s.features.IsEnabledGlobally(featuremgmt.FlagProvisioning) {
+		(s.cfg.StackID == "" || // show OnPrem even when provisioning is disabled
+			s.features.IsEnabledGlobally(featuremgmt.FlagProvisioning)) {
 		generalNodeLinks = append(generalNodeLinks, &navtree.NavLink{
 			Text:     "Provisioning",
 			Id:       "provisioning",

pkg/services/ngalert/ngalert.go

@@ -213,9 +213,6 @@ func (ng *AlertNG) init() error {
 			SkipVerify:     ng.Cfg.Smtp.SkipVerify,
 			StaticHeaders:  ng.Cfg.Smtp.StaticHeaders,
 		}
-		runtimeConfig := remoteClient.RuntimeConfig{
-			DispatchTimer: notifier.GetDispatchTimer(ng.FeatureToggles).String(),
-		}
 
 		cfg := remote.AlertmanagerConfig{
 			BasicAuthPassword: ng.Cfg.UnifiedAlerting.RemoteAlertmanager.Password,
@@ -225,7 +222,6 @@ func (ng *AlertNG) init() error {
 			ExternalURL:       ng.Cfg.AppURL,
 			SmtpConfig:        smtpCfg,
 			Timeout:           ng.Cfg.UnifiedAlerting.RemoteAlertmanager.Timeout,
-			RuntimeConfig:     runtimeConfig,
 		}
 		autogenFn := func(ctx context.Context, logger log.Logger, orgID int64, cfg *definitions.PostableApiAlertingConfig, invalidReceiverAction notifier.InvalidReceiversAction) error {
 			return notifier.AddAutogenConfig(ctx, logger, ng.store, orgID, cfg, invalidReceiverAction, ng.FeatureToggles)

pkg/services/ngalert/notifier/alertmanager.go

@@ -33,9 +33,6 @@ const (
 
 	// How long we keep silences in the kvstore after they've expired.
 	silenceRetention = 5 * 24 * time.Hour
-
-	// How long we keep flushes in the kvstore after they've expired.
-	flushRetention = 5 * 24 * time.Hour
 )
 
 type AlertingStore interface {
@@ -47,10 +44,8 @@ type AlertingStore interface {
 type stateStore interface {
 	SaveSilences(ctx context.Context, st alertingNotify.State) (int64, error)
 	SaveNotificationLog(ctx context.Context, st alertingNotify.State) (int64, error)
-	SaveFlushLog(ctx context.Context, st alertingNotify.State) (int64, error)
 	GetSilences(ctx context.Context) (string, error)
 	GetNotificationLog(ctx context.Context) (string, error)
-	GetFlushLog(ctx context.Context) (string, error)
 }
 
 type alertmanager struct {
@@ -106,10 +101,6 @@ func NewAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 	if err != nil {
 		return nil, err
 	}
-	flushLog, err := stateStore.GetFlushLog(ctx)
-	if err != nil {
-		return nil, err
-	}
 
 	silencesOptions := maintenanceOptions{
 		initialState:         silences,
@@ -132,29 +123,12 @@ func NewAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 	}
 	l := log.New("ngalert.notifier")
 
-	dispatchTimer := GetDispatchTimer(featureToggles)
-
-	var flushLogOptions *maintenanceOptions
-	if dispatchTimer == alertingNotify.DispatchTimerSync {
-		flushLogOptions = &maintenanceOptions{
-			initialState:         flushLog,
-			retention:            flushRetention,
-			maintenanceFrequency: maintenanceInterval,
-			maintenanceFunc: func(state alertingNotify.State) (int64, error) {
-				// Detached context here is to make sure that when the service is shut down the persist operation is executed.
-				return stateStore.SaveFlushLog(context.Background(), state)
-			},
-		}
-	}
-
 	opts := alertingNotify.GrafanaAlertmanagerOpts{
 		ExternalURL:        cfg.AppURL,
 		AlertStoreCallback: nil,
 		PeerTimeout:        cfg.UnifiedAlerting.HAPeerTimeout,
 		Silences:           silencesOptions,
 		Nflog:              nflogOptions,
-		FlushLog:           flushLogOptions,
-		DispatchTimer:      dispatchTimer,
 		Limits: alertingNotify.Limits{
 			MaxSilences:         cfg.UnifiedAlerting.AlertmanagerMaxSilencesCount,
 			MaxSilenceSizeBytes: cfg.UnifiedAlerting.AlertmanagerMaxSilenceSizeBytes,

pkg/services/ngalert/notifier/dispatch_timer.go

@@ -1,16 +0,0 @@
-package notifier
-
-import (
-	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-// GetDispatchTimer returns the appropriate dispatch timer based on feature toggles.
-func GetDispatchTimer(features featuremgmt.FeatureToggles) (dt alertingNotify.DispatchTimer) {
-	//nolint:staticcheck // not yet migrated to OpenFeature
-	enabled := features.IsEnabledGlobally(featuremgmt.FlagAlertingSyncDispatchTimer)
-	if enabled {
-		dt = alertingNotify.DispatchTimerSync
-	}
-	return
-}

pkg/services/ngalert/notifier/dispatch_timer_test.go

@@ -1,36 +0,0 @@
-package notifier
-
-import (
-	"testing"
-
-	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetDispatchTimer(t *testing.T) {
-	tests := []struct {
-		name             string
-		featureFlagValue bool
-		expected         alertingNotify.DispatchTimer
-	}{
-		{
-			name:             "feature flag enabled returns sync timer",
-			featureFlagValue: true,
-			expected:         alertingNotify.DispatchTimerSync,
-		},
-		{
-			name:             "feature flag disabled returns default timer",
-			featureFlagValue: false,
-			expected:         alertingNotify.DispatchTimerDefault,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			features := featuremgmt.WithFeatures(featuremgmt.FlagAlertingSyncDispatchTimer, tt.featureFlagValue)
-			result := GetDispatchTimer(features)
-			require.Equal(t, tt.expected, result)
-		})
-	}
-}

pkg/services/ngalert/notifier/file_store.go

@@ -15,7 +15,6 @@ const (
 	KVNamespace             = "alertmanager"
 	NotificationLogFilename = "notifications"
 	SilencesFilename        = "silences"
-	FlushLogFilename        = "flushes"
 )
 
 // FileStore is in charge of persisting the alertmanager files to the database.
@@ -43,10 +42,6 @@ func (fileStore *FileStore) GetNotificationLog(ctx context.Context) (string, err
 	return fileStore.contentFor(ctx, NotificationLogFilename)
 }
 
-func (fileStore *FileStore) GetFlushLog(ctx context.Context) (string, error) {
-	return fileStore.contentFor(ctx, FlushLogFilename)
-}
-
 // contentFor returns the content for the given Alertmanager kvstore key.
 func (fileStore *FileStore) contentFor(ctx context.Context, filename string) (string, error) {
 	// Then, let's attempt to read it from the database.
@@ -79,11 +74,6 @@ func (fileStore *FileStore) SaveNotificationLog(ctx context.Context, st alerting
 	return fileStore.persist(ctx, NotificationLogFilename, st)
 }
 
-// SaveFlushLog saves the flush log to the database and returns the size of the unencoded state.
-func (fileStore *FileStore) SaveFlushLog(ctx context.Context, st alertingNotify.State) (int64, error) {
-	return fileStore.persist(ctx, FlushLogFilename, st)
-}
-
 // persist takes care of persisting the binary representation of internal state to the database as a base64 encoded string.
 func (fileStore *FileStore) persist(ctx context.Context, filename string, st alertingNotify.State) (int64, error) {
 	var size int64

pkg/services/ngalert/notifier/file_store_test.go

@@ -106,48 +106,3 @@ func TestFileStore_NotificationLog(t *testing.T) {
 		t.Errorf("Unexpected Diff: %v", cmp.Diff(newState, decoded))
 	}
 }
-
-func TestFileStore_FlushLog(t *testing.T) {
-	store := fakes.NewFakeKVStore(t)
-	ctx := context.Background()
-	var orgId int64 = 1
-
-	// Initialize kvstore with empty flush log state.
-	initialState := flushLogState{} // FlushLog uses the same structure as nflog
-	decodedState, err := initialState.MarshalBinary()
-	require.NoError(t, err)
-	encodedState := base64.StdEncoding.EncodeToString(decodedState)
-	err = store.Set(ctx, orgId, KVNamespace, FlushLogFilename, encodedState)
-	require.NoError(t, err)
-
-	fs := NewFileStore(orgId, store)
-
-	// Load initial (empty).
-	flushLog, err := fs.GetFlushLog(ctx)
-	require.NoError(t, err)
-	decoded, err := decodeFlushLogState(strings.NewReader(flushLog))
-	require.NoError(t, err)
-	if !cmp.Equal(initialState, decoded) {
-		t.Errorf("Unexpected Diff: %v", cmp.Diff(initialState, decoded))
-	}
-
-	// Save new flush log state.
-	now := time.Now()
-	oneHour := now.Add(time.Hour)
-
-	v1 := createFlushLog(1, now, oneHour)
-	v2 := createFlushLog(2, now, oneHour)
-	newState := flushLogState{1: v1, 2: v2}
-	size, err := fs.SaveFlushLog(ctx, newState)
-	require.NoError(t, err)
-	require.Greater(t, size, int64(0))
-
-	// Load new.
-	flushLog, err = fs.GetFlushLog(ctx)
-	require.NoError(t, err)
-	decoded, err = decodeFlushLogState(strings.NewReader(flushLog))
-	require.NoError(t, err)
-	if !cmp.Equal(newState, decoded) {
-		t.Errorf("Unexpected Diff: %v", cmp.Diff(newState, decoded))
-	}
-}

pkg/services/ngalert/notifier/multiorg_alertmanager.go

@@ -82,7 +82,6 @@ type Alertmanager interface {
 type ExternalState struct {
 	Silences []byte
 	Nflog    []byte
-	FlushLog []byte
 }
 
 // StateMerger describes a type that is able to merge external state (nflog, silences) with its own.
@@ -379,7 +378,7 @@ func (moa *MultiOrgAlertmanager) SyncAlertmanagersForOrgs(ctx context.Context, o
 func (moa *MultiOrgAlertmanager) cleanupOrphanLocalOrgState(ctx context.Context,
 	activeOrganizations map[int64]struct{},
 ) {
-	storedFiles := []string{NotificationLogFilename, SilencesFilename, FlushLogFilename}
+	storedFiles := []string{NotificationLogFilename, SilencesFilename}
 	for _, fileName := range storedFiles {
 		keys, err := moa.kvStore.Keys(ctx, kvstore.AllOrganizations, KVNamespace, fileName)
 		if err != nil {

pkg/services/ngalert/notifier/state.go

@@ -5,8 +5,5 @@ func (am *alertmanager) MergeState(state ExternalState) error {
 	if err := am.Base.MergeNflog(state.Nflog); err != nil {
 		return err
 	}
-	if err := am.Base.MergeSilences(state.Silences); err != nil {
-		return err
-	}
-	return am.Base.MergeFlushLog(state.FlushLog)
+	return am.Base.MergeSilences(state.Silences)
 }

pkg/services/ngalert/notifier/testing.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-	"github.com/prometheus/alertmanager/flushlog/flushlogpb"
 	"github.com/prometheus/alertmanager/nflog/nflogpb"
 	"github.com/prometheus/alertmanager/silence/silencepb"
 	"github.com/prometheus/common/model"
@@ -229,13 +228,15 @@ func (f *FakeOrgStore) FetchOrgIds(_ context.Context) ([]int64, error) {
 	return f.orgs, nil
 }
 
-type NoValidation struct{}
+type NoValidation struct {
+}
 
 func (n NoValidation) Validate(_ models.NotificationSettings) error {
 	return nil
 }
 
-type RejectingValidation struct{}
+type RejectingValidation struct {
+}
 
 func (n RejectingValidation) Validate(s models.NotificationSettings) error {
 	return ErrorReceiverDoesNotExist{ErrorReferenceInvalid: ErrorReferenceInvalid{Reference: s.Receiver}}
@@ -364,51 +365,6 @@ func createNotificationLog(groupKey string, receiverName string, sentAt, expires
 	}
 }
 
-// https://github.com/grafana/prometheus-alertmanager/blob/main/flushlog/flushlog.go#L136-L136
-type flushLogState map[uint64]*flushlogpb.MeshFlushLog
-
-func (s flushLogState) MarshalBinary() ([]byte, error) {
-	var buf bytes.Buffer
-
-	for _, e := range s {
-		if _, err := pbutil.WriteDelimited(&buf, e); err != nil {
-			return nil, err
-		}
-	}
-	return buf.Bytes(), nil
-}
-
-func createFlushLog(groupFingerprint uint64, ts, expiresAt time.Time) *flushlogpb.MeshFlushLog {
-	return &flushlogpb.MeshFlushLog{
-		FlushLog: &flushlogpb.FlushLog{
-			GroupFingerprint: groupFingerprint,
-			Timestamp:        ts,
-		},
-		ExpiresAt: expiresAt,
-	}
-}
-
-// decodeFlushLogState copied from decodeState in prometheus-alertmanager/flushlog/flushlog.go
-func decodeFlushLogState(r io.Reader) (flushLogState, error) {
-	st := flushLogState{}
-	for {
-		var e flushlogpb.MeshFlushLog
-		_, err := pbutil.ReadDelimited(r, &e)
-		if err == nil {
-			if e.FlushLog == nil || e.FlushLog.GroupFingerprint == 0 || e.FlushLog.Timestamp.IsZero() {
-				return nil, errInvalidState
-			}
-			st[e.FlushLog.GroupFingerprint] = &e
-			continue
-		}
-		if errors.Is(err, io.EOF) {
-			break
-		}
-		return nil, err
-	}
-	return st, nil
-}
-
 type call struct {
 	Method string
 	Args   []interface{}

pkg/services/ngalert/remote/alertmanager.go

@@ -47,7 +47,6 @@ import (
 type stateStore interface {
 	GetSilences(ctx context.Context) (string, error)
 	GetNotificationLog(ctx context.Context) (string, error)
-	GetFlushLog(ctx context.Context) (string, error)
 }
 
 // AutogenFn is a function that adds auto-generated routes to a configuration.
@@ -87,8 +86,6 @@ type Alertmanager struct {
 
 	promoteConfig bool
 	externalURL   string
-
-	runtimeConfig remoteClient.RuntimeConfig
 }
 
 type AlertmanagerConfig struct {
@@ -114,9 +111,6 @@ type AlertmanagerConfig struct {
 
 	// Timeout for the HTTP client.
 	Timeout time.Duration
-
-	// RuntimeConfig specifies runtime behavior settings for the remote Alertmanager.
-	RuntimeConfig remoteClient.RuntimeConfig
 }
 
 func (cfg *AlertmanagerConfig) Validate() error {
@@ -209,7 +203,6 @@ func NewAlertmanager(ctx context.Context, cfg AlertmanagerConfig, store stateSto
 		externalURL:   cfg.ExternalURL,
 		promoteConfig: cfg.PromoteConfig,
 		smtp:          cfg.SmtpConfig,
-		runtimeConfig: cfg.RuntimeConfig,
 	}
 
 	// Parse the default configuration once and remember its hash so we can compare it later.
@@ -338,11 +331,10 @@ func (am *Alertmanager) buildConfiguration(ctx context.Context, raw []byte, crea
 			AlertmanagerConfig: mergeResult.Config,
 			Templates:          templates,
 		},
-		CreatedAt:     createdAtEpoch,
-		Promoted:      am.promoteConfig,
-		ExternalURL:   am.externalURL,
-		SmtpConfig:    am.smtp,
-		RuntimeConfig: am.runtimeConfig,
+		CreatedAt:   createdAtEpoch,
+		Promoted:    am.promoteConfig,
+		ExternalURL: am.externalURL,
+		SmtpConfig:  am.smtp,
 	}
 
 	cfgHash, err := calculateUserGrafanaConfigHash(payload)
@@ -396,8 +388,6 @@ func (am *Alertmanager) GetRemoteState(ctx context.Context) (notifier.ExternalSt
 			rs.Silences = p.Data
 		case "nfl":
 			rs.Nflog = p.Data
-		case "fls":
-			rs.FlushLog = p.Data
 		default:
 			return rs, fmt.Errorf("unknown part key %q", p.Key)
 		}
@@ -687,12 +677,6 @@ func (am *Alertmanager) getFullState(ctx context.Context) (string, error) {
 	}
 	parts = append(parts, alertingClusterPB.Part{Key: notifier.NotificationLogFilename, Data: []byte(notificationLog)})
 
-	flushLog, err := am.state.GetFlushLog(ctx)
-	if err != nil {
-		return "", fmt.Errorf("error getting flush log: %w", err)
-	}
-	parts = append(parts, alertingClusterPB.Part{Key: notifier.FlushLogFilename, Data: []byte(flushLog)})
-
 	fs := alertingClusterPB.FullState{
 		Parts: parts,
 	}

pkg/services/ngalert/remote/client/alertmanager_configuration.go

@@ -29,10 +29,6 @@ func (u *GrafanaAlertmanagerConfig) MarshalJSON() ([]byte, error) {
 	return definition.MarshalJSONWithSecrets((*cfg)(u))
 }
 
-type RuntimeConfig struct {
-	DispatchTimer string `json:"dispatch_timer"`
-}
-
 type UserGrafanaConfig struct {
 	GrafanaAlertmanagerConfig GrafanaAlertmanagerConfig `json:"configuration"`
 	Hash                      string                    `json:"configuration_hash"`
@@ -41,7 +37,6 @@ type UserGrafanaConfig struct {
 	Promoted                  bool                      `json:"promoted"`
 	ExternalURL               string                    `json:"external_url"`
 	SmtpConfig                SmtpConfig                `json:"smtp_config"`
-	RuntimeConfig             RuntimeConfig             `json:"runtime_config"`
 }
 
 func (mc *Mimir) GetGrafanaAlertmanagerConfig(ctx context.Context) (*UserGrafanaConfig, error) {

pkg/setting/setting.go

@@ -600,7 +600,6 @@ type Cfg struct {
 	IndexRebuildInterval                       time.Duration
 	IndexCacheTTL                              time.Duration
 	IndexMinUpdateInterval                     time.Duration // Don't update index if it was updated less than this interval ago.
-	IndexScoringModel                          string        // Note: Temporary config to switch the index scoring model and will be removed soon.
 	MaxFileIndexAge                            time.Duration // Max age of file-based indexes. Index older than this will be rebuilt asynchronously.
 	MinFileIndexBuildVersion                   string        // Minimum version of Grafana that built the file-based index. If index was built with older Grafana, it will be rebuilt asynchronously.
 	EnableSharding                             bool

pkg/setting/setting_unified_storage.go

@@ -123,10 +123,6 @@ func (cfg *Cfg) setUnifiedStorageConfig() {
 	cfg.IndexRebuildInterval = section.Key("index_rebuild_interval").MustDuration(24 * time.Hour)
 	cfg.IndexCacheTTL = section.Key("index_cache_ttl").MustDuration(10 * time.Minute)
 	cfg.IndexMinUpdateInterval = section.Key("index_min_update_interval").MustDuration(0)
-	cfg.IndexScoringModel = section.Key("index_scoring_model").MustString("")
-	if cfg.IndexScoringModel != "" {
-		cfg.Logger.Info("Index scoring model set", "model", cfg.IndexScoringModel)
-	}
 	cfg.SprinklesApiServer = section.Key("sprinkles_api_server").String()
 	cfg.SprinklesApiServerPageLimit = section.Key("sprinkles_api_server_page_limit").MustInt(10000)
 	cfg.CACertPath = section.Key("ca_cert_path").String()

pkg/storage/unified/search/bleve.go

@@ -81,11 +81,6 @@ type BleveOptions struct {
 	// Indexes that are not owned by current instance are eligible for cleanup.
 	// If nil, all indexes are owned by the current instance.
 	OwnsIndex func(key resource.NamespacedResource) (bool, error)
-
-	// ScoringModel defines the scoring model used for the bleve indexes
-	// Default: index.TFIDFScoring
-	// Supported values: index.TFIDFScoring and index.BM25Scoring
-	ScoringModel string
 }
 
 type bleveBackend struct {
@@ -373,7 +368,7 @@ func (b *bleveBackend) BuildIndex(
 		attribute.String("reason", indexBuildReason),
 	)
 
-	mapper, err := GetBleveMappings(b.opts.ScoringModel, fields)
+	mapper, err := GetBleveMappings(fields)
 	if err != nil {
 		return nil, err
 	}

pkg/storage/unified/search/bleve_integration_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	index "github.com/blevesearch/bleve_index_api"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
@@ -20,7 +19,6 @@ func TestBleveSearchBackend(t *testing.T) {
 		backend, err := NewBleveBackend(BleveOptions{
 			Root:          tempDir,
 			FileThreshold: 5,
-			ScoringModel:  index.BM25Scoring,
 		}, nil)
 		require.NoError(t, err)
 		require.NotNil(t, backend)
@@ -54,32 +52,3 @@ func TestSearchBackendBenchmark(t *testing.T) {
 
 	unitest.BenchmarkSearchBackend(t, backend, opts)
 }
-
-func BenchmarkScoringModels(b *testing.B) {
-	models := []string{index.TFIDFScoring, index.BM25Scoring}
-
-	for _, model := range models {
-		b.Run(model, func(b *testing.B) {
-			tempDir := b.TempDir()
-
-			backend, err := NewBleveBackend(BleveOptions{
-				Root:         tempDir,
-				ScoringModel: model,
-			}, nil)
-			require.NoError(b, err)
-			require.NotNil(b, backend)
-
-			b.Cleanup(backend.Stop)
-
-			opts := &unitest.BenchmarkOptions{
-				NumResources:     1000,
-				Concurrency:      4,
-				NumNamespaces:    10,
-				NumGroups:        10,
-				NumResourceTypes: 10,
-			}
-
-			unitest.BenchmarkSearchBackend(b, backend, opts)
-		})
-	}
-}

pkg/storage/unified/search/bleve_mappings.go

@@ -5,15 +5,13 @@ import (
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/keyword"
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/standard"
 	"github.com/blevesearch/bleve/v2/mapping"
+
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 )
 
-func GetBleveMappings(scoringModel string, fields resource.SearchableDocumentFields) (mapping.IndexMapping, error) {
+func GetBleveMappings(fields resource.SearchableDocumentFields) (mapping.IndexMapping, error) {
 	mapper := bleve.NewIndexMapping()
-	if scoringModel != "" {
-		mapper.ScoringModel = scoringModel
-	}
 
 	err := RegisterCustomAnalyzers(mapper)
 	if err != nil {

pkg/storage/unified/search/bleve_mappings_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestDocumentMapping(t *testing.T) {
-	mappings, err := search.GetBleveMappings("", nil)
+	mappings, err := search.GetBleveMappings(nil)
 	require.NoError(t, err)
 	data := resource.IndexableDocument{
 		Title:       "title",

pkg/storage/unified/search/bleve_search_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve/v2"
-	index "github.com/blevesearch/bleve_index_api"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
@@ -259,7 +258,6 @@ func newTestDashboardsIndex(t testing.TB, threshold int64, size int64, writer re
 	backend, err := search.NewBleveBackend(search.BleveOptions{
 		Root:          t.TempDir(),
 		FileThreshold: threshold, // use in-memory for tests
-		ScoringModel:  index.BM25Scoring,
 	}, nil)
 	require.NoError(t, err)
 

pkg/storage/unified/search/bleve_test.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/blevesearch/bleve/v2"
-	index "github.com/blevesearch/bleve_index_api"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
@@ -51,7 +50,6 @@ func TestBleveBackend(t *testing.T) {
 	backend, err := NewBleveBackend(BleveOptions{
 		Root:          tmpdir,
 		FileThreshold: 5, // with more than 5 items we create a file on disk
-		ScoringModel:  index.BM25Scoring,
 	}, nil)
 	require.NoError(t, err)
 	t.Cleanup(backend.Stop)
@@ -775,7 +773,6 @@ func setupBleveBackend(t *testing.T, options ...setupOption) (*bleveBackend, pro
 		IndexCacheTTL: defaultIndexCacheTTL,
 		Logger:        log.NewNopLogger(),
 		BuildVersion:  buildVersion,
-		ScoringModel:  index.BM25Scoring,
 	}
 	for _, opt := range options {
 		opt(&opts)

pkg/storage/unified/search/options.go

@@ -46,7 +46,6 @@ func NewSearchOptions(
 			BuildVersion:           cfg.BuildVersion,
 			OwnsIndex:              ownsIndexFn,
 			IndexMinUpdateInterval: cfg.IndexMinUpdateInterval,
-			ScoringModel:           cfg.IndexScoringModel,
 		}, indexMetrics)
 
 		if err != nil {

pkg/storage/unified/sql/test/integration_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	index "github.com/blevesearch/bleve_index_api"
 	"github.com/go-jose/go-jose/v4/jwt"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
@@ -130,28 +129,21 @@ func TestIntegrationSearchAndStorage(t *testing.T) {
 
 	ctx := context.Background()
 
-	scoringModels := []string{index.TFIDFScoring, index.BM25Scoring}
+	// Create a new bleve backend
+	search, err := search.NewBleveBackend(search.BleveOptions{
+		FileThreshold: 0,
+		Root:          t.TempDir(),
+	}, nil)
+	require.NoError(t, err)
+	require.NotNil(t, search)
+	t.Cleanup(search.Stop)
 
-	for _, model := range scoringModels {
-		t.Run(model, func(t *testing.T) {
-			// Create a new bleve backend
-			search, err := search.NewBleveBackend(search.BleveOptions{
-				FileThreshold: 0,
-				Root:          t.TempDir(),
-				ScoringModel:  model,
-			}, nil)
-			require.NoError(t, err)
-			require.NotNil(t, search)
-			t.Cleanup(search.Stop)
+	// Create a new resource backend
+	storage, _ := newTestBackend(t, false, 0)
+	require.NotNil(t, storage)
 
-			// Create a new resource backend
-			storage, _ := newTestBackend(t, false, 0)
-			require.NotNil(t, storage)
-
-			// Run the shared storage and search tests
-			unitest.RunTestSearchAndStorage(t, ctx, storage, search)
-		})
-	}
+	// Run the shared storage and search tests
+	unitest.RunTestSearchAndStorage(t, ctx, storage, search)
 }
 
 func TestClientServer(t *testing.T) {

pkg/tests/api/plugins/data/expectedListResp.json

@@ -209,7 +209,7 @@
           "path": "public/plugins/grafana-azure-monitor-datasource/img/azure_monitor_cpu.png"
         }
       ],
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": [
         "azure",
@@ -589,7 +589,7 @@
     "hasUpdate": false,
     "defaultNavUrl": "/plugins/datagrid/",
     "category": "",
-    "state": "deprecated",
+    "state": "beta",
     "signature": "internal",
     "signatureType": "",
     "signatureOrg": "",
@@ -880,7 +880,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -934,7 +934,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": [
         "grafana",
@@ -1000,7 +1000,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -1217,7 +1217,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -1325,7 +1325,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -1375,7 +1375,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -1425,7 +1425,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -1575,7 +1575,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "",
       "updated": "",
       "keywords": null
     },
@@ -1629,7 +1629,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": [
         "grafana",
@@ -1734,7 +1734,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -2042,7 +2042,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -2092,7 +2092,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },
@@ -2445,7 +2445,7 @@
       },
       "build": {},
       "screenshots": null,
-      "version": "12.4.0-pre",
+      "version": "12.3.0-pre",
       "updated": "",
       "keywords": null
     },

public/app/features/alerting/unified/api/alertmanagerApi.ts

@@ -108,9 +108,7 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
     }),
 
     grafanaNotifiers: build.query<NotifierDTO[], void>({
-      // NOTE: version=2 parameter required for versioned schema (PR #109969)
-      // This parameter will be removed in future when v2 becomes default
-      query: () => ({ url: '/api/alert-notifiers?version=2' }),
+      query: () => ({ url: '/api/alert-notifiers' }),
       transformResponse: (response: NotifierDTO[]) => {
         const populateSecureFieldKey = (
           option: NotificationChannelOption,
@@ -123,16 +121,11 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
           ),
         });
 
-        // Keep versions array intact for version-specific options lookup
-        // Transform options with secureFieldKey population
         return response.map((notifier) => ({
           ...notifier,
-          options: (notifier.options || []).map((option) => populateSecureFieldKey(option, '')),
-          // Also transform options within each version
-          versions: notifier.versions?.map((version) => ({
-            ...version,
-            options: (version.options || []).map((option) => populateSecureFieldKey(option, '')),
-          })),
+          options: notifier.options.map((option) => {
+            return populateSecureFieldKey(option, '');
+          }),
         }));
       },
     }),

public/app/features/alerting/unified/api/prometheusApi.ts

@@ -46,7 +46,6 @@ export type GrafanaPromRulesOptions = Omit<PromRulesOptions, 'ruleSource' | 'nam
   state?: PromAlertingRuleState[];
   title?: string;
   searchGroupName?: string;
-  searchFolder?: string;
   type?: 'alerting' | 'recording';
   ruleMatchers?: string[];
   plugins?: 'hide' | 'only';
@@ -104,7 +103,6 @@ export const prometheusApi = alertingApi.injectEndpoints({
         title,
         datasources,
         searchGroupName,
-        searchFolder,
         dashboardUid,
         ruleMatchers,
         plugins,
@@ -125,7 +123,6 @@ export const prometheusApi = alertingApi.injectEndpoints({
           datasource_uid: datasources,
           'search.rule_name': title,
           'search.rule_group': searchGroupName,
-          'search.folder': searchFolder,
           dashboard_uid: dashboardUid,
           rule_matcher: ruleMatchers,
           plugins: plugins,

public/app/features/alerting/unified/components/Provisioning.tsx

@@ -36,24 +36,6 @@ export const ProvisioningAlert = ({ resource, ...rest }: ProvisioningAlertProps)
   );
 };
 
-export const ImportedContactPointAlert = (props: ExtraAlertProps) => {
-  return (
-    <Alert
-      title={t(
-        'alerting.provisioning.title-imported',
-        'This contact point was imported and cannot be edited through the UI'
-      )}
-      severity="info"
-      {...props}
-    >
-      <Trans i18nKey="alerting.provisioning.body-imported">
-        This contact point contains integrations that were imported from an external Alertmanager and is currently
-        read-only. The integrations will become editable after the migration process is complete.
-      </Trans>
-    </Alert>
-  );
-};
-
 export const ProvisioningBadge = ({
   tooltip,
   provenance,

public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.test.tsx

@@ -1,12 +1,11 @@
 import 'core-js/stable/structured-clone';
 import { FormProvider, useForm } from 'react-hook-form';
 import { clickSelectOption } from 'test/helpers/selectOptionInTest';
-import { render, screen } from 'test/test-utils';
+import { render } from 'test/test-utils';
 import { byRole, byTestId } from 'testing-library-selector';
 
 import { grafanaAlertNotifiers } from 'app/features/alerting/unified/mockGrafanaNotifiers';
 import { AlertmanagerProvider } from 'app/features/alerting/unified/state/AlertmanagerContext';
-import { NotifierDTO } from 'app/features/alerting/unified/types/alerting';
 
 import { ChannelSubForm } from './ChannelSubForm';
 import { GrafanaCommonChannelSettings } from './GrafanaCommonChannelSettings';
@@ -17,7 +16,6 @@ type TestChannelValues = {
   type: string;
   settings: Record<string, unknown>;
   secureFields: Record<string, boolean>;
-  version?: string;
 };
 
 type TestReceiverFormValues = {
@@ -248,241 +246,4 @@ describe('ChannelSubForm', () => {
     expect(slackUrl).toBeEnabled();
     expect(slackUrl).toHaveValue('');
   });
-
-  describe('version-specific options display', () => {
-    // Create a mock notifier with different options for v0 and v1
-    const legacyOptions = [
-      {
-        element: 'input' as const,
-        inputType: 'text',
-        label: 'Legacy URL',
-        description: 'The legacy endpoint URL',
-        placeholder: '',
-        propertyName: 'legacyUrl',
-        required: true,
-        secure: false,
-        showWhen: { field: '', is: '' },
-        validationRule: '',
-        dependsOn: '',
-      },
-    ];
-
-    const webhookWithVersions: NotifierDTO = {
-      ...grafanaAlertNotifiers.webhook,
-      versions: [
-        {
-          version: 'v0mimir1',
-          label: 'Webhook (Legacy)',
-          description: 'Legacy webhook from Mimir',
-          canCreate: false,
-          options: legacyOptions,
-        },
-        {
-          version: 'v0mimir2',
-          label: 'Webhook (Legacy v2)',
-          description: 'Legacy webhook v2 from Mimir',
-          canCreate: false,
-          options: legacyOptions,
-        },
-        {
-          version: 'v1',
-          label: 'Webhook',
-          description: 'Sends HTTP POST request',
-          canCreate: true,
-          options: grafanaAlertNotifiers.webhook.options,
-        },
-      ],
-    };
-
-    const versionedNotifiers: Notifier[] = [
-      { dto: webhookWithVersions, meta: { enabled: true, order: 1 } },
-      { dto: grafanaAlertNotifiers.slack, meta: { enabled: true, order: 2 } },
-    ];
-
-    function VersionedTestFormWrapper({
-      defaults,
-      initial,
-    }: {
-      defaults: TestChannelValues;
-      initial?: TestChannelValues;
-    }) {
-      const form = useForm<TestReceiverFormValues>({
-        defaultValues: {
-          name: 'test-contact-point',
-          items: [defaults],
-        },
-      });
-
-      return (
-        <AlertmanagerProvider accessType="notification">
-          <FormProvider {...form}>
-            <ChannelSubForm
-              defaultValues={defaults}
-              initialValues={initial}
-              pathPrefix={`items.0.`}
-              integrationIndex={0}
-              notifiers={versionedNotifiers}
-              onDuplicate={jest.fn()}
-              commonSettingsComponent={GrafanaCommonChannelSettings}
-              isEditable={true}
-              isTestable={false}
-              canEditProtectedFields={true}
-            />
-          </FormProvider>
-        </AlertmanagerProvider>
-      );
-    }
-
-    function renderVersionedForm(defaults: TestChannelValues, initial?: TestChannelValues) {
-      return render(<VersionedTestFormWrapper defaults={defaults} initial={initial} />);
-    }
-
-    it('should display v1 options when integration has v1 version', () => {
-      const webhookV1: TestChannelValues = {
-        __id: 'id-0',
-        type: 'webhook',
-        version: 'v1',
-        settings: { url: 'https://example.com' },
-        secureFields: {},
-      };
-
-      renderVersionedForm(webhookV1, webhookV1);
-
-      // Should show v1 URL field (from default options)
-      expect(ui.settings.webhook.url.get()).toBeInTheDocument();
-      // Should NOT show legacy URL field
-      expect(screen.queryByRole('textbox', { name: /Legacy URL/i })).not.toBeInTheDocument();
-    });
-
-    it('should display v0 options when integration has legacy version', () => {
-      const webhookV0: TestChannelValues = {
-        __id: 'id-0',
-        type: 'webhook',
-        version: 'v0mimir1',
-        settings: { legacyUrl: 'https://legacy.example.com' },
-        secureFields: {},
-      };
-
-      renderVersionedForm(webhookV0, webhookV0);
-
-      // Should show legacy URL field (from v0 options)
-      expect(screen.getByRole('textbox', { name: /Legacy URL/i })).toBeInTheDocument();
-      // Should NOT show v1 URL field
-      expect(ui.settings.webhook.url.query()).not.toBeInTheDocument();
-    });
-
-    it('should display "Legacy" badge for v0mimir1 integration', () => {
-      const webhookV0: TestChannelValues = {
-        __id: 'id-0',
-        type: 'webhook',
-        version: 'v0mimir1',
-        settings: { legacyUrl: 'https://legacy.example.com' },
-        secureFields: {},
-      };
-
-      renderVersionedForm(webhookV0, webhookV0);
-
-      // Should show "Legacy" badge for v0mimir1 integrations
-      expect(screen.getByText('Legacy')).toBeInTheDocument();
-    });
-
-    it('should display "Legacy v2" badge for v0mimir2 integration', () => {
-      const webhookV0v2: TestChannelValues = {
-        __id: 'id-0',
-        type: 'webhook',
-        version: 'v0mimir2',
-        settings: { legacyUrl: 'https://legacy.example.com' },
-        secureFields: {},
-      };
-
-      renderVersionedForm(webhookV0v2, webhookV0v2);
-
-      // Should show "Legacy v2" badge for v0mimir2 integrations
-      expect(screen.getByText('Legacy v2')).toBeInTheDocument();
-    });
-
-    it('should NOT display version badge for v1 integration', () => {
-      const webhookV1: TestChannelValues = {
-        __id: 'id-0',
-        type: 'webhook',
-        version: 'v1',
-        settings: { url: 'https://example.com' },
-        secureFields: {},
-      };
-
-      renderVersionedForm(webhookV1, webhookV1);
-
-      // Should NOT show version badge for non-legacy v1 integrations
-      expect(screen.queryByText('v1')).not.toBeInTheDocument();
-    });
-
-    it('should filter out notifiers with canCreate: false from dropdown', () => {
-      // Create a notifier that only has v0 versions (cannot be created)
-      const legacyOnlyNotifier: NotifierDTO = {
-        type: 'wechat',
-        name: 'WeChat',
-        heading: 'WeChat settings',
-        description: 'Sends notifications to WeChat',
-        options: [],
-        versions: [
-          {
-            version: 'v0mimir1',
-            label: 'WeChat (Legacy)',
-            description: 'Legacy WeChat',
-            canCreate: false,
-            options: [],
-          },
-        ],
-      };
-
-      const notifiersWithLegacyOnly: Notifier[] = [
-        { dto: webhookWithVersions, meta: { enabled: true, order: 1 } },
-        { dto: legacyOnlyNotifier, meta: { enabled: true, order: 2 } },
-      ];
-
-      function LegacyOnlyTestWrapper({ defaults }: { defaults: TestChannelValues }) {
-        const form = useForm<TestReceiverFormValues>({
-          defaultValues: {
-            name: 'test-contact-point',
-            items: [defaults],
-          },
-        });
-
-        return (
-          <AlertmanagerProvider accessType="notification">
-            <FormProvider {...form}>
-              <ChannelSubForm
-                defaultValues={defaults}
-                pathPrefix={`items.0.`}
-                integrationIndex={0}
-                notifiers={notifiersWithLegacyOnly}
-                onDuplicate={jest.fn()}
-                commonSettingsComponent={GrafanaCommonChannelSettings}
-                isEditable={true}
-                isTestable={false}
-                canEditProtectedFields={true}
-              />
-            </FormProvider>
-          </AlertmanagerProvider>
-        );
-      }
-
-      render(
-        <LegacyOnlyTestWrapper
-          defaults={{
-            __id: 'id-0',
-            type: 'webhook',
-            settings: {},
-            secureFields: {},
-          }}
-        />
-      );
-
-      // Webhook should be in dropdown (has v1 with canCreate: true)
-      expect(ui.typeSelector.get()).toHaveTextContent('Webhook');
-
-      // WeChat should NOT be in the options (only has v0 with canCreate: false)
-      // We can't easily check dropdown options without opening it, but the filter should work
-    });
-  });
 });

public/app/features/alerting/unified/components/receivers/form/ChannelSubForm.tsx

@@ -6,7 +6,7 @@ import { Controller, FieldErrors, useFormContext } from 'react-hook-form';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { Alert, Badge, Button, Field, Select, Stack, Text, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, Select, Stack, Text, useStyles2 } from '@grafana/ui';
 import { NotificationChannelOption } from 'app/features/alerting/unified/types/alerting';
 
 import {
@@ -16,12 +16,6 @@ import {
   GrafanaChannelValues,
   ReceiverFormValues,
 } from '../../../types/receiver-form';
-import {
-  canCreateNotifier,
-  getLegacyVersionLabel,
-  getOptionsForVersion,
-  isLegacyVersion,
-} from '../../../utils/notifier-versions';
 import { OnCallIntegrationType } from '../grafanaAppReceivers/onCall/useOnCallIntegration';
 
 import { ChannelOptions } from './ChannelOptions';
@@ -68,7 +62,6 @@ export function ChannelSubForm<R extends ChannelValues>({
 
   const channelFieldPath = `items.${integrationIndex}` as const;
   const typeFieldPath = `${channelFieldPath}.type` as const;
-  const versionFieldPath = `${channelFieldPath}.version` as const;
   const settingsFieldPath = `${channelFieldPath}.settings` as const;
   const secureFieldsPath = `${channelFieldPath}.secureFields` as const;
 
@@ -111,9 +104,6 @@ export function ChannelSubForm<R extends ChannelValues>({
 
         setValue(settingsFieldPath, defaultNotifierSettings);
         setValue(secureFieldsPath, {});
-
-        // Reset version when changing type - backend will use its default
-        setValue(versionFieldPath, undefined);
       }
 
       // Restore initial value of an existing oncall integration
@@ -133,7 +123,6 @@ export function ChannelSubForm<R extends ChannelValues>({
     setValue,
     settingsFieldPath,
     typeFieldPath,
-    versionFieldPath,
     secureFieldsPath,
     getValues,
     watch,
@@ -175,30 +164,24 @@ export function ChannelSubForm<R extends ChannelValues>({
     setValue(`${settingsFieldPath}.${fieldPath}`, undefined);
   };
 
-  const typeOptions = useMemo((): SelectableValue[] => {
-    // Filter out notifiers that can't be created (e.g., v0-only integrations like WeChat)
-    // These are legacy integrations that only exist in Mimir and can't be created in Grafana
-    const creatableNotifiers = notifiers.filter(({ dto }) => canCreateNotifier(dto));
-
-    return sortBy(creatableNotifiers, ({ dto, meta }) => [meta?.order ?? 0, dto.name]).map<SelectableValue>(
-      ({ dto: { name, type }, meta }) => {
-        return {
-          // ReactNode is supported in Select label, but types don't reflect it
-          /* eslint-disable @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any */
+  const typeOptions = useMemo(
+    (): SelectableValue[] =>
+      sortBy(notifiers, ({ dto, meta }) => [meta?.order ?? 0, dto.name]).map<SelectableValue>(
+        ({ dto: { name, type }, meta }) => ({
+          // @ts-expect-error ReactNode is supported
           label: (
             <Stack alignItems="center" gap={1}>
               {name}
               {meta?.badge}
             </Stack>
-          ) as any,
-          /* eslint-enable @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any */
+          ),
           value: type,
           description: meta?.description,
           isDisabled: meta ? !meta.enabled : false,
-        };
-      }
-    );
-  }, [notifiers]);
+        })
+      ),
+    [notifiers]
+  );
 
   const handleTest = async () => {
     await trigger();
@@ -215,21 +198,10 @@ export function ChannelSubForm<R extends ChannelValues>({
   // Cloud AM takes no value at all
   const isParseModeNone = parse_mode === 'None' || !parse_mode;
   const showTelegramWarning = isTelegram && !isParseModeNone;
-
-  // Check if current integration is a legacy version (canCreate: false)
-  // Legacy integrations are read-only and cannot be edited
-  // Read version from existing integration data (stored in receiver config)
-  const integrationVersion = initialValues?.version || defaultValues.version;
-  const isLegacy = notifier ? isLegacyVersion(notifier.dto, integrationVersion) : false;
-
-  // Get the correct options based on the integration's version
-  // This ensures legacy (v0) integrations display the correct schema
-  const versionedOptions = notifier ? getOptionsForVersion(notifier.dto, integrationVersion) : [];
-
   // if there are mandatory options defined, optional options will be hidden by a collapse
   // if there aren't mandatory options, all options will be shown without collapse
-  const mandatoryOptions = versionedOptions.filter((o) => o.required);
-  const optionalOptions = versionedOptions.filter((o) => !o.required);
+  const mandatoryOptions = notifier?.dto.options.filter((o) => o.required) ?? [];
+  const optionalOptions = notifier?.dto.options.filter((o) => !o.required) ?? [];
 
   const contactPointTypeInputId = `contact-point-type-${pathPrefix}`;
   return (
@@ -242,35 +214,21 @@ export function ChannelSubForm<R extends ChannelValues>({
             data-testid={`${pathPrefix}type`}
             noMargin
           >
-            <Stack direction="row" alignItems="center" gap={1}>
-              <Controller
-                name={typeFieldPath}
-                control={control}
-                defaultValue={defaultValues.type}
-                render={({ field: { ref, onChange, ...field } }) => (
-                  <Select
-                    disabled={!isEditable}
-                    inputId={contactPointTypeInputId}
-                    {...field}
-                    width={37}
-                    options={typeOptions}
-                    onChange={(value) => onChange(value?.value)}
-                  />
-                )}
-              />
-              {isLegacy && integrationVersion && (
-                <Badge
-                  text={getLegacyVersionLabel(integrationVersion)}
-                  color="orange"
-                  icon="exclamation-triangle"
-                  tooltip={t(
-                    'alerting.channel-sub-form.tooltip-legacy-version',
-                    'This is a legacy integration (version: {{version}}). It cannot be modified.',
-                    { version: integrationVersion }
-                  )}
+            <Controller
+              name={typeFieldPath}
+              control={control}
+              defaultValue={defaultValues.type}
+              render={({ field: { ref, onChange, ...field } }) => (
+                <Select
+                  disabled={!isEditable}
+                  inputId={contactPointTypeInputId}
+                  {...field}
+                  width={37}
+                  options={typeOptions}
+                  onChange={(value) => onChange(value?.value)}
                 />
               )}
-            </Stack>
+            />
           </Field>
         </div>
         <div className={styles.buttons}>
@@ -334,7 +292,7 @@ export function ChannelSubForm<R extends ChannelValues>({
                 name: notifier.dto.name,
               })}
             >
-              {notifier.dto.info && (
+              {notifier.dto.info !== '' && (
                 <Alert title="" severity="info">
                   {notifier.dto.info}
                 </Alert>

public/app/features/alerting/unified/components/receivers/form/GrafanaReceiverForm.tsx

@@ -18,13 +18,12 @@ import {
 
 import { alertmanagerApi } from '../../../api/alertmanagerApi';
 import { GrafanaChannelValues, ReceiverFormValues } from '../../../types/receiver-form';
-import { hasLegacyIntegrations } from '../../../utils/notifier-versions';
 import {
   formChannelValuesToGrafanaChannelConfig,
   formValuesToGrafanaReceiver,
   grafanaReceiverToFormValues,
 } from '../../../utils/receiver-form';
-import { ImportedContactPointAlert, ProvisionedResource, ProvisioningAlert } from '../../Provisioning';
+import { ProvisionedResource, ProvisioningAlert } from '../../Provisioning';
 import { ReceiverTypes } from '../grafanaAppReceivers/onCall/onCall';
 import { useOnCallIntegration } from '../grafanaAppReceivers/onCall/useOnCallIntegration';
 
@@ -40,8 +39,6 @@ const defaultChannelValues: GrafanaChannelValues = Object.freeze({
   secureFields: {},
   disableResolveMessage: false,
   type: 'email',
-  // version is intentionally not set here - it will be determined by the notifier's currentVersion
-  // when the integration is created/type is changed. The backend will use its default if not provided.
 });
 
 interface Props {
@@ -70,6 +67,7 @@ export const GrafanaReceiverForm = ({ contactPoint, readOnly = false, editMode }
   } = useOnCallIntegration();
 
   const { data: grafanaNotifiers = [], isLoading: isLoadingNotifiers } = useGrafanaNotifiersQuery();
+
   const [testReceivers, setTestReceivers] = useState<Receiver[]>();
 
   // transform receiver DTO to form values
@@ -137,20 +135,15 @@ export const GrafanaReceiverForm = ({ contactPoint, readOnly = false, editMode }
     );
   }
 
-  // Map notifiers to Notifier[] format for ReceiverForm
-  // The grafanaNotifiers include version-specific options via the versions array from the backend
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
   const notifiers: Notifier[] = grafanaNotifiers.map((n) => {
     if (n.type === ReceiverTypes.OnCall) {
       return {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
-        dto: extendOnCallNotifierFeatures(n as any) as any,
+        dto: extendOnCallNotifierFeatures(n),
         meta: onCallNotifierMeta,
       };
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
-    return { dto: n as any };
+    return { dto: n };
   });
 
   return (
@@ -170,12 +163,7 @@ export const GrafanaReceiverForm = ({ contactPoint, readOnly = false, editMode }
         </Alert>
       )}
 
-      {contactPoint?.provisioned && hasLegacyIntegrations(contactPoint, grafanaNotifiers) && (
-        <ImportedContactPointAlert />
-      )}
-      {contactPoint?.provisioned && !hasLegacyIntegrations(contactPoint, grafanaNotifiers) && (
-        <ProvisioningAlert resource={ProvisionedResource.ContactPoint} />
-      )}
+      {contactPoint?.provisioned && <ProvisioningAlert resource={ProvisionedResource.ContactPoint} />}
 
       <ReceiverForm<GrafanaChannelValues>
         contactPointId={contactPoint?.id}

public/app/features/alerting/unified/rule-list/hooks/grafanaFilter.test.ts

@@ -455,25 +455,6 @@ describe('grafana-managed rules', () => {
         expect(frontendFilter.ruleMatches(regularRule)).toBe(true);
         expect(frontendFilter.ruleMatches(pluginRule)).toBe(true);
       });
-
-      it('should include searchFolder in backend filter when namespace is provided', () => {
-        const { backendFilter } = getGrafanaFilter(getFilter({ namespace: 'my-folder' }));
-
-        expect(backendFilter.searchFolder).toBe('my-folder');
-      });
-
-      it('should skip namespace filtering on frontend when backend filtering is enabled', () => {
-        const group: PromRuleGroupDTO = {
-          name: 'Test Group',
-          file: 'production/alerts',
-          rules: [],
-          interval: 60,
-        };
-
-        const { frontendFilter } = getGrafanaFilter(getFilter({ namespace: 'staging' }));
-        // Should return true because namespace filter is null (handled by backend)
-        expect(frontendFilter.groupMatches(group)).toBe(true);
-      });
     });
 
     describe('when alertingUIUseBackendFilters is disabled', () => {
@@ -556,12 +537,6 @@ describe('grafana-managed rules', () => {
         expect(backendFilter.searchGroupName).toBeUndefined();
       });
 
-      it('should not include searchFolder in backend filter', () => {
-        const { backendFilter } = getGrafanaFilter(getFilter({ namespace: 'my-folder' }));
-
-        expect(backendFilter.searchFolder).toBeUndefined();
-      });
-
       it('should perform groupName filtering on frontend', () => {
         const group: PromRuleGroupDTO = {
           name: 'CPU Usage Alerts',
@@ -731,8 +706,8 @@ describe('grafana-managed rules', () => {
         expect(frontendFilter.groupMatches(group)).toBe(true);
       });
 
-      it('should skip namespace filtering on frontend', () => {
-        // Namespace filter should be handled by backend
+      it('should still apply always-frontend filters (namespace)', () => {
+        // Namespace filter should still work
         const group: PromRuleGroupDTO = {
           name: 'Test Group',
           file: 'production/alerts',
@@ -744,7 +719,7 @@ describe('grafana-managed rules', () => {
         expect(nsFilter.groupMatches(group)).toBe(true);
 
         const { frontendFilter: nsFilter2 } = getGrafanaFilter(getFilter({ namespace: 'staging' }));
-        expect(nsFilter2.groupMatches(group)).toBe(true);
+        expect(nsFilter2.groupMatches(group)).toBe(false);
       });
 
       it('should skip dataSourceNames filtering on frontend (handled by backend)', () => {
@@ -832,8 +807,8 @@ describe('grafana-managed rules', () => {
         expect(hasGrafanaClientSideFilters(getFilter({ labels: ['severity=critical'] }))).toBe(false);
       });
 
-      it('should return false for namespace filter (handled by backend)', () => {
-        expect(hasGrafanaClientSideFilters(getFilter({ namespace: 'production' }))).toBe(false);
+      it('should return true for client-side only filters', () => {
+        expect(hasGrafanaClientSideFilters(getFilter({ namespace: 'production' }))).toBe(true);
       });
 
       it('should return false for plugins filter (handled by backend when feature toggle is enabled)', () => {
@@ -887,8 +862,8 @@ describe('grafana-managed rules', () => {
         expect(hasGrafanaClientSideFilters(getFilter({ ruleHealth: RuleHealth.Ok }))).toBe(false);
         expect(hasGrafanaClientSideFilters(getFilter({ contactPoint: 'my-contact-point' }))).toBe(false);
 
-        // Should return false for: namespace (handled by backend)
-        expect(hasGrafanaClientSideFilters(getFilter({ namespace: 'production' }))).toBe(false);
+        // Should return true for: always-frontend filters only (namespace)
+        expect(hasGrafanaClientSideFilters(getFilter({ namespace: 'production' }))).toBe(true);
 
         // plugins is backend-handled when both feature toggles are enabled
         expect(hasGrafanaClientSideFilters(getFilter({ plugins: 'hide' }))).toBe(false);

public/app/features/alerting/unified/rule-list/hooks/grafanaFilter.ts

@@ -96,7 +96,6 @@ export function getGrafanaFilter(filterState: Partial<RulesFilter>) {
     datasources: ruleFilterConfig.dataSourceNames ? undefined : datasourceUids,
     ruleMatchers: ruleMatchersBackendFilter,
     plugins: ruleFilterConfig.plugins ? undefined : normalizedFilterState.plugins,
-    searchFolder: groupFilterConfig.namespace ? undefined : normalizedFilterState.namespace,
   };
 
   return {
@@ -135,7 +134,7 @@ function buildGrafanaFilterConfigs() {
   };
 
   const groupFilterConfig: GroupFilterConfig = {
-    namespace: useBackendFilters ? null : namespaceFilter,
+    namespace: namespaceFilter,
     groupName: useBackendFilters ? null : groupNameFilter,
   };
 

public/app/features/alerting/unified/rule-list/hooks/prometheusGroupsGenerator.ts

@@ -45,7 +45,6 @@ interface GrafanaPromApiFilter {
   contactPoint?: string;
   title?: string;
   searchGroupName?: string;
-  searchFolder?: string;
   type?: 'alerting' | 'recording';
   dashboardUid?: string;
 }

public/app/features/alerting/unified/rule-list/paginationLimits.test.ts

@@ -75,7 +75,6 @@ describe('paginationLimits', () => {
         { contactPoint: 'slack' },
         { dataSourceNames: ['prometheus'] },
         { labels: ['severity=critical'] },
-        { namespace: 'production' },
       ])(
         'should return rule limit for grafana + large limit for datasource when only backend filters are used: %p',
         (filterState) => {
@@ -85,6 +84,16 @@ describe('paginationLimits', () => {
           expect(datasourceManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
         }
       );
+
+      it.each<Partial<RulesFilter>>([
+        { namespace: 'production' },
+        { ruleState: PromAlertingRuleState.Firing, namespace: 'production' },
+      ])('should return large limits for both when frontend filters are used: %p', (filterState) => {
+        const { grafanaManagedLimit, datasourceManagedLimit } = getFilteredRulesLimits(getFilter(filterState));
+
+        expect(grafanaManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
+        expect(datasourceManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
+      });
     });
 
     describe('when alertingUIUseFullyCompatBackendFilters is enabled', () => {
@@ -149,7 +158,6 @@ describe('paginationLimits', () => {
         { contactPoint: 'slack' },
         { dataSourceNames: ['prometheus'] },
         { labels: ['severity=critical'] },
-        { namespace: 'production' },
       ])(
         'should return rule limit for grafana + large limit for datasource when only backend filters are used: %p',
         (filterState) => {
@@ -159,6 +167,16 @@ describe('paginationLimits', () => {
           expect(datasourceManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
         }
       );
+
+      it.each<Partial<RulesFilter>>([{ namespace: 'production' }])(
+        'should return large limits for both when frontend filters are used: %p',
+        (filterState) => {
+          const { grafanaManagedLimit, datasourceManagedLimit } = getFilteredRulesLimits(getFilter(filterState));
+
+          expect(grafanaManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
+          expect(datasourceManagedLimit).toEqual({ groupLimit: FILTERED_GROUPS_LARGE_API_PAGE_SIZE });
+        }
+      );
     });
   });
 });