chore(i18n): extract translations for alert rules navigation

Add translation strings for the new Alert Rules navigation tabs: - alerting.navigation.alert-rules - alerting.navigation.recently-deleted 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
feat(alerting): add Alert Rules tabs navigation with feature toggle
2026-01-14 13:15:50 +01:00 · 2026-01-14 12:12:08 +01:00
147 changed files with 597 additions and 3612 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -543,7 +543,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /packages/grafana-data/tsconfig.json @grafana/grafana-frontend-platform
 /packages/grafana-data/test/ @grafana/grafana-frontend-platform
 /packages/grafana-data/typings/ @grafana/grafana-frontend-platform
-/packages/grafana-data/scripts/ @grafana/grafana-frontend-platform

 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-data/src/context/plugins/ @grafana/plugins-platform-frontend
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -121,8 +121,6 @@ linters:
            - '**/pkg/tsdb/zipkin/**/*'
            - '**/pkg/tsdb/jaeger/*'
            - '**/pkg/tsdb/jaeger/**/*'
-            - '**/pkg/tsdb/elasticsearch/*'
-            - '**/pkg/tsdb/elasticsearch/**/*'
          deny:
            - pkg: github.com/grafana/grafana/pkg/api
              desc: Core plugins are not allowed to depend on Grafana core packages
--- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
+++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
@@ -800,8 +800,6 @@ VariableOption: {
 	text: string | [...string]
 	// Value of the option
 	value: string | [...string]
-	// Additional properties for multi-props variables
-	properties?: {[string]: string}
 }

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

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

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

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

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

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

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

 // NewDashboardVariableOption creates a new DashboardVariableOption object.
--- a/apps/dashboard/pkg/apis/dashboard/v2beta1/zz_generated.openapi.go
+++ b/apps/dashboard/pkg/apis/dashboard/v2beta1/zz_generated.openapi.go
@@ -5196,22 +5196,6 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardVariableOption(ref common.Refere
 							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1.DashboardStringOrArrayOfString"),
 						},
 					},
-					"properties": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Additional properties for multi-props variables",
-							Type:        []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
 				},
 				Required: []string{"text", "value"},
 			},
--- a/apps/dashboard/pkg/apis/dashboard_manifest.go
+++ b/apps/dashboard/pkg/apis/dashboard_manifest.go
--- a/docs/sources/datasources/google-cloud-monitoring/_index.md
+++ b/docs/sources/datasources/google-cloud-monitoring/_index.md
@@ -103,11 +103,10 @@ To configure basic settings for the data source, complete the following steps:

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

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

 ### Provision the data source

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

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

 ## Import pre-configured dashboards
--- a/docs/sources/introduction/grafana-enterprise.md
+++ b/docs/sources/introduction/grafana-enterprise.md
@@ -87,7 +87,6 @@ With a Grafana Enterprise license, you also get access to premium data sources,
 - [CockroachDB](/grafana/plugins/grafana-cockroachdb-datasource)
 - [Databricks](/grafana/plugins/grafana-databricks-datasource)
 - [DataDog](/grafana/plugins/grafana-datadog-datasource)
- [IBM Db2](/grafana/plugins/grafana-ibmdb2-datasource)
 - [Drone](/grafana/plugins/grafana-drone-datasource)
 - [DynamoDB](/grafana/plugins/grafana-dynamodb-datasource/)
 - [Dynatrace](/grafana/plugins/grafana-dynatrace-datasource)
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -3743,21 +3743,46 @@
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/aggregations.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.ts": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 2
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/aggregations.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
+  "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts": {
+    "@typescript-eslint/consistent-type-assertions": {
+      "count": 1
+    }
+  },
  "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx": {
    "no-restricted-syntax": {
      "count": 1
--- a/go.mod
+++ b/go.mod
@@ -44,8 +44,8 @@ require (
 	github.com/beevik/etree v1.4.1 // @grafana/grafana-backend-group
 	github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-backend
 	github.com/blang/semver/v4 v4.0.0 // indirect; @grafana/grafana-developer-enablement-squad
-	github.com/blevesearch/bleve/v2 v2.5.7 // @grafana/grafana-search-and-storage
-	github.com/blevesearch/bleve_index_api v1.3.0 // @grafana/grafana-search-and-storage
+	github.com/blevesearch/bleve/v2 v2.5.0 // @grafana/grafana-search-and-storage
+	github.com/blevesearch/bleve_index_api v1.2.7 // @grafana/grafana-search-and-storage
 	github.com/blugelabs/bluge v0.2.2 // @grafana/grafana-backend-group
 	github.com/blugelabs/bluge_segment_api v0.2.0 // @grafana/grafana-backend-group
 	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // @grafana/grafana-backend-group
@@ -365,22 +365,22 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.22.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/blevesearch/geo v0.2.4 // indirect
-	github.com/blevesearch/go-faiss v1.0.26 // indirect
+	github.com/blevesearch/geo v0.1.20 // indirect
+	github.com/blevesearch/go-faiss v1.0.25 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
 	github.com/blevesearch/gtreap v0.1.1 // indirect
 	github.com/blevesearch/mmap-go v1.0.4 // indirect
-	github.com/blevesearch/scorch_segment_api/v2 v2.3.13 // indirect
+	github.com/blevesearch/scorch_segment_api/v2 v2.3.9 // indirect
 	github.com/blevesearch/segment v0.9.1 // indirect
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
 	github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
 	github.com/blevesearch/vellum v1.1.0 // indirect
-	github.com/blevesearch/zapx/v11 v11.4.2 // indirect
-	github.com/blevesearch/zapx/v12 v12.4.2 // indirect
-	github.com/blevesearch/zapx/v13 v13.4.2 // indirect
-	github.com/blevesearch/zapx/v14 v14.4.2 // indirect
-	github.com/blevesearch/zapx/v15 v15.4.2 // indirect
-	github.com/blevesearch/zapx/v16 v16.2.8 // indirect
+	github.com/blevesearch/zapx/v11 v11.4.1 // indirect
+	github.com/blevesearch/zapx/v12 v12.4.1 // indirect
+	github.com/blevesearch/zapx/v13 v13.4.1 // indirect
+	github.com/blevesearch/zapx/v14 v14.4.1 // indirect
+	github.com/blevesearch/zapx/v15 v15.4.1 // indirect
+	github.com/blevesearch/zapx/v16 v16.2.2 // indirect
 	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/blugelabs/ice v1.0.0 // indirect
 	github.com/blugelabs/ice/v2 v2.0.1 // indirect
@@ -443,6 +443,7 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
 	github.com/gomodule/redigo v1.8.9 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -931,14 +931,14 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/blevesearch/bleve/v2 v2.5.7 h1:2d9YrL5zrX5EBBW++GOaEKjE+NPWeZGaX77IM26m1Z8=
-github.com/blevesearch/bleve/v2 v2.5.7/go.mod h1:yj0NlS7ocGC4VOSAedqDDMktdh2935v2CSWOCDMHdSA=
-github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E=
-github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
-github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
-github.com/blevesearch/geo v0.2.4/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
-github.com/blevesearch/go-faiss v1.0.26 h1:4dRLolFgjPyjkaXwff4NfbZFdE/dfywbzDqporeQvXI=
-github.com/blevesearch/go-faiss v1.0.26/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
+github.com/blevesearch/bleve/v2 v2.5.0 h1:HzYqBy/5/M9Ul9ESEmXzN/3Jl7YpmWBdHM/+zzv/3k4=
+github.com/blevesearch/bleve/v2 v2.5.0/go.mod h1:PcJzTPnEynO15dCf9isxOga7YFRa/cMSsbnRwnszXUk=
+github.com/blevesearch/bleve_index_api v1.2.7 h1:c8r9vmbaYQroAMSGag7zq5gEVPiuXrUQDqfnj7uYZSY=
+github.com/blevesearch/bleve_index_api v1.2.7/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/geo v0.1.20 h1:paaSpu2Ewh/tn5DKn/FB5SzvH0EWupxHEIwbCk/QPqM=
+github.com/blevesearch/geo v0.1.20/go.mod h1:DVG2QjwHNMFmjo+ZgzrIq2sfCh6rIHzy9d9d0B59I6w=
+github.com/blevesearch/go-faiss v1.0.25 h1:lel1rkOUGbT1CJ0YgzKwC7k+XH0XVBHnCVWahdCXk4U=
+github.com/blevesearch/go-faiss v1.0.25/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y=
@@ -947,8 +947,8 @@ github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+
 github.com/blevesearch/mmap-go v1.0.3/go.mod h1:pYvKl/grLQrBxuaRYgoTssa4rVujYYeenDp++2E+yvs=
 github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
 github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13 h1:ZPjv/4VwWvHJZKeMSgScCapOy8+DdmsmRyLmSB88UoY=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13/go.mod h1:ENk2LClTehOuMS8XzN3UxBEErYmtwkE7MAArFTXs9Vc=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.9 h1:X6nJXnNHl7nasXW+U6y2Ns2Aw8F9STszkYkyBfQ+p0o=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.9/go.mod h1:IrzspZlVjhf4X29oJiEhBxEteTqOY9RlYlk1lCmYHr4=
 github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ=
 github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
 github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
@@ -960,18 +960,18 @@ github.com/blevesearch/vellum v1.0.5/go.mod h1:atE0EH3fvk43zzS7t1YNdNC7DbmcC3uz+
 github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
 github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
 github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
-github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
-github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
-github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
-github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
-github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
-github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
-github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
-github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
-github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
-github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
-github.com/blevesearch/zapx/v16 v16.2.8 h1:SlnzF0YGtSlrsOE3oE7EgEX6BIepGpeqxs1IjMbHLQI=
-github.com/blevesearch/zapx/v16 v16.2.8/go.mod h1:murSoCJPCk25MqURrcJaBQ1RekuqSCSfMjXH4rHyA14=
+github.com/blevesearch/zapx/v11 v11.4.1 h1:qFCPlFbsEdwbbckJkysptSQOsHn4s6ZOHL5GMAIAVHA=
+github.com/blevesearch/zapx/v11 v11.4.1/go.mod h1:qNOGxIqdPC1MXauJCD9HBG487PxviTUUbmChFOAosGs=
+github.com/blevesearch/zapx/v12 v12.4.1 h1:K77bhypII60a4v8mwvav7r4IxWA8qxhNjgF9xGdb9eQ=
+github.com/blevesearch/zapx/v12 v12.4.1/go.mod h1:QRPrlPOzAxBNMI0MkgdD+xsTqx65zbuPr3Ko4Re49II=
+github.com/blevesearch/zapx/v13 v13.4.1 h1:EnkEMZFUK0lsW/jOJJF2xOcp+W8TjEsyeN5BeAZEYYE=
+github.com/blevesearch/zapx/v13 v13.4.1/go.mod h1:e6duBMlCvgbH9rkzNMnUa9hRI9F7ri2BRcHfphcmGn8=
+github.com/blevesearch/zapx/v14 v14.4.1 h1:G47kGCshknBZzZAtjcnIAMn3oNx8XBLxp8DMq18ogyE=
+github.com/blevesearch/zapx/v14 v14.4.1/go.mod h1:O7sDxiaL2r2PnCXbhh1Bvm7b4sP+jp4unE9DDPWGoms=
+github.com/blevesearch/zapx/v15 v15.4.1 h1:B5IoTMUCEzFdc9FSQbhVOxAY+BO17c05866fNruiI7g=
+github.com/blevesearch/zapx/v15 v15.4.1/go.mod h1:b/MreHjYeQoLjyY2+UaM0hGZZUajEbE0xhnr1A2/Q6Y=
+github.com/blevesearch/zapx/v16 v16.2.2 h1:MifKJVRTEhMTgSlle2bDRTb39BGc9jXFRLPZc6r0Rzk=
+github.com/blevesearch/zapx/v16 v16.2.2/go.mod h1:B9Pk4G1CqtErgQV9DyCSA9Lb7WZe4olYfGw7fVDZ4sk=
 github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
 github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
 github.com/blugelabs/bluge v0.2.2 h1:gat8CqE6P6tOgeX30XGLOVNTC26cpM2RWVcreXWtYcM=
@@ -1442,6 +1442,8 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2V
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
+github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
--- a/go.work.sum
+++ b/go.work.sum
@@ -520,40 +520,14 @@ github.com/benbjohnson/immutable v0.4.0 h1:CTqXbEerYso8YzVPxmWxh2gnoRQbbB9X1quUC
 github.com/benbjohnson/immutable v0.4.0/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
-github.com/blevesearch/bleve/v2 v2.5.7 h1:2d9YrL5zrX5EBBW++GOaEKjE+NPWeZGaX77IM26m1Z8=
-github.com/blevesearch/bleve/v2 v2.5.7/go.mod h1:yj0NlS7ocGC4VOSAedqDDMktdh2935v2CSWOCDMHdSA=
-github.com/blevesearch/bleve_index_api v1.2.8/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
-github.com/blevesearch/bleve_index_api v1.2.11 h1:bXQ54kVuwP8hdrXUSOnvTQfgK0KI1+f9A0ITJT8tX1s=
-github.com/blevesearch/bleve_index_api v1.2.11/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
-github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E=
-github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
-github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
-github.com/blevesearch/geo v0.2.4/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
-github.com/blevesearch/go-faiss v1.0.26/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:kDy+zgJFJJoJYBvdfBSiZYBbdsUL0XcjHYWezpQBGPA=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:9eJDeqxJ3E7WnLebQUlPD7ZjSce7AnDb9vjGmMCbD0A=
 github.com/blevesearch/goleveldb v1.0.1 h1:iAtV2Cu5s0GD1lwUiekkFHe2gTMCCNVj2foPclDLIFI=
 github.com/blevesearch/goleveldb v1.0.1/go.mod h1:WrU8ltZbIp0wAoig/MHbrPCXSOLpe79nz5lv5nqfYrQ=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.10/go.mod h1:Z3e6ChN3qyN35yaQpl00MfI5s8AxUJbpTR/DL8QOQ+8=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13 h1:ZPjv/4VwWvHJZKeMSgScCapOy8+DdmsmRyLmSB88UoY=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.13/go.mod h1:ENk2LClTehOuMS8XzN3UxBEErYmtwkE7MAArFTXs9Vc=
 github.com/blevesearch/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A=
 github.com/blevesearch/snowball v0.6.1/go.mod h1:ZF0IBg5vgpeoUhnMza2v0A/z8m1cWPlwhke08LpNusg=
 github.com/blevesearch/stempel v0.2.0 h1:CYzVPaScODMvgE9o+kf6D4RJ/VRomyi9uHF+PtB+Afc=
 github.com/blevesearch/stempel v0.2.0/go.mod h1:wjeTHqQv+nQdbPuJ/YcvOjTInA2EIc6Ks1FoSUzSLvc=
-github.com/blevesearch/vellum v1.0.10/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k=
-github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
-github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
-github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
-github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
-github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
-github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
-github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
-github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
-github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
-github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
-github.com/blevesearch/zapx/v16 v16.2.8 h1:SlnzF0YGtSlrsOE3oE7EgEX6BIepGpeqxs1IjMbHLQI=
-github.com/blevesearch/zapx/v16 v16.2.8/go.mod h1:murSoCJPCk25MqURrcJaBQ1RekuqSCSfMjXH4rHyA14=
 github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
 github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
@@ -1024,6 +998,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250331083058-4563aec7a975
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250331083058-4563aec7a975/go.mod h1:FGdGvhI40Dq+CTQaSzK9evuve774cgOUdGfVO04OXkw=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36 h1:AjZ58JRw1ZieFH/SdsddF5BXtsDKt5kSrKNPWrzYz3Y=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20260112162805-d29cc9cf7f0f h1:9tRhudagkQO2s61SLFLSziIdCm7XlkfypVKDxpcHokg=
+github.com/grafana/prometheus-alertmanager v0.25.1-0.20260112162805-d29cc9cf7f0f/go.mod h1:AsVdCBeDFN9QbgpJg+8voDAcgsW0RmNvBd70ecMMdC0=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
 github.com/grafana/sqlds/v4 v4.2.4/go.mod h1:BQRjUG8rOqrBI4NAaeoWrIMuoNgfi8bdhCJ+5cgEfLU=
@@ -1116,7 +1092,6 @@ github.com/jon-whit/go-grpc-prometheus v1.4.0/go.mod h1:iTPm+Iuhh3IIqR0iGZ91JJEg
 github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a h1:sfe532Ipn7GX0V6mHdynBk393rDmqgI0QmjLK7ct7TU=
 github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a/go.mod h1:dNKs71rs2VJGBAmttu7fouEsRQlRjxy0p1Sx+T5wbpY=
 github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
-github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
 github.com/jsternberg/zap-logfmt v1.3.0 h1:z1n1AOHVVydOOVuyphbOKyR4NICDQFiJMn1IK5hVQ5Y=
 github.com/jsternberg/zap-logfmt v1.3.0/go.mod h1:N3DENp9WNmCZxvkBD/eReWwz1149BK6jEN9cQ4fNwZE=
--- a/jest.config.js
+++ b/jest.config.js
@@ -82,7 +82,6 @@ module.exports = {
    // Decoupled plugins run their own tests so ignoring them here.
    '<rootDir>/public/app/plugins/datasource/azuremonitor',
    '<rootDir>/public/app/plugins/datasource/cloud-monitoring',
-    '<rootDir>/public/app/plugins/datasource/elasticsearch',
    '<rootDir>/public/app/plugins/datasource/grafana-postgresql-datasource',
    '<rootDir>/public/app/plugins/datasource/grafana-pyroscope-datasource',
    '<rootDir>/public/app/plugins/datasource/grafana-testdata-datasource',
--- a/kinds/dashboard/dashboard_kind.cue
+++ b/kinds/dashboard/dashboard_kind.cue
@@ -237,8 +237,6 @@ lineage: schemas: [{
 			text: string | [...string]
 			// Value of the option
 			value: string | [...string]
-			// Additional properties for multi-props variables
-			properties?: {[string]: string}
 		} @cuetsy(kind="interface")

 		// Options to config when to refresh a variable
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -35,14 +35,6 @@
    },
    "./test": {
      "@grafana-app/source": "./test/index.ts"
-    },
-    "./themes/schema.generated.json": {
-      "@grafana-app/source": "./src/themes/schema.generated.json",
-      "default": "./dist/esm/themes/schema.generated.json"
-    },
-    "./themes/definitions/*.json": {
-      "@grafana-app/source": "./src/themes/themeDefinitions/*.json",
-      "default": "./dist/esm/themes/themeDefinitions/*.json"
    }
  },
  "publishConfig": {
@@ -60,7 +52,7 @@
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-npm-package.js",
    "postpack": "mv package.json.bak package.json",
-    "themes-schema": "tsx ./scripts/generateSchema.ts"
+    "themes-schema": "tsx ./src/themes/scripts/generateSchema.ts"
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
@@ -110,7 +102,6 @@
    "react-dom": "18.3.1",
    "rimraf": "6.0.1",
    "rollup": "^4.22.4",
-    "rollup-plugin-copy": "3.5.0",
    "rollup-plugin-esbuild": "6.2.1",
    "rollup-plugin-node-externals": "^8.0.0",
    "tsx": "^4.21.0",
--- a/packages/grafana-data/rollup.config.ts
+++ b/packages/grafana-data/rollup.config.ts
@@ -1,40 +1,21 @@
 import json from '@rollup/plugin-json';
 import { createRequire } from 'node:module';
-import copy from 'rollup-plugin-copy';

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

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

-const grafanaDataPlugins = [
-  ...plugins,
-  copy({
-    targets: [
-      {
-        src: 'src/themes/schema.generated.json',
-        dest: 'dist/esm/',
-      },
-      {
-        src: 'src/themes/themeDefinitions/*.json',
-        dest: 'dist/esm/',
-      },
-    ],
-    flatten: false,
-  }),
-  json(),
-];
-
 export default [
  {
    input: entryPoint,
-    plugins: grafanaDataPlugins,
+    plugins: [...plugins, json()],
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
  {
    input: 'src/unstable.ts',
-    plugins: grafanaDataPlugins,
+    plugins: [...plugins, json()],
    output: [cjsOutput(pkg, 'grafana-data'), esmOutput(pkg, 'grafana-data')],
    treeshake: false,
  },
--- a/packages/grafana-data/scripts/generateSchema.ts
+++ b/packages/grafana-data/scripts/generateSchema.ts
@@ -1,22 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import { NewThemeOptionsSchema } from '../src/themes/createTheme';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const jsonOut = path.join(__dirname, '..', 'src', 'themes', 'schema.generated.json');
-
-fs.writeFileSync(
-  jsonOut,
-  JSON.stringify(
-    NewThemeOptionsSchema.toJSONSchema({
-      target: 'draft-07',
-    }),
-    undefined,
-    2
-  )
-);
-
-console.log('Successfully generated theme schema');
--- a/packages/grafana-data/src/internal/index.ts
+++ b/packages/grafana-data/src/internal/index.ts
@@ -93,6 +93,7 @@ export { DataTransformerID } from '../transformations/transformers/ids';

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

--- a/packages/grafana-data/src/themes/registry.ts
+++ b/packages/grafana-data/src/themes/registry.ts
@@ -1,18 +1,7 @@
 import { Registry, RegistryItem } from '../utils/Registry';

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

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

-const extraThemes: { [key: string]: unknown } = {
-  aubergine,
-  debug,
-  desertbloom,
-  gildedgrove,
-  gloom,
-  mars,
-  matrix,
-  sapphiredusk,
-  synthwave,
-  tron,
-  victorian,
-  zen,
-};
-
 /**
 * @internal
 * Only for internal use, never use this from a plugin
--- a/packages/grafana-data/src/themes/scripts/generateSchema.ts
+++ b/packages/grafana-data/src/themes/scripts/generateSchema.ts
@@ -0,0 +1,19 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import { NewThemeOptionsSchema } from '../createTheme';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+fs.writeFileSync(
+  path.join(__dirname, '../schema.generated.json'),
+  JSON.stringify(
+    NewThemeOptionsSchema.toJSONSchema({
+      target: 'draft-07',
+    }),
+    undefined,
+    2
+  )
+);
--- a/packages/grafana-data/src/themes/themeDefinitions/index.ts
+++ b/packages/grafana-data/src/themes/themeDefinitions/index.ts
@@ -0,0 +1,12 @@
+export { default as aubergine } from './aubergine.json';
+export { default as debug } from './debug.json';
+export { default as desertbloom } from './desertbloom.json';
+export { default as gildedgrove } from './gildedgrove.json';
+export { default as mars } from './mars.json';
+export { default as matrix } from './matrix.json';
+export { default as sapphiredusk } from './sapphiredusk.json';
+export { default as synthwave } from './synthwave.json';
+export { default as tron } from './tron.json';
+export { default as victorian } from './victorian.json';
+export { default as zen } from './zen.json';
+export { default as gloom } from './gloom.json';
--- a/packages/grafana-data/src/types/templateVars.ts
+++ b/packages/grafana-data/src/types/templateVars.ts
@@ -91,8 +91,6 @@ export interface VariableOption {
  text: string | string[];
  value: string | string[];
  isNone?: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  properties?: Record<string, any>;
 }

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

-export {};
+export { default as themeJsonSchema } from './themes/schema.generated.json';
--- a/packages/grafana-data/tsconfig.json
+++ b/packages/grafana-data/tsconfig.json
@@ -8,8 +8,7 @@
    "emitDeclarationOnly": true,
    "isolatedModules": true,
    "rootDirs": ["."],
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true
+    "moduleResolution": "bundler"
  },
  "exclude": ["dist/**/*"],
  "include": [
--- a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
@@ -10,7 +10,7 @@

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

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

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

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

 // Query variable specification
--- a/pkg/kinds/dashboard/dashboard_spec_gen.go
+++ b/pkg/kinds/dashboard/dashboard_spec_gen.go
@@ -903,8 +903,6 @@ type VariableOption struct {
 	Text StringOrArrayOfString `json:"text"`
 	// Value of the option
 	Value StringOrArrayOfString `json:"value"`
-	// Additional properties for multi-props variables
-	Properties map[string]string `json:"properties,omitempty"`
 }

 // NewVariableOption creates a new VariableOption object.
--- a/pkg/services/navtree/navtreeimpl/navtree.go
+++ b/pkg/services/navtree/navtreeimpl/navtree.go
@@ -446,9 +446,32 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext) *navtree.Na
 	}

 	if hasAccess(ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleRead), ac.EvalPermission(ac.ActionAlertingRuleExternalRead))) {
-		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-			Text: "Alert rules", SubTitle: "Rules that determine whether an alert will fire", Id: "alert-list", Url: s.cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
-		})
+		//nolint:staticcheck // not yet migrated to OpenFeature
+		if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingNavigationV2) {
+			// New navigation: Alert rules parent (tabs managed on frontend)
+			alertChildNavs = append(alertChildNavs, &navtree.NavLink{
+				Text: "Alert rules", SubTitle: "Rules that determine whether an alert will fire", Id: "alert-rules", Url: s.cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
+			})
+
+			// Add child nav items for permission checking (tabs will be rendered by frontend)
+			// Alert rules list tab
+			alertChildNavs = append(alertChildNavs, &navtree.NavLink{
+				Text: "Alert rules", Id: "alert-rules-list", Url: s.cfg.AppSubURL + "/alerting/list",
+			})
+
+			// Recently deleted tab (check additional feature flags)
+			//nolint:staticcheck // not yet migrated to OpenFeature
+			if c.GetOrgRole() == org.RoleAdmin && s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertRuleRestore) && s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingRuleRecoverDeleted) {
+				alertChildNavs = append(alertChildNavs, &navtree.NavLink{
+					Text: "Recently deleted", Id: "alert-rules-recently-deleted", Url: s.cfg.AppSubURL + "/alerting/recently-deleted",
+				})
+			}
+		} else {
+			// Legacy navigation
+			alertChildNavs = append(alertChildNavs, &navtree.NavLink{
+				Text: "Alert rules", SubTitle: "Rules that determine whether an alert will fire", Id: "alert-list", Url: s.cfg.AppSubURL + "/alerting/list", Icon: "list-ul",
+			})
+		}
 	}

 	contactPointsPerms := []ac.Evaluator{
@@ -508,12 +531,16 @@ func (s *ServiceImpl) buildAlertNavLinks(c *contextmodel.ReqContext) *navtree.Na
 	}
 	//nolint:staticcheck // not yet migrated to OpenFeature
 	if c.GetOrgRole() == org.RoleAdmin && s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertRuleRestore) && s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingRuleRecoverDeleted) {
-		alertChildNavs = append(alertChildNavs, &navtree.NavLink{
-			Text:     "Recently deleted",
-			SubTitle: "Any items listed here for more than 30 days will be automatically deleted.",
-			Id:       "alerts/recently-deleted",
-			Url:      s.cfg.AppSubURL + "/alerting/recently-deleted",
-		})
+		// Only show as standalone item in legacy navigation (V2 shows it as a tab under Alert rules)
+		//nolint:staticcheck // not yet migrated to OpenFeature
+		if !s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagAlertingNavigationV2) {
+			alertChildNavs = append(alertChildNavs, &navtree.NavLink{
+				Text:     "Recently deleted",
+				SubTitle: "Any items listed here for more than 30 days will be automatically deleted.",
+				Id:       "alerts/recently-deleted",
+				Url:      s.cfg.AppSubURL + "/alerting/recently-deleted",
+			})
+		}
 	}

 	if c.GetOrgRole() == org.RoleAdmin {
--- a/pkg/setting/setting.go
+++ b/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
--- a/pkg/setting/setting_unified_storage.go
+++ b/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()
--- a/pkg/storage/unified/proto/search.proto
+++ b/pkg/storage/unified/proto/search.proto
@@ -9,13 +9,11 @@ import "resource.proto";
 // Unlike the ResourceStore, this service can be exposed to clients directly
 // It should be implemented with efficient indexes and does not need read-after-write semantics
 service ResourceIndex {
-  // Query for documents
  rpc Search(ResourceSearchRequest) returns (ResourceSearchResponse);

  // Get the resource stats
  rpc GetStats(ResourceStatsRequest) returns (ResourceStatsResponse);

-  // Rebuild the search index
  rpc RebuildIndexes(RebuildIndexesRequest) returns (RebuildIndexesResponse);
 }

@@ -51,20 +49,6 @@ message ResourceStatsResponse {
  repeated Stats stats = 2;
 }

-// This controls what query and analyzers are applied to the specified field
-// See: https://blevesearch.com/docs/Analyzers/
-enum QueryFieldType {
-  // Picks a reasonable analyzer given the input.  Currently this always uses TEXT
-  // In the future, it may change to depend on the indexed field type
-  DEFAULT = 0;
-  // Use free text analyzer.  The query is broken into a normalized set of tokens
-  TEXT = 1;
-  // The query must exactly match the indexed token
-  KEYWORD = 2;
-  // Like a text query, but the position and offsets influence the score
-  PHRASE = 3; 
-}
-
 // Search within a single resource
 message ResourceSearchRequest {
  message Sort {
@@ -80,18 +64,6 @@ message ResourceSearchRequest {
    // date queries
  }

-  // Defines the field in the index to query
-  // Boost is optional, and allows weighting the field higher in the results
-  message QueryField {
-    // The field name in the index to query
-    string name = 1;
-
-    QueryFieldType type = 2;
-
-    // Boost value for this field
-    float boost = 3;
-  }
-
  // The key must include namespace + group + resource
  ListOptions options = 1;

@@ -127,9 +99,6 @@ message ResourceSearchRequest {
  int64 page = 11;

  int64 permission = 12;
-
-  // Optionally specify which fields are included in the query
-  repeated QueryField query_fields = 13;
 }

 message ResourceSearchResponse {
--- a/pkg/storage/unified/resource/document.go
+++ b/pkg/storage/unified/resource/document.go
@@ -290,6 +290,7 @@ const SEARCH_FIELD_NAMESPACE = "namespace"
 const SEARCH_FIELD_NAME = "name"
 const SEARCH_FIELD_RV = "rv"
 const SEARCH_FIELD_TITLE = "title"
+const SEARCH_FIELD_TITLE_NGRAM = "title_ngram"
 const SEARCH_FIELD_TITLE_PHRASE = "title_phrase" // filtering/sorting on title by full phrase
 const SEARCH_FIELD_DESCRIPTION = "description"
 const SEARCH_FIELD_TAGS = "tags"
--- a/pkg/storage/unified/resourcepb/search.pb.go
+++ b/pkg/storage/unified/resourcepb/search.pb.go
@@ -21,65 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )

-// This controls what query and analyzers are applied to the specified field
-// See: https://blevesearch.com/docs/Analyzers/
-type QueryFieldType int32
-
-const (
-	// Picks a reasonable analyzer given the input.  Currently this always uses TEXT
-	// In the future, it may change to depend on the indexed field type
-	QueryFieldType_DEFAULT QueryFieldType = 0
-	// Use free text analyzer.  The query is broken into a normalized set of tokens
-	QueryFieldType_TEXT QueryFieldType = 1
-	// The query must exactly match the indexed token
-	QueryFieldType_KEYWORD QueryFieldType = 2
-	// Like a text query, but the position and offsets influence the score
-	QueryFieldType_PHRASE QueryFieldType = 3
-)
-
-// Enum value maps for QueryFieldType.
-var (
-	QueryFieldType_name = map[int32]string{
-		0: "DEFAULT",
-		1: "TEXT",
-		2: "KEYWORD",
-		3: "PHRASE",
-	}
-	QueryFieldType_value = map[string]int32{
-		"DEFAULT": 0,
-		"TEXT":    1,
-		"KEYWORD": 2,
-		"PHRASE":  3,
-	}
-)
-
-func (x QueryFieldType) Enum() *QueryFieldType {
-	p := new(QueryFieldType)
-	*p = x
-	return p
-}
-
-func (x QueryFieldType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (QueryFieldType) Descriptor() protoreflect.EnumDescriptor {
-	return file_search_proto_enumTypes[0].Descriptor()
-}
-
-func (QueryFieldType) Type() protoreflect.EnumType {
-	return &file_search_proto_enumTypes[0]
-}
-
-func (x QueryFieldType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use QueryFieldType.Descriptor instead.
-func (QueryFieldType) EnumDescriptor() ([]byte, []int) {
-	return file_search_proto_rawDescGZIP(), []int{0}
-}
-
 // Get statistics across multiple resources
 // For these queries, we do not need authorization to see the actual values
 type ResourceStatsRequest struct {
@@ -224,12 +165,10 @@ type ResourceSearchRequest struct {
 	// the return fields (empty will return everything)
 	Fields []string `protobuf:"bytes,8,rep,name=fields,proto3" json:"fields,omitempty"`
 	// explain each result (added to the each row)
-	Explain    bool  `protobuf:"varint,9,opt,name=explain,proto3" json:"explain,omitempty"`
-	IsDeleted  bool  `protobuf:"varint,10,opt,name=is_deleted,json=isDeleted,proto3" json:"is_deleted,omitempty"`
-	Page       int64 `protobuf:"varint,11,opt,name=page,proto3" json:"page,omitempty"`
-	Permission int64 `protobuf:"varint,12,opt,name=permission,proto3" json:"permission,omitempty"`
-	// Optionally specify which fields are included in the query
-	QueryFields   []*ResourceSearchRequest_QueryField `protobuf:"bytes,13,rep,name=query_fields,json=queryFields,proto3" json:"query_fields,omitempty"`
+	Explain       bool  `protobuf:"varint,9,opt,name=explain,proto3" json:"explain,omitempty"`
+	IsDeleted     bool  `protobuf:"varint,10,opt,name=is_deleted,json=isDeleted,proto3" json:"is_deleted,omitempty"`
+	Page          int64 `protobuf:"varint,11,opt,name=page,proto3" json:"page,omitempty"`
+	Permission    int64 `protobuf:"varint,12,opt,name=permission,proto3" json:"permission,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -348,13 +287,6 @@ func (x *ResourceSearchRequest) GetPermission() int64 {
 	return 0
 }

-func (x *ResourceSearchRequest) GetQueryFields() []*ResourceSearchRequest_QueryField {
-	if x != nil {
-		return x.QueryFields
-	}
-	return nil
-}
-
 type ResourceSearchResponse struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// Error details
@@ -738,70 +670,6 @@ func (x *ResourceSearchRequest_Facet) GetLimit() int64 {
 	return 0
 }

-// Defines the field in the index to query
-// Boost is optional, and allows weighting the field higher in the results
-type ResourceSearchRequest_QueryField struct {
-	state protoimpl.MessageState `protogen:"open.v1"`
-	// The field name in the index to query
-	Name string         `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Type QueryFieldType `protobuf:"varint,2,opt,name=type,proto3,enum=resource.QueryFieldType" json:"type,omitempty"`
-	// Boost value for this field
-	Boost         float32 `protobuf:"fixed32,3,opt,name=boost,proto3" json:"boost,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *ResourceSearchRequest_QueryField) Reset() {
-	*x = ResourceSearchRequest_QueryField{}
-	mi := &file_search_proto_msgTypes[9]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *ResourceSearchRequest_QueryField) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResourceSearchRequest_QueryField) ProtoMessage() {}
-
-func (x *ResourceSearchRequest_QueryField) ProtoReflect() protoreflect.Message {
-	mi := &file_search_proto_msgTypes[9]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResourceSearchRequest_QueryField.ProtoReflect.Descriptor instead.
-func (*ResourceSearchRequest_QueryField) Descriptor() ([]byte, []int) {
-	return file_search_proto_rawDescGZIP(), []int{2, 2}
-}
-
-func (x *ResourceSearchRequest_QueryField) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ResourceSearchRequest_QueryField) GetType() QueryFieldType {
-	if x != nil {
-		return x.Type
-	}
-	return QueryFieldType_DEFAULT
-}
-
-func (x *ResourceSearchRequest_QueryField) GetBoost() float32 {
-	if x != nil {
-		return x.Boost
-	}
-	return 0
-}
-
 type ResourceSearchResponse_Facet struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	Field string                 `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"`
@@ -817,7 +685,7 @@ type ResourceSearchResponse_Facet struct {

 func (x *ResourceSearchResponse_Facet) Reset() {
 	*x = ResourceSearchResponse_Facet{}
-	mi := &file_search_proto_msgTypes[11]
+	mi := &file_search_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -829,7 +697,7 @@ func (x *ResourceSearchResponse_Facet) String() string {
 func (*ResourceSearchResponse_Facet) ProtoMessage() {}

 func (x *ResourceSearchResponse_Facet) ProtoReflect() protoreflect.Message {
-	mi := &file_search_proto_msgTypes[11]
+	mi := &file_search_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -883,7 +751,7 @@ type ResourceSearchResponse_TermFacet struct {

 func (x *ResourceSearchResponse_TermFacet) Reset() {
 	*x = ResourceSearchResponse_TermFacet{}
-	mi := &file_search_proto_msgTypes[12]
+	mi := &file_search_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -895,7 +763,7 @@ func (x *ResourceSearchResponse_TermFacet) String() string {
 func (*ResourceSearchResponse_TermFacet) ProtoMessage() {}

 func (x *ResourceSearchResponse_TermFacet) ProtoReflect() protoreflect.Message {
-	mi := &file_search_proto_msgTypes[12]
+	mi := &file_search_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -950,7 +818,7 @@ var file_search_proto_rawDesc = string([]byte{
 	0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x22, 0xc3, 0x06, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65,
+	0x74, 0x22, 0x8e, 0x05, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65,
 	0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x07, 0x6f,
 	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72,
 	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4f, 0x70, 0x74, 0x69,
@@ -978,109 +846,93 @@ var file_search_proto_rawDesc = string([]byte{
 	0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x0b,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65,
 	0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
-	0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x0c, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f,
+	0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x30, 0x0a, 0x04, 0x53, 0x6f,
+	0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x65, 0x73, 0x63,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x65, 0x73, 0x63, 0x1a, 0x33, 0x0a, 0x05,
+	0x46, 0x61, 0x63, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69,
+	0x74, 0x1a, 0x5f, 0x0a, 0x0a, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x3b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x25, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f,
 	0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x0b, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x1a, 0x30, 0x0a, 0x04, 0x53, 0x6f, 0x72,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x65, 0x73, 0x63, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x65, 0x73, 0x63, 0x1a, 0x33, 0x0a, 0x05, 0x46,
-	0x61, 0x63, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x1a, 0x64, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x2c, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x18, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52,
-	0x05, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x1a, 0x5f, 0x0a, 0x0a, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x3b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x61, 0x63, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xea, 0x04, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x6f,
+	0x74, 0x2e, 0x46, 0x61, 0x63, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0xea, 0x04, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a,
+	0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x07, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f,
+	0x68, 0x69, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61,
+	0x6c, 0x48, 0x69, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x63,
+	0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79,
+	0x43, 0x6f, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x63, 0x6f, 0x72,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x53, 0x63, 0x6f, 0x72,
+	0x65, 0x12, 0x41, 0x0a, 0x05, 0x66, 0x61, 0x63, 0x65, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2b, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f,
 	0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x2b, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x15, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
-	0x27, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72,
+	0x73, 0x65, 0x2e, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66,
+	0x61, 0x63, 0x65, 0x74, 0x1a, 0x8f, 0x01, 0x0a, 0x05, 0x46, 0x61, 0x63, 0x65, 0x74, 0x12, 0x14,
+	0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66,
+	0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x69,
+	0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x69, 0x73,
+	0x73, 0x69, 0x6e, 0x67, 0x12, 0x40, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x46, 0x61, 0x63, 0x65, 0x74, 0x52,
+	0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x1a, 0x35, 0x0a, 0x09, 0x54, 0x65, 0x72, 0x6d, 0x46, 0x61,
+	0x63, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x60, 0x0a,
+	0x0a, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x3c, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x72,
 	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x4b, 0x65, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74,
-	0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x68, 0x69, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x48, 0x69, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09,
-	0x71, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78,
-	0x5f, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x61,
-	0x78, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x41, 0x0a, 0x05, 0x66, 0x61, 0x63, 0x65, 0x74, 0x18,
-	0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x05, 0x66, 0x61, 0x63, 0x65, 0x74, 0x1a, 0x8f, 0x01, 0x0a, 0x05, 0x46, 0x61,
-	0x63, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74,
-	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12,
-	0x18, 0x0a, 0x07, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x40, 0x0a, 0x05, 0x74, 0x65, 0x72,
-	0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72,
-	0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x46,
-	0x61, 0x63, 0x65, 0x74, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x1a, 0x35, 0x0a, 0x09, 0x54,
-	0x65, 0x72, 0x6d, 0x46, 0x61, 0x63, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x72, 0x6d,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x1a, 0x60, 0x0a, 0x0a, 0x46, 0x61, 0x63, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x3c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x26, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x46, 0x61, 0x63, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x60, 0x0a, 0x15, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a,
-	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x04, 0x6b,
-	0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79,
-	0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x16, 0x52, 0x65, 0x62, 0x75, 0x69,
-	0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12,
-	0x2b, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2a, 0x40, 0x0a, 0x0e,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b,
-	0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x54,
-	0x45, 0x58, 0x54, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4b, 0x45, 0x59, 0x57, 0x4f, 0x52, 0x44,
-	0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x48, 0x52, 0x41, 0x53, 0x45, 0x10, 0x03, 0x32, 0xfe,
-	0x01, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78,
-	0x12, 0x4b, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x1f, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65,
-	0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a,
-	0x08, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x52, 0x65,
-	0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42,
-	0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x72,
-	0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x70, 0x6b,
-	0x67, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65,
-	0x64, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x46,
+	0x61, 0x63, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x60, 0x0a, 0x15, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d,
+	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x04, 0x6b, 0x65, 0x79,
+	0x73, 0x22, 0x83, 0x01, 0x0a, 0x16, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x64,
+	0x65, 0x78, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0c,
+	0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x32, 0xfe, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x4b, 0x0a, 0x06, 0x53, 0x65, 0x61,
+	0x72, 0x63, 0x68, 0x12, 0x1f, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61,
+	0x74, 0x73, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x2e, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x2e, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x67,
+	0x72, 0x61, 0x66, 0x61, 0x6e, 0x61, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61,
+	0x67, 0x65, 0x2f, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 })

 var (
@@ -1095,58 +947,53 @@ func file_search_proto_rawDescGZIP() []byte {
 	return file_search_proto_rawDescData
 }

-var file_search_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_search_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_search_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_search_proto_goTypes = []any{
-	(QueryFieldType)(0),                      // 0: resource.QueryFieldType
-	(*ResourceStatsRequest)(nil),             // 1: resource.ResourceStatsRequest
-	(*ResourceStatsResponse)(nil),            // 2: resource.ResourceStatsResponse
-	(*ResourceSearchRequest)(nil),            // 3: resource.ResourceSearchRequest
-	(*ResourceSearchResponse)(nil),           // 4: resource.ResourceSearchResponse
-	(*RebuildIndexesRequest)(nil),            // 5: resource.RebuildIndexesRequest
-	(*RebuildIndexesResponse)(nil),           // 6: resource.RebuildIndexesResponse
-	(*ResourceStatsResponse_Stats)(nil),      // 7: resource.ResourceStatsResponse.Stats
-	(*ResourceSearchRequest_Sort)(nil),       // 8: resource.ResourceSearchRequest.Sort
-	(*ResourceSearchRequest_Facet)(nil),      // 9: resource.ResourceSearchRequest.Facet
-	(*ResourceSearchRequest_QueryField)(nil), // 10: resource.ResourceSearchRequest.QueryField
-	nil,                                      // 11: resource.ResourceSearchRequest.FacetEntry
-	(*ResourceSearchResponse_Facet)(nil),     // 12: resource.ResourceSearchResponse.Facet
-	(*ResourceSearchResponse_TermFacet)(nil), // 13: resource.ResourceSearchResponse.TermFacet
-	nil,                                      // 14: resource.ResourceSearchResponse.FacetEntry
-	(*ErrorResult)(nil),                      // 15: resource.ErrorResult
-	(*ListOptions)(nil),                      // 16: resource.ListOptions
-	(*ResourceKey)(nil),                      // 17: resource.ResourceKey
-	(*ResourceTable)(nil),                    // 18: resource.ResourceTable
+	(*ResourceStatsRequest)(nil),             // 0: resource.ResourceStatsRequest
+	(*ResourceStatsResponse)(nil),            // 1: resource.ResourceStatsResponse
+	(*ResourceSearchRequest)(nil),            // 2: resource.ResourceSearchRequest
+	(*ResourceSearchResponse)(nil),           // 3: resource.ResourceSearchResponse
+	(*RebuildIndexesRequest)(nil),            // 4: resource.RebuildIndexesRequest
+	(*RebuildIndexesResponse)(nil),           // 5: resource.RebuildIndexesResponse
+	(*ResourceStatsResponse_Stats)(nil),      // 6: resource.ResourceStatsResponse.Stats
+	(*ResourceSearchRequest_Sort)(nil),       // 7: resource.ResourceSearchRequest.Sort
+	(*ResourceSearchRequest_Facet)(nil),      // 8: resource.ResourceSearchRequest.Facet
+	nil,                                      // 9: resource.ResourceSearchRequest.FacetEntry
+	(*ResourceSearchResponse_Facet)(nil),     // 10: resource.ResourceSearchResponse.Facet
+	(*ResourceSearchResponse_TermFacet)(nil), // 11: resource.ResourceSearchResponse.TermFacet
+	nil,                                      // 12: resource.ResourceSearchResponse.FacetEntry
+	(*ErrorResult)(nil),                      // 13: resource.ErrorResult
+	(*ListOptions)(nil),                      // 14: resource.ListOptions
+	(*ResourceKey)(nil),                      // 15: resource.ResourceKey
+	(*ResourceTable)(nil),                    // 16: resource.ResourceTable
 }
 var file_search_proto_depIdxs = []int32{
-	15, // 0: resource.ResourceStatsResponse.error:type_name -> resource.ErrorResult
-	7,  // 1: resource.ResourceStatsResponse.stats:type_name -> resource.ResourceStatsResponse.Stats
-	16, // 2: resource.ResourceSearchRequest.options:type_name -> resource.ListOptions
-	17, // 3: resource.ResourceSearchRequest.federated:type_name -> resource.ResourceKey
-	8,  // 4: resource.ResourceSearchRequest.sortBy:type_name -> resource.ResourceSearchRequest.Sort
-	11, // 5: resource.ResourceSearchRequest.facet:type_name -> resource.ResourceSearchRequest.FacetEntry
-	10, // 6: resource.ResourceSearchRequest.query_fields:type_name -> resource.ResourceSearchRequest.QueryField
-	15, // 7: resource.ResourceSearchResponse.error:type_name -> resource.ErrorResult
-	17, // 8: resource.ResourceSearchResponse.key:type_name -> resource.ResourceKey
-	18, // 9: resource.ResourceSearchResponse.results:type_name -> resource.ResourceTable
-	14, // 10: resource.ResourceSearchResponse.facet:type_name -> resource.ResourceSearchResponse.FacetEntry
-	17, // 11: resource.RebuildIndexesRequest.keys:type_name -> resource.ResourceKey
-	15, // 12: resource.RebuildIndexesResponse.error:type_name -> resource.ErrorResult
-	0,  // 13: resource.ResourceSearchRequest.QueryField.type:type_name -> resource.QueryFieldType
-	9,  // 14: resource.ResourceSearchRequest.FacetEntry.value:type_name -> resource.ResourceSearchRequest.Facet
-	13, // 15: resource.ResourceSearchResponse.Facet.terms:type_name -> resource.ResourceSearchResponse.TermFacet
-	12, // 16: resource.ResourceSearchResponse.FacetEntry.value:type_name -> resource.ResourceSearchResponse.Facet
-	3,  // 17: resource.ResourceIndex.Search:input_type -> resource.ResourceSearchRequest
-	1,  // 18: resource.ResourceIndex.GetStats:input_type -> resource.ResourceStatsRequest
-	5,  // 19: resource.ResourceIndex.RebuildIndexes:input_type -> resource.RebuildIndexesRequest
-	4,  // 20: resource.ResourceIndex.Search:output_type -> resource.ResourceSearchResponse
-	2,  // 21: resource.ResourceIndex.GetStats:output_type -> resource.ResourceStatsResponse
-	6,  // 22: resource.ResourceIndex.RebuildIndexes:output_type -> resource.RebuildIndexesResponse
-	20, // [20:23] is the sub-list for method output_type
-	17, // [17:20] is the sub-list for method input_type
-	17, // [17:17] is the sub-list for extension type_name
-	17, // [17:17] is the sub-list for extension extendee
-	0,  // [0:17] is the sub-list for field type_name
+	13, // 0: resource.ResourceStatsResponse.error:type_name -> resource.ErrorResult
+	6,  // 1: resource.ResourceStatsResponse.stats:type_name -> resource.ResourceStatsResponse.Stats
+	14, // 2: resource.ResourceSearchRequest.options:type_name -> resource.ListOptions
+	15, // 3: resource.ResourceSearchRequest.federated:type_name -> resource.ResourceKey
+	7,  // 4: resource.ResourceSearchRequest.sortBy:type_name -> resource.ResourceSearchRequest.Sort
+	9,  // 5: resource.ResourceSearchRequest.facet:type_name -> resource.ResourceSearchRequest.FacetEntry
+	13, // 6: resource.ResourceSearchResponse.error:type_name -> resource.ErrorResult
+	15, // 7: resource.ResourceSearchResponse.key:type_name -> resource.ResourceKey
+	16, // 8: resource.ResourceSearchResponse.results:type_name -> resource.ResourceTable
+	12, // 9: resource.ResourceSearchResponse.facet:type_name -> resource.ResourceSearchResponse.FacetEntry
+	15, // 10: resource.RebuildIndexesRequest.keys:type_name -> resource.ResourceKey
+	13, // 11: resource.RebuildIndexesResponse.error:type_name -> resource.ErrorResult
+	8,  // 12: resource.ResourceSearchRequest.FacetEntry.value:type_name -> resource.ResourceSearchRequest.Facet
+	11, // 13: resource.ResourceSearchResponse.Facet.terms:type_name -> resource.ResourceSearchResponse.TermFacet
+	10, // 14: resource.ResourceSearchResponse.FacetEntry.value:type_name -> resource.ResourceSearchResponse.Facet
+	2,  // 15: resource.ResourceIndex.Search:input_type -> resource.ResourceSearchRequest
+	0,  // 16: resource.ResourceIndex.GetStats:input_type -> resource.ResourceStatsRequest
+	4,  // 17: resource.ResourceIndex.RebuildIndexes:input_type -> resource.RebuildIndexesRequest
+	3,  // 18: resource.ResourceIndex.Search:output_type -> resource.ResourceSearchResponse
+	1,  // 19: resource.ResourceIndex.GetStats:output_type -> resource.ResourceStatsResponse
+	5,  // 20: resource.ResourceIndex.RebuildIndexes:output_type -> resource.RebuildIndexesResponse
+	18, // [18:21] is the sub-list for method output_type
+	15, // [15:18] is the sub-list for method input_type
+	15, // [15:15] is the sub-list for extension type_name
+	15, // [15:15] is the sub-list for extension extendee
+	0,  // [0:15] is the sub-list for field type_name
 }

 func init() { file_search_proto_init() }
@@ -1160,14 +1007,13 @@ func file_search_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_search_proto_rawDesc), len(file_search_proto_rawDesc)),
-			NumEnums:      1,
-			NumMessages:   14,
+			NumEnums:      0,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
 		GoTypes:           file_search_proto_goTypes,
 		DependencyIndexes: file_search_proto_depIdxs,
-		EnumInfos:         file_search_proto_enumTypes,
 		MessageInfos:      file_search_proto_msgTypes,
 	}.Build()
 	File_search_proto = out.File
--- a/pkg/storage/unified/resourcepb/search_grpc.pb.go
+++ b/pkg/storage/unified/resourcepb/search_grpc.pb.go
@@ -31,11 +31,9 @@ const (
 // Unlike the ResourceStore, this service can be exposed to clients directly
 // It should be implemented with efficient indexes and does not need read-after-write semantics
 type ResourceIndexClient interface {
-	// Query for documents
 	Search(ctx context.Context, in *ResourceSearchRequest, opts ...grpc.CallOption) (*ResourceSearchResponse, error)
 	// Get the resource stats
 	GetStats(ctx context.Context, in *ResourceStatsRequest, opts ...grpc.CallOption) (*ResourceStatsResponse, error)
-	// Rebuild the search index
 	RebuildIndexes(ctx context.Context, in *RebuildIndexesRequest, opts ...grpc.CallOption) (*RebuildIndexesResponse, error)
 }

@@ -84,11 +82,9 @@ func (c *resourceIndexClient) RebuildIndexes(ctx context.Context, in *RebuildInd
 // Unlike the ResourceStore, this service can be exposed to clients directly
 // It should be implemented with efficient indexes and does not need read-after-write semantics
 type ResourceIndexServer interface {
-	// Query for documents
 	Search(context.Context, *ResourceSearchRequest) (*ResourceSearchResponse, error)
 	// Get the resource stats
 	GetStats(context.Context, *ResourceStatsRequest) (*ResourceStatsResponse, error)
-	// Rebuild the search index
 	RebuildIndexes(context.Context, *RebuildIndexesRequest) (*RebuildIndexesResponse, error)
 }

--- a/pkg/storage/unified/search/bleve.go
+++ b/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
 	}
@@ -1182,7 +1177,6 @@ func (b *bleveIndex) getIndex(
 	return b.index, nil
 }

-// nolint:gocyclo
 func (b *bleveIndex) toBleveSearchRequest(ctx context.Context, req *resourcepb.ResourceSearchRequest, access authlib.AccessClient) (*bleve.SearchRequest, *resourcepb.ErrorResult) {
 	ctx, span := tracer.Start(ctx, "search.bleveIndex.toBleveSearchRequest")
 	defer span.End()
@@ -1241,62 +1235,42 @@ func (b *bleveIndex) toBleveSearchRequest(ctx context.Context, req *resourcepb.R
 		}
 	}

-	if len(req.Query) > 1 {
-		if strings.Contains(req.Query, "*") {
-			// wildcard query is expensive - should be used with caution
-			wildcard := bleve.NewWildcardQuery(req.Query)
-			queries = append(queries, wildcard)
-		} else {
-			// When using a
-			searchrequest.Fields = append(searchrequest.Fields, resource.SEARCH_FIELD_SCORE)
-			disjoin := bleve.NewDisjunctionQuery()
-			queries = append(queries, disjoin)
+	if len(req.Query) > 1 && strings.Contains(req.Query, "*") {
+		// wildcard query is expensive - should be used with caution
+		wildcard := bleve.NewWildcardQuery(req.Query)
+		queries = append(queries, wildcard)
+	}

-			queryFields := req.QueryFields
-			if len(queryFields) == 0 {
-				queryFields = []*resourcepb.ResourceSearchRequest_QueryField{
-					{
-						Name:  resource.SEARCH_FIELD_TITLE,
-						Type:  resourcepb.QueryFieldType_KEYWORD,
-						Boost: 10, // exact match -- includes ngrams! If they lived on their own field, we could score them differently
-					}, {
-						Name:  resource.SEARCH_FIELD_TITLE,
-						Type:  resourcepb.QueryFieldType_TEXT,
-						Boost: 2, // standard analyzer (with ngrams!)
-					}, {
-						Name:  resource.SEARCH_FIELD_TITLE_PHRASE,
-						Type:  resourcepb.QueryFieldType_TEXT,
-						Boost: 5, // standard analyzer
-					},
-				}
-			}
+	if req.Query != "" && !strings.Contains(req.Query, "*") {
+		// Add a text query
+		searchrequest.Fields = append(searchrequest.Fields, resource.SEARCH_FIELD_SCORE)

-			for _, field := range queryFields {
-				switch field.Type {
-				case resourcepb.QueryFieldType_TEXT, resourcepb.QueryFieldType_DEFAULT:
-					q := bleve.NewMatchQuery(removeSmallTerms(req.Query)) // removeSmallTerms should be part of the analyzer
-					q.SetBoost(float64(field.Boost))
-					q.SetField(field.Name)
-					q.Analyzer = standard.Name               // analyze the text
-					q.Operator = query.MatchQueryOperatorAnd // all terms must match
-					disjoin.AddQuery(q)
+		// There are multiple ways to match the query string to documents. The following queries are ordered by priority:

-				case resourcepb.QueryFieldType_KEYWORD:
-					q := bleve.NewMatchQuery(req.Query)
-					q.SetBoost(float64(field.Boost))
-					q.SetField(field.Name)
-					q.Analyzer = keyword.Name // don't analyze the query input - treat it as a single token
-					disjoin.AddQuery(q)
+		// Query 1: Match the exact query string
+		queryExact := bleve.NewMatchQuery(req.Query)
+		queryExact.SetBoost(10.0)
+		queryExact.SetField(resource.SEARCH_FIELD_TITLE)
+		queryExact.Analyzer = keyword.Name                // don't analyze the query input - treat it as a single token
+		queryExact.Operator = query.MatchQueryOperatorAnd // This doesn't make a difference for keyword analyzer, we add it just to be explicit.
+		searchQuery := bleve.NewDisjunctionQuery(queryExact)

-				case resourcepb.QueryFieldType_PHRASE:
-					q := bleve.NewMatchPhraseQuery(req.Query)
-					q.SetBoost(float64(field.Boost))
-					q.SetField(field.Name)
-					q.Analyzer = standard.Name
-					disjoin.AddQuery(q)
-				}
-			}
-		}
+		// Query 2: Phrase query with standard analyzer
+		queryPhrase := bleve.NewMatchPhraseQuery(req.Query)
+		queryPhrase.SetBoost(5.0)
+		queryPhrase.SetField(resource.SEARCH_FIELD_TITLE)
+		queryPhrase.Analyzer = standard.Name
+		searchQuery.AddQuery(queryPhrase)
+
+		// Query 3: Match query with standard analyzer
+		queryAnalyzed := bleve.NewMatchQuery(removeSmallTerms(req.Query))
+		queryAnalyzed.SetField(resource.SEARCH_FIELD_TITLE)
+		queryAnalyzed.SetBoost(2.0)
+		queryAnalyzed.Analyzer = standard.Name
+		queryAnalyzed.Operator = query.MatchQueryOperatorAnd // Make sure all terms from the query are matched
+		searchQuery.AddQuery(queryAnalyzed)
+
+		queries = append(queries, searchQuery)
 	}

 	switch len(queries) {
@@ -1898,7 +1872,7 @@ func (q *permissionScopedQuery) Searcher(ctx context.Context, i index.IndexReade
 	if err != nil {
 		return nil, err
 	}
-	filteringSearcher := bleveSearch.NewFilteringSearcher(ctx, searcher, func(_ *search.SearchContext, d *search.DocumentMatch) bool {
+	filteringSearcher := bleveSearch.NewFilteringSearcher(ctx, searcher, func(d *search.DocumentMatch) bool {
 		// The doc ID has the format: <namespace>/<group>/<resourceType>/<name>
 		// IndexInternalID will be the same as the doc ID when using an in-memory index, but when using a file-based
 		// index it becomes a binary encoded number that has some other internal meaning. Using ExternalID() will get the
--- a/pkg/storage/unified/search/bleve_integration_test.go
+++ b/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)
-		})
-	}
-}
--- a/pkg/storage/unified/search/bleve_mappings.go
+++ b/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 {
--- a/pkg/storage/unified/search/bleve_mappings_test.go
+++ b/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",
--- a/pkg/storage/unified/search/bleve_search_test.go
+++ b/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)

--- a/pkg/storage/unified/search/bleve_test.go
+++ b/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)
--- a/pkg/storage/unified/search/options.go
+++ b/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 {
--- a/pkg/storage/unified/sql/test/integration_test.go
+++ b/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) {
--- a/pkg/tests/api/elasticsearch/elasticsearch_test.go
+++ b/pkg/tests/api/elasticsearch/elasticsearch_test.go
@@ -24,24 +24,6 @@ func TestMain(m *testing.M) {
 	testsuite.Run(m)
 }

-// mockElasticsearchHandler returns a handler that mocks Elasticsearch endpoints.
-// It responds to GET / with cluster info (required for datasource initialization)
-// and returns 401 Unauthorized for all other requests.
-func mockElasticsearchHandler(onRequest func(r *http.Request)) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		switch {
-		case r.Method == http.MethodGet && r.URL.Path == "/":
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{"version":{"build_flavor":"default","number":"8.0.0"}}`))
-		default:
-			if onRequest != nil {
-				onRequest(r)
-			}
-			w.WriteHeader(http.StatusUnauthorized)
-		}
-	}
-}
-
 func TestIntegrationElasticsearch(t *testing.T) {
 	testutil.SkipIntegrationTestInShortMode(t)

@@ -53,8 +35,9 @@ func TestIntegrationElasticsearch(t *testing.T) {
 	ctx := context.Background()

 	var outgoingRequest *http.Request
-	outgoingServer := httptest.NewServer(mockElasticsearchHandler(func(r *http.Request) {
+	outgoingServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		outgoingRequest = r
+		w.WriteHeader(http.StatusUnauthorized)
 	}))
 	t.Cleanup(outgoingServer.Close)

--- a/pkg/tests/api/plugins/data/expectedListResp.json
+++ b/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": "",
@@ -639,7 +639,7 @@
      ]
    },
    "dependencies": {
-      "grafanaDependency": "\u003e=11.6.0",
+      "grafanaDependency": "",
      "grafanaVersion": "*",
      "plugins": [],
      "extensions": {
@@ -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
    },
--- a/pkg/tests/apis/dashboard/search_test.go
+++ b/pkg/tests/apis/dashboard/search_test.go
@@ -97,7 +97,7 @@ func TestIntegrationSearchDevDashboards(t *testing.T) {
 	require.Equal(t, 16, fileCount, "file count from %s", devenv)

 	// Helper to call search
-	callSearch := func(user apis.User, params map[string]string) dashboardV0.SearchResults {
+	callSearch := func(user apis.User, params string) dashboardV0.SearchResults {
 		require.NotNil(t, user)
 		ns := user.Identity.GetNamespace()
 		cfg := dynamic.ConfigFor(user.NewRestConfig())
@@ -107,12 +107,17 @@ func TestIntegrationSearchDevDashboards(t *testing.T) {

 		var statusCode int
 		req := restClient.Get().AbsPath("apis", "dashboard.grafana.app", "v0alpha1", "namespaces", ns, "search").
-			//Param("explain", "true") // helpful to understand which field made things match
 			Param("limit", "1000").
 			Param("type", "dashboard") // Only search dashboards

-		for k, v := range params {
-			req = req.Param(k, v)
+		for kv := range strings.SplitSeq(params, "&") {
+			if kv == "" {
+				continue
+			}
+			parts := strings.SplitN(kv, "=", 2)
+			if len(parts) == 2 {
+				req = req.Param(parts[0], parts[1])
+			}
 		}
 		res := req.Do(ctx).StatusCode(&statusCode)
 		require.NoError(t, res.Error())
@@ -135,47 +140,22 @@ func TestIntegrationSearchDevDashboards(t *testing.T) {
 	testCases := []struct {
 		name   string
 		user   apis.User
-		params map[string]string
+		params string
 	}{
 		{
-			name: "all",
-			user: helper.Org1.Admin,
+			name:   "all",
+			user:   helper.Org1.Admin,
+			params: "", // only dashboards
 		},
 		{
-			name: "query-single-word",
-			user: helper.Org1.Admin,
-			params: map[string]string{
-				"query": "stacking",
-			},
+			name:   "simple-query",
+			user:   helper.Org1.Admin,
+			params: "query=stacking",
 		},
 		{
-			name: "query-multiple-words",
-			user: helper.Org1.Admin,
-			params: map[string]string{
-				"query": "graph softMin", // must match ALL terms
-			},
-		},
-		{
-			name: "with-text-panel",
-			user: helper.Org1.Admin,
-			params: map[string]string{
-				"field":     "panel_types", // return panel types
-				"panelType": "text",
-			},
-		},
-		{
-			name: "title-ngram-prefix",
-			user: helper.Org1.Admin,
-			params: map[string]string{
-				"query": "zer", // should match "Zero Decimals Y Ticks"
-			},
-		},
-		{
-			name: "title-ngram-middle-word",
-			user: helper.Org1.Admin,
-			params: map[string]string{
-				"query": "decim", // should match "Zero Decimals Y Ticks"
-			},
+			name:   "with-text-panel",
+			user:   helper.Org1.Admin,
+			params: "field=panel_types&panelType=text",
 		},
 	}
 	for i, tc := range testCases {
--- a/pkg/tests/apis/dashboard/testdata/searchV0/t01-query-single-word.json
+++ b/pkg/tests/apis/dashboard/testdata/searchV0/t01-query-single-word.json
@@ -10,7 +10,7 @@
        "panel-tests",
        "graph-ng"
      ],
-      "score": 0.284
+      "score": 0.658
    },
    {
      "resource": "dashboards",
@@ -21,8 +21,8 @@
        "panel-tests",
        "graph-ng"
      ],
-      "score": 0.269
+      "score": 0.625
    }
  ],
-  "maxScore": 0.284
+  "maxScore": 0.658
 }
--- a/pkg/tests/apis/dashboard/testdata/searchV0/t02-query-multiple-words.json
+++ b/pkg/tests/apis/dashboard/testdata/searchV0/t02-query-multiple-words.json
@@ -1,17 +0,0 @@
-{
-  "totalHits": 1,
-  "hits": [
-    {
-      "resource": "dashboards",
-      "name": "timeseries-soft-limits",
-      "title": "Panel Tests - Graph NG - softMin/softMax",
-      "tags": [
-        "gdev",
-        "panel-tests",
-        "graph-ng"
-      ],
-      "score": 0.024
-    }
-  ],
-  "maxScore": 0.024
-}
--- a/pkg/tests/apis/dashboard/testdata/searchV0/t02-with-text-panel.json
+++ b/pkg/tests/apis/dashboard/testdata/searchV0/t02-with-text-panel.json
--- a/pkg/tests/apis/dashboard/testdata/searchV0/t04-title-ngram-prefix.json
+++ b/pkg/tests/apis/dashboard/testdata/searchV0/t04-title-ngram-prefix.json
@@ -1,17 +0,0 @@
-{
-  "totalHits": 1,
-  "hits": [
-    {
-      "resource": "dashboards",
-      "name": "timeseries-y-ticks-zero-decimals",
-      "title": "Zero Decimals Y Ticks",
-      "tags": [
-        "gdev",
-        "panel-tests",
-        "graph-ng"
-      ],
-      "score": 0.35
-    }
-  ],
-  "maxScore": 0.35
-}
--- a/pkg/tests/apis/dashboard/testdata/searchV0/t05-title-ngram-middle-word.json
+++ b/pkg/tests/apis/dashboard/testdata/searchV0/t05-title-ngram-middle-word.json
@@ -1,17 +0,0 @@
-{
-  "totalHits": 1,
-  "hits": [
-    {
-      "resource": "dashboards",
-      "name": "timeseries-y-ticks-zero-decimals",
-      "title": "Zero Decimals Y Ticks",
-      "tags": [
-        "gdev",
-        "panel-tests",
-        "graph-ng"
-      ],
-      "score": 0.35
-    }
-  ],
-  "maxScore": 0.35
-}
--- a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json
@@ -3912,13 +3912,6 @@
          "value"
        ],
        "properties": {
-          "properties": {
-            "description": "Additional properties for multi-props variables",
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            }
-          },
          "selected": {
            "description": "Whether the option is selected or not",
            "type": "boolean"
--- a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2beta1.json
+++ b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2beta1.json
@@ -3939,13 +3939,6 @@
          "value"
        ],
        "properties": {
-          "properties": {
-            "description": "Additional properties for multi-props variables",
-            "type": "object",
-            "additionalProperties": {
-              "type": "string"
-            }
-          },
          "selected": {
            "description": "Whether the option is selected or not",
            "type": "boolean"
--- a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
@@ -92,7 +92,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 		}, nil
 	}

-	url := fmt.Sprintf("%s/v3/projects/%s/metricDescriptors", dsInfo.services[cloudMonitor].url, defaultProject)
+	url := fmt.Sprintf("%v/v3/projects/%v/metricDescriptors", dsInfo.services[cloudMonitor].url, defaultProject)
 	request, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return nil, err
@@ -139,7 +139,6 @@ type datasourceInfo struct {
 	defaultProject              string
 	clientEmail                 string
 	tokenUri                    string
-	universeDomain              string
 	services                    map[string]datasourceService
 	privateKey                  string
 	usingImpersonation          bool
@@ -151,7 +150,6 @@ type datasourceJSONData struct {
 	DefaultProject              string `json:"defaultProject"`
 	ClientEmail                 string `json:"clientEmail"`
 	TokenURI                    string `json:"tokenUri"`
-	UniverseDomain              string `json:"universeDomain"`
 	UsingImpersonation          bool   `json:"usingImpersonation"`
 	ServiceAccountToImpersonate string `json:"serviceAccountToImpersonate"`
 }
@@ -181,7 +179,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			defaultProject:              jsonData.DefaultProject,
 			clientEmail:                 jsonData.ClientEmail,
 			tokenUri:                    jsonData.TokenURI,
-			universeDomain:              jsonData.UniverseDomain,
 			usingImpersonation:          jsonData.UsingImpersonation,
 			serviceAccountToImpersonate: jsonData.ServiceAccountToImpersonate,
 			services:                    map[string]datasourceService{},
@@ -197,13 +194,13 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			return nil, err
 		}

-		for name := range routes {
+		for name, info := range routes {
 			client, err := newHTTPClient(dsInfo, opts, &httpClientProvider, name)
 			if err != nil {
 				return nil, err
 			}
 			dsInfo.services[name] = datasourceService{
-				url:    buildURL(name, dsInfo.universeDomain),
+				url:    info.url,
 				client: client,
 			}
 		}
--- a/pkg/tsdb/cloud-monitoring/httpclient.go
+++ b/pkg/tsdb/cloud-monitoring/httpclient.go
@@ -23,12 +23,12 @@ type routeInfo struct {
 var routes = map[string]routeInfo{
 	cloudMonitor: {
 		method: "GET",
-		url:    "https://monitoring.",
+		url:    "https://monitoring.googleapis.com",
 		scopes: []string{cloudMonitorScope},
 	},
 	resourceManager: {
 		method: "GET",
-		url:    "https://cloudresourcemanager.",
+		url:    "https://cloudresourcemanager.googleapis.com",
 		scopes: []string{resourceManagerScope},
 	},
 }
@@ -68,13 +68,6 @@ func getMiddleware(model *datasourceInfo, routePath string) (httpclient.Middlewa
 	return tokenprovider.AuthMiddleware(provider), nil
 }

-func buildURL(route string, universeDomain string) string {
-	if universeDomain == "" {
-		universeDomain = "googleapis.com"
-	}
-	return routes[route].url + universeDomain
-}
-
 func newHTTPClient(model *datasourceInfo, opts httpclient.Options, clientProvider *httpclient.Provider, route string) (*http.Client, error) {
 	m, err := getMiddleware(model, route)
 	if err != nil {
--- a/pkg/tsdb/cloud-monitoring/resource_handler_test.go
+++ b/pkg/tsdb/cloud-monitoring/resource_handler_test.go
@@ -111,7 +111,7 @@ func Test_setRequestVariables(t *testing.T) {
 		im: &fakeInstance{
 			services: map[string]datasourceService{
 				cloudMonitor: {
-					url:    buildURL(cloudMonitor, "googleapis.com"),
+					url:    routes[cloudMonitor].url,
 					client: &http.Client{},
 				},
 			},
--- a/pkg/tsdb/elasticsearch/aggregation_factory.go
+++ b/pkg/tsdb/elasticsearch/aggregation_factory.go
@@ -3,8 +3,8 @@ package elasticsearch
 import (
 	"regexp"

+	"github.com/grafana/grafana/pkg/components/simplejson"
 	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
 )

 // addDateHistogramAgg adds a date histogram aggregation to the aggregation builder
--- a/pkg/tsdb/elasticsearch/client/client.go
+++ b/pkg/tsdb/elasticsearch/client/client.go
@@ -16,6 +16,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )

 // Used in logging to mark a stage
@@ -34,7 +35,6 @@ type DatasourceInfo struct {
 	Interval                   string
 	MaxConcurrentShardRequests int64
 	IncludeFrozen              bool
-	ClusterInfo                ClusterInfo
 }

 type ConfiguredFields struct {
@@ -159,7 +159,7 @@ func (c *baseClientImpl) ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearch
 		resSpan.End()
 	}()

-	improvedParsingEnabled := isFeatureEnabled(c.ctx, "elasticsearchImprovedParsing")
+	improvedParsingEnabled := isFeatureEnabled(c.ctx, featuremgmt.FlagElasticsearchImprovedParsing)
 	msr, err := c.parser.parseMultiSearchResponse(res.Body, improvedParsingEnabled)
 	if err != nil {
 		return nil, err
@@ -197,11 +197,7 @@ func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchReque

 func (c *baseClientImpl) getMultiSearchQueryParameters() string {
 	var qs []string
-	// if the build flavor is not serverless, we can use the max concurrent shard requests
-	// this is because serverless clusters do not support max concurrent shard requests
-	if !c.ds.ClusterInfo.IsServerless() && c.ds.MaxConcurrentShardRequests > 0 {
-		qs = append(qs, fmt.Sprintf("max_concurrent_shard_requests=%d", c.ds.MaxConcurrentShardRequests))
-	}
+	qs = append(qs, fmt.Sprintf("max_concurrent_shard_requests=%d", c.ds.MaxConcurrentShardRequests))

 	if c.ds.IncludeFrozen {
 		qs = append(qs, "ignore_throttled=false")
--- a/pkg/tsdb/elasticsearch/client/client_test.go
+++ b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 func TestClient_ExecuteMultisearch(t *testing.T) {
--- a/pkg/tsdb/elasticsearch/client/cluster_info.go
+++ b/pkg/tsdb/elasticsearch/client/cluster_info.go
@@ -1,51 +0,0 @@
-package es
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-)
-
-type VersionInfo struct {
-	BuildFlavor string `json:"build_flavor"`
-}
-
-// ClusterInfo represents Elasticsearch cluster information returned from the root endpoint.
-// It is used to determine cluster capabilities and configuration like whether the cluster is serverless.
-type ClusterInfo struct {
-	Version VersionInfo `json:"version"`
-}
-
-const (
-	BuildFlavorServerless = "serverless"
-)
-
-// GetClusterInfo fetches cluster information from the Elasticsearch root endpoint.
-// It returns the cluster build flavor which is used to determine if the cluster is serverless.
-func GetClusterInfo(httpCli *http.Client, url string) (clusterInfo ClusterInfo, err error) {
-	resp, err := httpCli.Get(url)
-	if err != nil {
-		return ClusterInfo{}, fmt.Errorf("error getting ES cluster info: %w", err)
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return ClusterInfo{}, fmt.Errorf("unexpected status code %d getting ES cluster info", resp.StatusCode)
-	}
-
-	defer func() {
-		if closeErr := resp.Body.Close(); closeErr != nil && err == nil {
-			err = fmt.Errorf("error closing response body: %w", closeErr)
-		}
-	}()
-
-	err = json.NewDecoder(resp.Body).Decode(&clusterInfo)
-	if err != nil {
-		return ClusterInfo{}, fmt.Errorf("error decoding ES cluster info: %w", err)
-	}
-
-	return clusterInfo, nil
-}
-
-func (ci ClusterInfo) IsServerless() bool {
-	return ci.Version.BuildFlavor == BuildFlavorServerless
-}
--- a/pkg/tsdb/elasticsearch/client/cluster_info_test.go
+++ b/pkg/tsdb/elasticsearch/client/cluster_info_test.go
@@ -1,188 +0,0 @@
-package es
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetClusterInfo(t *testing.T) {
-	t.Run("Should successfully get cluster info", func(t *testing.T) {
-		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Header().Set("Content-Type", "application/json")
-			_, err := rw.Write([]byte(`{
-				"name": "test-cluster",
-				"cluster_name": "elasticsearch",
-				"cluster_uuid": "abc123",
-				"version": {
-					"number": "8.0.0",
-					"build_flavor": "default",
-					"build_type": "tar",
-					"build_hash": "abc123",
-					"build_date": "2023-01-01T00:00:00.000Z",
-					"build_snapshot": false,
-					"lucene_version": "9.0.0"
-				}
-			}`))
-			require.NoError(t, err)
-		}))
-
-		t.Cleanup(func() {
-			ts.Close()
-		})
-
-		clusterInfo, err := GetClusterInfo(ts.Client(), ts.URL)
-
-		require.NoError(t, err)
-		require.NotNil(t, clusterInfo)
-		assert.Equal(t, "default", clusterInfo.Version.BuildFlavor)
-	})
-
-	t.Run("Should successfully get serverless cluster info", func(t *testing.T) {
-		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Header().Set("Content-Type", "application/json")
-			_, err := rw.Write([]byte(`{
-				"name": "serverless-cluster",
-				"cluster_name": "elasticsearch",
-				"cluster_uuid": "def456",
-				"version": {
-					"number": "8.11.0",
-					"build_flavor": "serverless",
-					"build_type": "docker",
-					"build_hash": "def456",
-					"build_date": "2023-11-01T00:00:00.000Z",
-					"build_snapshot": false,
-					"lucene_version": "9.8.0"
-				}
-			}`))
-			require.NoError(t, err)
-		}))
-
-		t.Cleanup(func() {
-			ts.Close()
-		})
-
-		clusterInfo, err := GetClusterInfo(ts.Client(), ts.URL)
-
-		require.NoError(t, err)
-		require.NotNil(t, clusterInfo)
-		assert.Equal(t, "serverless", clusterInfo.Version.BuildFlavor)
-		assert.True(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("Should return error when HTTP request fails", func(t *testing.T) {
-		clusterInfo, err := GetClusterInfo(http.DefaultClient, "http://invalid-url-that-does-not-exist.local:9999")
-
-		require.Error(t, err)
-		require.Equal(t, ClusterInfo{}, clusterInfo)
-		assert.Contains(t, err.Error(), "error getting ES cluster info")
-	})
-
-	t.Run("Should return error when response body is invalid JSON", func(t *testing.T) {
-		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Header().Set("Content-Type", "application/json")
-			_, err := rw.Write([]byte(`{"invalid json`))
-			require.NoError(t, err)
-		}))
-
-		t.Cleanup(func() {
-			ts.Close()
-		})
-
-		clusterInfo, err := GetClusterInfo(ts.Client(), ts.URL)
-
-		require.Error(t, err)
-		require.Equal(t, ClusterInfo{}, clusterInfo)
-		assert.Contains(t, err.Error(), "error decoding ES cluster info")
-	})
-
-	t.Run("Should handle empty version object", func(t *testing.T) {
-		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.Header().Set("Content-Type", "application/json")
-			_, err := rw.Write([]byte(`{
-				"name": "test-cluster",
-				"version": {}
-			}`))
-			require.NoError(t, err)
-		}))
-
-		t.Cleanup(func() {
-			ts.Close()
-		})
-
-		clusterInfo, err := GetClusterInfo(ts.Client(), ts.URL)
-
-		require.NoError(t, err)
-		require.Equal(t, ClusterInfo{}, clusterInfo)
-		assert.Equal(t, "", clusterInfo.Version.BuildFlavor)
-		assert.False(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("Should handle HTTP error status codes", func(t *testing.T) {
-		ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-			rw.WriteHeader(http.StatusUnauthorized)
-			_, err := rw.Write([]byte(`{"error": "Unauthorized"}`))
-			require.NoError(t, err)
-		}))
-
-		t.Cleanup(func() {
-			ts.Close()
-		})
-
-		clusterInfo, err := GetClusterInfo(ts.Client(), ts.URL)
-
-		require.Error(t, err)
-		require.Equal(t, ClusterInfo{}, clusterInfo)
-		assert.Contains(t, err.Error(), "unexpected status code 401 getting ES cluster info")
-	})
-}
-
-func TestClusterInfo_IsServerless(t *testing.T) {
-	t.Run("Should return true when build_flavor is serverless", func(t *testing.T) {
-		clusterInfo := ClusterInfo{
-			Version: VersionInfo{
-				BuildFlavor: BuildFlavorServerless,
-			},
-		}
-
-		assert.True(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("Should return false when build_flavor is default", func(t *testing.T) {
-		clusterInfo := ClusterInfo{
-			Version: VersionInfo{
-				BuildFlavor: "default",
-			},
-		}
-
-		assert.False(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("Should return false when build_flavor is empty", func(t *testing.T) {
-		clusterInfo := ClusterInfo{
-			Version: VersionInfo{
-				BuildFlavor: "",
-			},
-		}
-
-		assert.False(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("Should return false when build_flavor is unknown value", func(t *testing.T) {
-		clusterInfo := ClusterInfo{
-			Version: VersionInfo{
-				BuildFlavor: "unknown",
-			},
-		}
-
-		assert.False(t, clusterInfo.IsServerless())
-	})
-
-	t.Run("should return false when cluster info is empty", func(t *testing.T) {
-		clusterInfo := ClusterInfo{}
-		assert.False(t, clusterInfo.IsServerless())
-	})
-}
--- a/pkg/tsdb/elasticsearch/client/search_request_test.go
+++ b/pkg/tsdb/elasticsearch/client/search_request_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 func TestSearchRequest(t *testing.T) {
--- a/pkg/tsdb/elasticsearch/data_query_processor.go
+++ b/pkg/tsdb/elasticsearch/data_query_processor.go
@@ -6,8 +6,8 @@ import (
 	"strconv"

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
 )

 // processQuery processes a single query and adds it to the multi-search request builder
--- a/pkg/tsdb/elasticsearch/data_query_settings.go
+++ b/pkg/tsdb/elasticsearch/data_query_settings.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"strconv"

-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 // setFloatPath converts a string value at the specified path to float64
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -88,14 +88,6 @@ func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.Ins
 			httpCliOpts.SigV4.Service = "es"
 		}

-		apiKeyAuth, ok := jsonData["apiKeyAuth"].(bool)
-		if ok && apiKeyAuth {
-			apiKey := settings.DecryptedSecureJSONData["apiKey"]
-			if apiKey != "" {
-				httpCliOpts.Header.Add("Authorization", "ApiKey "+apiKey)
-			}
-		}
-
 		httpCli, err := httpClientProvider.New(httpCliOpts)
 		if err != nil {
 			return nil, err
@@ -159,11 +151,6 @@ func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.Ins
 			includeFrozen = false
 		}

-		clusterInfo, err := es.GetClusterInfo(httpCli, settings.URL)
-		if err != nil {
-			return nil, err
-		}
-
 		configuredFields := es.ConfiguredFields{
 			TimeField:       timeField,
 			LogLevelField:   logLevelField,
@@ -179,7 +166,6 @@ func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.Ins
 			ConfiguredFields:           configuredFields,
 			Interval:                   interval,
 			IncludeFrozen:              includeFrozen,
-			ClusterInfo:                clusterInfo,
 		}
 		return model, nil
 	}
--- a/pkg/tsdb/elasticsearch/elasticsearch_test.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch_test.go
@@ -3,8 +3,6 @@ package elasticsearch
 import (
 	"context"
 	"encoding/json"
-	"net/http"
-	"net/http/httptest"
 	"testing"

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -20,26 +18,8 @@ type datasourceInfo struct {
 	Interval                   string `json:"interval"`
 }

-// mockElasticsearchServer creates a test HTTP server that mocks Elasticsearch cluster info endpoint
-func mockElasticsearchServer() *httptest.Server {
-	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusOK)
-		// Return a mock Elasticsearch cluster info response
-		_ = json.NewEncoder(w).Encode(map[string]interface{}{
-			"version": map[string]interface{}{
-				"build_flavor": "serverless",
-				"number":       "8.0.0",
-			},
-		})
-	}))
-}
-
 func TestNewInstanceSettings(t *testing.T) {
 	t.Run("fields exist", func(t *testing.T) {
-		server := mockElasticsearchServer()
-		defer server.Close()
-
 		dsInfo := datasourceInfo{
 			TimeField:                  "@timestamp",
 			MaxConcurrentShardRequests: 5,
@@ -48,7 +28,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		require.NoError(t, err)

 		dsSettings := backend.DataSourceInstanceSettings{
-			URL:      server.URL,
 			JSONData: json.RawMessage(settingsJSON),
 		}

@@ -58,9 +37,6 @@ func TestNewInstanceSettings(t *testing.T) {

 	t.Run("timeField", func(t *testing.T) {
 		t.Run("is nil", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				MaxConcurrentShardRequests: 5,
 				Interval:                   "Daily",
@@ -70,7 +46,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -79,9 +54,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("is empty", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				MaxConcurrentShardRequests: 5,
 				Interval:                   "Daily",
@@ -92,7 +64,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -103,9 +74,6 @@ func TestNewInstanceSettings(t *testing.T) {

 	t.Run("maxConcurrentShardRequests", func(t *testing.T) {
 		t.Run("no maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField: "@timestamp",
 			}
@@ -113,7 +81,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -123,9 +90,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("string maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: "10",
@@ -134,7 +98,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -144,9 +107,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("number maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: 10,
@@ -155,7 +115,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -165,9 +124,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("zero maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: 0,
@@ -176,7 +132,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -186,9 +141,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("negative maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: -10,
@@ -197,7 +149,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -207,9 +158,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("float maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: 10.5,
@@ -218,7 +166,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

@@ -228,9 +175,6 @@ func TestNewInstanceSettings(t *testing.T) {
 		})

 		t.Run("invalid maxConcurrentShardRequests", func(t *testing.T) {
-			server := mockElasticsearchServer()
-			defer server.Close()
-
 			dsInfo := datasourceInfo{
 				TimeField:                  "@timestamp",
 				MaxConcurrentShardRequests: "invalid",
@@ -239,7 +183,6 @@ func TestNewInstanceSettings(t *testing.T) {
 			require.NoError(t, err)

 			dsSettings := backend.DataSourceInstanceSettings{
-				URL:      server.URL,
 				JSONData: json.RawMessage(settingsJSON),
 			}

--- a/pkg/tsdb/elasticsearch/healthcheck.go
+++ b/pkg/tsdb/elasticsearch/healthcheck.go
@@ -28,6 +28,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 			Message: "Health check failed: Failed to get data source info",
 		}, nil
 	}
+
 	healthStatusUrl, err := url.Parse(ds.URL)
 	if err != nil {
 		logger.Error("Failed to parse data source URL", "error", err)
@@ -37,14 +38,6 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 		}, nil
 	}

-	// If the cluster is serverless, return a healthy result
-	if ds.ClusterInfo.IsServerless() {
-		return &backend.CheckHealthResult{
-			Status:  backend.HealthStatusOk,
-			Message: "Elasticsearch Serverless data source is healthy.",
-		}, nil
-	}
-
 	// check that ES is healthy
 	healthStatusUrl.Path = path.Join(healthStatusUrl.Path, "_cluster/health")
 	healthStatusUrl.RawQuery = "wait_for_status=yellow"
--- a/pkg/tsdb/elasticsearch/metrics_response_processor.go
+++ b/pkg/tsdb/elasticsearch/metrics_response_processor.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"

-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 // metricsResponseProcessor handles processing of metrics query responses
--- a/pkg/tsdb/elasticsearch/models.go
+++ b/pkg/tsdb/elasticsearch/models.go
@@ -4,7 +4,7 @@ import (
 	"time"

 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 // Query represents the time series query model of the datasource
--- a/pkg/tsdb/elasticsearch/parse_query.go
+++ b/pkg/tsdb/elasticsearch/parse_query.go
@@ -6,7 +6,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"

-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 func parseQuery(tsdbQuery []backend.DataQuery, logger log.Logger) ([]*Query, error) {
--- a/pkg/tsdb/elasticsearch/raw_dsl_aggregation_parser.go
+++ b/pkg/tsdb/elasticsearch/raw_dsl_aggregation_parser.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 )

 // AggregationParser parses raw Elasticsearch DSL aggregations
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -15,9 +15,9 @@ import (
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"

+	"github.com/grafana/grafana/pkg/components/simplejson"
 	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
 	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/instrumentation"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
 )

 const (
--- a/pkg/tsdb/elasticsearch/response_utils.go
+++ b/pkg/tsdb/elasticsearch/response_utils.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"

+	"github.com/grafana/grafana/pkg/components/simplejson"
 	es "github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
-	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/simplejson"
 )

 // flatten flattens multi-level objects to single level objects. It uses dot notation to join keys.
--- a/pkg/tsdb/elasticsearch/simplejson/simplejson.go
+++ b/pkg/tsdb/elasticsearch/simplejson/simplejson.go
@@ -1,582 +0,0 @@
-// Package simplejson provides a wrapper for arbitrary JSON objects that adds methods to access properties.
-// Use of this package in place of types and the standard library's encoding/json package is strongly discouraged.
-//
-// Don't lint for stale code, since it's a copied library and we might as well keep the whole thing.
-// nolint:unused
-package simplejson
-
-import (
-	"bytes"
-	"database/sql/driver"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-)
-
-// returns the current implementation version
-func Version() string {
-	return "0.5.0"
-}
-
-type Json struct {
-	data any
-}
-
-func (j *Json) FromDB(data []byte) error {
-	j.data = make(map[string]any)
-
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.UseNumber()
-	return dec.Decode(&j.data)
-}
-
-func (j *Json) ToDB() ([]byte, error) {
-	if j == nil || j.data == nil {
-		return nil, nil
-	}
-
-	return j.Encode()
-}
-
-func (j *Json) Scan(val any) error {
-	switch v := val.(type) {
-	case []byte:
-		if len(v) == 0 {
-			return nil
-		}
-		return json.Unmarshal(v, &j)
-	case string:
-		if len(v) == 0 {
-			return nil
-		}
-		return json.Unmarshal([]byte(v), &j)
-	default:
-		return fmt.Errorf("unsupported type: %T", v)
-	}
-}
-
-func (j *Json) Value() (driver.Value, error) {
-	return j.ToDB()
-}
-
-// DeepCopyInto creates a copy by serializing JSON
-func (j *Json) DeepCopyInto(out *Json) {
-	b, err := j.Encode()
-	if err == nil {
-		_ = out.UnmarshalJSON(b)
-	}
-}
-
-// DeepCopy will make a deep copy of the JSON object
-func (j *Json) DeepCopy() *Json {
-	if j == nil {
-		return nil
-	}
-	out := new(Json)
-	j.DeepCopyInto(out)
-	return out
-}
-
-// NewJson returns a pointer to a new `Json` object
-// after unmarshaling `body` bytes
-func NewJson(body []byte) (*Json, error) {
-	j := new(Json)
-	err := j.UnmarshalJSON(body)
-	if err != nil {
-		return nil, err
-	}
-	return j, nil
-}
-
-// MustJson returns a pointer to a new `Json` object, panicking if `body` cannot be parsed.
-func MustJson(body []byte) *Json {
-	j, err := NewJson(body)
-
-	if err != nil {
-		panic(fmt.Sprintf("could not unmarshal JSON: %q", err))
-	}
-
-	return j
-}
-
-// New returns a pointer to a new, empty `Json` object
-func New() *Json {
-	return &Json{
-		data: make(map[string]any),
-	}
-}
-
-// NewFromAny returns a pointer to a new `Json` object with provided data.
-func NewFromAny(data any) *Json {
-	return &Json{data: data}
-}
-
-// Interface returns the underlying data
-func (j *Json) Interface() any {
-	return j.data
-}
-
-// Encode returns its marshaled data as `[]byte`
-func (j *Json) Encode() ([]byte, error) {
-	return j.MarshalJSON()
-}
-
-// EncodePretty returns its marshaled data as `[]byte` with indentation
-func (j *Json) EncodePretty() ([]byte, error) {
-	return json.MarshalIndent(&j.data, "", "  ")
-}
-
-// Implements the json.Marshaler interface.
-func (j *Json) MarshalJSON() ([]byte, error) {
-	return json.Marshal(&j.data)
-}
-
-// Set modifies `Json` map by `key` and `value`
-// Useful for changing single key/value in a `Json` object easily.
-func (j *Json) Set(key string, val any) {
-	m, err := j.Map()
-	if err != nil {
-		return
-	}
-	m[key] = val
-}
-
-// SetPath modifies `Json`, recursively checking/creating map keys for the supplied path,
-// and then finally writing in the value
-func (j *Json) SetPath(branch []string, val any) {
-	if len(branch) == 0 {
-		j.data = val
-		return
-	}
-
-	// in order to insert our branch, we need map[string]any
-	if _, ok := (j.data).(map[string]any); !ok {
-		// have to replace with something suitable
-		j.data = make(map[string]any)
-	}
-	curr := j.data.(map[string]any)
-
-	for i := 0; i < len(branch)-1; i++ {
-		b := branch[i]
-		// key exists?
-		if _, ok := curr[b]; !ok {
-			n := make(map[string]any)
-			curr[b] = n
-			curr = n
-			continue
-		}
-
-		// make sure the value is the right sort of thing
-		if _, ok := curr[b].(map[string]any); !ok {
-			// have to replace with something suitable
-			n := make(map[string]any)
-			curr[b] = n
-		}
-
-		curr = curr[b].(map[string]any)
-	}
-
-	// add remaining k/v
-	curr[branch[len(branch)-1]] = val
-}
-
-// Del modifies `Json` map by deleting `key` if it is present.
-func (j *Json) Del(key string) {
-	m, err := j.Map()
-	if err != nil {
-		return
-	}
-	delete(m, key)
-}
-
-// Get returns a pointer to a new `Json` object
-// for `key` in its `map` representation
-//
-// useful for chaining operations (to traverse a nested JSON):
-//
-//	js.Get("top_level").Get("dict").Get("value").Int()
-func (j *Json) Get(key string) *Json {
-	m, err := j.Map()
-	if err == nil {
-		if val, ok := m[key]; ok {
-			return &Json{val}
-		}
-	}
-	return &Json{nil}
-}
-
-// GetPath searches for the item as specified by the branch
-// without the need to deep dive using Get()'s.
-//
-//	js.GetPath("top_level", "dict")
-func (j *Json) GetPath(branch ...string) *Json {
-	jin := j
-	for _, p := range branch {
-		jin = jin.Get(p)
-	}
-	return jin
-}
-
-// GetIndex returns a pointer to a new `Json` object
-// for `index` in its `array` representation
-//
-// this is the analog to Get when accessing elements of
-// a json array instead of a json object:
-//
-//	js.Get("top_level").Get("array").GetIndex(1).Get("key").Int()
-func (j *Json) GetIndex(index int) *Json {
-	a, err := j.Array()
-	if err == nil {
-		if len(a) > index {
-			return &Json{a[index]}
-		}
-	}
-	return &Json{nil}
-}
-
-// CheckGetIndex returns a pointer to a new `Json` object
-// for `index` in its `array` representation, and a `bool`
-// indicating success or failure
-//
-// useful for chained operations when success is important:
-//
-//	if data, ok := js.Get("top_level").CheckGetIndex(0); ok {
-//	    log.Println(data)
-//	}
-func (j *Json) CheckGetIndex(index int) (*Json, bool) {
-	a, err := j.Array()
-	if err == nil {
-		if len(a) > index {
-			return &Json{a[index]}, true
-		}
-	}
-	return nil, false
-}
-
-// SetIndex modifies `Json` array by `index` and `value`
-// for `index` in its `array` representation
-func (j *Json) SetIndex(index int, val any) {
-	a, err := j.Array()
-	if err == nil {
-		if len(a) > index {
-			a[index] = val
-		}
-	}
-}
-
-// CheckGet returns a pointer to a new `Json` object and
-// a `bool` identifying success or failure
-//
-// useful for chained operations when success is important:
-//
-//	if data, ok := js.Get("top_level").CheckGet("inner"); ok {
-//	    log.Println(data)
-//	}
-func (j *Json) CheckGet(key string) (*Json, bool) {
-	m, err := j.Map()
-	if err == nil {
-		if val, ok := m[key]; ok {
-			return &Json{val}, true
-		}
-	}
-	return nil, false
-}
-
-// Map type asserts to `map`
-func (j *Json) Map() (map[string]any, error) {
-	if m, ok := (j.data).(map[string]any); ok {
-		return m, nil
-	}
-	return nil, errors.New("type assertion to map[string]any failed")
-}
-
-// Array type asserts to an `array`
-func (j *Json) Array() ([]any, error) {
-	if a, ok := (j.data).([]any); ok {
-		return a, nil
-	}
-	return nil, errors.New("type assertion to []any failed")
-}
-
-// Bool type asserts to `bool`
-func (j *Json) Bool() (bool, error) {
-	if s, ok := (j.data).(bool); ok {
-		return s, nil
-	}
-	return false, errors.New("type assertion to bool failed")
-}
-
-// String type asserts to `string`
-func (j *Json) String() (string, error) {
-	if s, ok := (j.data).(string); ok {
-		return s, nil
-	}
-	return "", errors.New("type assertion to string failed")
-}
-
-// Bytes type asserts to `[]byte`
-func (j *Json) Bytes() ([]byte, error) {
-	if s, ok := (j.data).(string); ok {
-		return []byte(s), nil
-	}
-	return nil, errors.New("type assertion to []byte failed")
-}
-
-// StringArray type asserts to an `array` of `string`
-func (j *Json) StringArray() ([]string, error) {
-	arr, err := j.Array()
-	if err != nil {
-		return nil, err
-	}
-	retArr := make([]string, 0, len(arr))
-	for _, a := range arr {
-		if a == nil {
-			retArr = append(retArr, "")
-			continue
-		}
-		s, ok := a.(string)
-		if !ok {
-			return nil, err
-		}
-		retArr = append(retArr, s)
-	}
-	return retArr, nil
-}
-
-// MustArray guarantees the return of a `[]any` (with optional default)
-//
-// useful when you want to iterate over array values in a succinct manner:
-//
-//	for i, v := range js.Get("results").MustArray() {
-//		fmt.Println(i, v)
-//	}
-func (j *Json) MustArray(args ...[]any) []any {
-	var def []any
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustArray() received too many arguments %d", len(args))
-	}
-
-	a, err := j.Array()
-	if err == nil {
-		return a
-	}
-
-	return def
-}
-
-// MustMap guarantees the return of a `map[string]any` (with optional default)
-//
-// useful when you want to iterate over map values in a succinct manner:
-//
-//	for k, v := range js.Get("dictionary").MustMap() {
-//		fmt.Println(k, v)
-//	}
-func (j *Json) MustMap(args ...map[string]any) map[string]any {
-	var def map[string]any
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustMap() received too many arguments %d", len(args))
-	}
-
-	a, err := j.Map()
-	if err == nil {
-		return a
-	}
-
-	return def
-}
-
-// MustString guarantees the return of a `string` (with optional default)
-//
-// useful when you explicitly want a `string` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustString(), js.Get("optional_param").MustString("my_default"))
-func (j *Json) MustString(args ...string) string {
-	var def string
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustString() received too many arguments %d", len(args))
-	}
-
-	s, err := j.String()
-	if err == nil {
-		return s
-	}
-
-	return def
-}
-
-// MustStringArray guarantees the return of a `[]string` (with optional default)
-//
-// useful when you want to iterate over array values in a succinct manner:
-//
-//	for i, s := range js.Get("results").MustStringArray() {
-//		fmt.Println(i, s)
-//	}
-func (j *Json) MustStringArray(args ...[]string) []string {
-	var def []string
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustStringArray() received too many arguments %d", len(args))
-	}
-
-	a, err := j.StringArray()
-	if err == nil {
-		return a
-	}
-
-	return def
-}
-
-// MustInt guarantees the return of an `int` (with optional default)
-//
-// useful when you explicitly want an `int` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustInt(), js.Get("optional_param").MustInt(5150))
-func (j *Json) MustInt(args ...int) int {
-	var def int
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustInt() received too many arguments %d", len(args))
-	}
-
-	i, err := j.Int()
-	if err == nil {
-		return i
-	}
-
-	return def
-}
-
-// MustFloat64 guarantees the return of a `float64` (with optional default)
-//
-// useful when you explicitly want a `float64` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustFloat64(), js.Get("optional_param").MustFloat64(5.150))
-func (j *Json) MustFloat64(args ...float64) float64 {
-	var def float64
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustFloat64() received too many arguments %d", len(args))
-	}
-
-	f, err := j.Float64()
-	if err == nil {
-		return f
-	}
-
-	return def
-}
-
-// MustBool guarantees the return of a `bool` (with optional default)
-//
-// useful when you explicitly want a `bool` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustBool(), js.Get("optional_param").MustBool(true))
-func (j *Json) MustBool(args ...bool) bool {
-	var def bool
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustBool() received too many arguments %d", len(args))
-	}
-
-	b, err := j.Bool()
-	if err == nil {
-		return b
-	}
-
-	return def
-}
-
-// MustInt64 guarantees the return of an `int64` (with optional default)
-//
-// useful when you explicitly want an `int64` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustInt64(), js.Get("optional_param").MustInt64(5150))
-func (j *Json) MustInt64(args ...int64) int64 {
-	var def int64
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustInt64() received too many arguments %d", len(args))
-	}
-
-	i, err := j.Int64()
-	if err == nil {
-		return i
-	}
-
-	return def
-}
-
-// MustUInt64 guarantees the return of an `uint64` (with optional default)
-//
-// useful when you explicitly want an `uint64` in a single value return context:
-//
-//	myFunc(js.Get("param1").MustUint64(), js.Get("optional_param").MustUint64(5150))
-func (j *Json) MustUint64(args ...uint64) uint64 {
-	var def uint64
-
-	switch len(args) {
-	case 0:
-	case 1:
-		def = args[0]
-	default:
-		log.Panicf("MustUint64() received too many arguments %d", len(args))
-	}
-
-	i, err := j.Uint64()
-	if err == nil {
-		return i
-	}
-
-	return def
-}
-
-// MarshalYAML implements yaml.Marshaller.
-func (j *Json) MarshalYAML() (any, error) {
-	return j.data, nil
-}
-
-// UnmarshalYAML implements yaml.Unmarshaller.
-func (j *Json) UnmarshalYAML(unmarshal func(any) error) error {
-	var data any
-	if err := unmarshal(&data); err != nil {
-		return err
-	}
-	j.data = data
-	return nil
-}
--- a/pkg/tsdb/elasticsearch/simplejson/simplejson_go11.go
+++ b/pkg/tsdb/elasticsearch/simplejson/simplejson_go11.go
@@ -1,90 +0,0 @@
-package simplejson
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io"
-	"reflect"
-	"strconv"
-)
-
-// Implements the json.Unmarshaler interface.
-func (j *Json) UnmarshalJSON(p []byte) error {
-	dec := json.NewDecoder(bytes.NewBuffer(p))
-	dec.UseNumber()
-	return dec.Decode(&j.data)
-}
-
-// NewFromReader returns a *Json by decoding from an io.Reader
-func NewFromReader(r io.Reader) (*Json, error) {
-	j := new(Json)
-	dec := json.NewDecoder(r)
-	dec.UseNumber()
-	err := dec.Decode(&j.data)
-	return j, err
-}
-
-// Float64 coerces into a float64
-func (j *Json) Float64() (float64, error) {
-	switch n := j.data.(type) {
-	case json.Number:
-		return n.Float64()
-	case float32, float64:
-		return reflect.ValueOf(j.data).Float(), nil
-	case int, int8, int16, int32, int64:
-		return float64(reflect.ValueOf(j.data).Int()), nil
-	case uint, uint8, uint16, uint32, uint64:
-		return float64(reflect.ValueOf(j.data).Uint()), nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-// Int coerces into an int
-func (j *Json) Int() (int, error) {
-	switch n := j.data.(type) {
-	case json.Number:
-		i, err := n.Int64()
-		if err != nil {
-			return 0, err
-		}
-		return int(i), nil
-	case float32, float64:
-		return int(reflect.ValueOf(j.data).Float()), nil
-	case int, int8, int16, int32, int64:
-		return int(reflect.ValueOf(j.data).Int()), nil
-	case uint, uint8, uint16, uint32, uint64:
-		return int(reflect.ValueOf(j.data).Uint()), nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-// Int64 coerces into an int64
-func (j *Json) Int64() (int64, error) {
-	switch n := j.data.(type) {
-	case json.Number:
-		return n.Int64()
-	case float32, float64:
-		return int64(reflect.ValueOf(j.data).Float()), nil
-	case int, int8, int16, int32, int64:
-		return reflect.ValueOf(j.data).Int(), nil
-	case uint, uint8, uint16, uint32, uint64:
-		return int64(reflect.ValueOf(j.data).Uint()), nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-// Uint64 coerces into an uint64
-func (j *Json) Uint64() (uint64, error) {
-	switch n := j.data.(type) {
-	case json.Number:
-		return strconv.ParseUint(n.String(), 10, 64)
-	case float32, float64:
-		return uint64(reflect.ValueOf(j.data).Float()), nil
-	case int, int8, int16, int32, int64:
-		return uint64(reflect.ValueOf(j.data).Int()), nil
-	case uint, uint8, uint16, uint32, uint64:
-		return reflect.ValueOf(j.data).Uint(), nil
-	}
-	return 0, errors.New("invalid value type")
-}
--- a/pkg/tsdb/elasticsearch/simplejson/simplejson_test.go
+++ b/pkg/tsdb/elasticsearch/simplejson/simplejson_test.go
@@ -1,274 +0,0 @@
-package simplejson
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSimplejson(t *testing.T) {
-	var ok bool
-	var err error
-
-	js, err := NewJson([]byte(`{
-		"test": {
-			"string_array": ["asdf", "ghjk", "zxcv"],
-			"string_array_null": ["abc", null, "efg"],
-			"array": [1, "2", 3],
-			"arraywithsubs": [{"subkeyone": 1},
-			{"subkeytwo": 2, "subkeythree": 3}],
-			"int": 10,
-			"float": 5.150,
-			"string": "simplejson",
-			"bool": true,
-			"sub_obj": {"a": 1}
-		}
-	}`))
-
-	assert.NotEqual(t, nil, js)
-	assert.Equal(t, nil, err)
-
-	_, ok = js.CheckGet("test")
-	assert.Equal(t, true, ok)
-
-	_, ok = js.CheckGet("missing_key")
-	assert.Equal(t, false, ok)
-
-	aws := js.Get("test").Get("arraywithsubs")
-	assert.NotEqual(t, nil, aws)
-	var awsval int
-	awsval, _ = aws.GetIndex(0).Get("subkeyone").Int()
-	assert.Equal(t, 1, awsval)
-	awsval, _ = aws.GetIndex(1).Get("subkeytwo").Int()
-	assert.Equal(t, 2, awsval)
-	awsval, _ = aws.GetIndex(1).Get("subkeythree").Int()
-	assert.Equal(t, 3, awsval)
-
-	arr := js.Get("test").Get("array")
-	assert.NotEqual(t, nil, arr)
-	val, ok := arr.CheckGetIndex(0)
-	assert.Equal(t, ok, true)
-	valInt, _ := val.Int()
-	assert.Equal(t, valInt, 1)
-	val, ok = arr.CheckGetIndex(1)
-	assert.Equal(t, ok, true)
-	valStr, _ := val.String()
-	assert.Equal(t, valStr, "2")
-	val, ok = arr.CheckGetIndex(2)
-	assert.Equal(t, ok, true)
-	valInt, _ = val.Int()
-	assert.Equal(t, valInt, 3)
-	_, ok = arr.CheckGetIndex(3)
-	assert.Equal(t, ok, false)
-
-	i, _ := js.Get("test").Get("int").Int()
-	assert.Equal(t, 10, i)
-
-	f, _ := js.Get("test").Get("float").Float64()
-	assert.Equal(t, 5.150, f)
-
-	s, _ := js.Get("test").Get("string").String()
-	assert.Equal(t, "simplejson", s)
-
-	b, _ := js.Get("test").Get("bool").Bool()
-	assert.Equal(t, true, b)
-
-	mi := js.Get("test").Get("int").MustInt()
-	assert.Equal(t, 10, mi)
-
-	mi2 := js.Get("test").Get("missing_int").MustInt(5150)
-	assert.Equal(t, 5150, mi2)
-
-	ms := js.Get("test").Get("string").MustString()
-	assert.Equal(t, "simplejson", ms)
-
-	ms2 := js.Get("test").Get("missing_string").MustString("fyea")
-	assert.Equal(t, "fyea", ms2)
-
-	ma2 := js.Get("test").Get("missing_array").MustArray([]any{"1", 2, "3"})
-	assert.Equal(t, ma2, []any{"1", 2, "3"})
-
-	msa := js.Get("test").Get("string_array").MustStringArray()
-	assert.Equal(t, msa[0], "asdf")
-	assert.Equal(t, msa[1], "ghjk")
-	assert.Equal(t, msa[2], "zxcv")
-
-	msa2 := js.Get("test").Get("string_array").MustStringArray([]string{"1", "2", "3"})
-	assert.Equal(t, msa2[0], "asdf")
-	assert.Equal(t, msa2[1], "ghjk")
-	assert.Equal(t, msa2[2], "zxcv")
-
-	msa3 := js.Get("test").Get("missing_array").MustStringArray([]string{"1", "2", "3"})
-	assert.Equal(t, msa3, []string{"1", "2", "3"})
-
-	mm2 := js.Get("test").Get("missing_map").MustMap(map[string]any{"found": false})
-	assert.Equal(t, mm2, map[string]any{"found": false})
-
-	strs, err := js.Get("test").Get("string_array").StringArray()
-	assert.Equal(t, err, nil)
-	assert.Equal(t, strs[0], "asdf")
-	assert.Equal(t, strs[1], "ghjk")
-	assert.Equal(t, strs[2], "zxcv")
-
-	strs2, err := js.Get("test").Get("string_array_null").StringArray()
-	assert.Equal(t, err, nil)
-	assert.Equal(t, strs2[0], "abc")
-	assert.Equal(t, strs2[1], "")
-	assert.Equal(t, strs2[2], "efg")
-
-	gp, _ := js.GetPath("test", "string").String()
-	assert.Equal(t, "simplejson", gp)
-
-	gp2, _ := js.GetPath("test", "int").Int()
-	assert.Equal(t, 10, gp2)
-
-	assert.Equal(t, js.Get("test").Get("bool").MustBool(), true)
-
-	js.Set("float2", 300.0)
-	assert.Equal(t, js.Get("float2").MustFloat64(), 300.0)
-
-	js.Set("test2", "setTest")
-	assert.Equal(t, "setTest", js.Get("test2").MustString())
-
-	js.Del("test2")
-	assert.NotEqual(t, "setTest", js.Get("test2").MustString())
-
-	js.Get("test").Get("sub_obj").Set("a", 2)
-	assert.Equal(t, 2, js.Get("test").Get("sub_obj").Get("a").MustInt())
-
-	js.GetPath("test", "sub_obj").Set("a", 3)
-	assert.Equal(t, 3, js.GetPath("test", "sub_obj", "a").MustInt())
-}
-
-func TestStdlibInterfaces(t *testing.T) {
-	val := new(struct {
-		Name   string `json:"name"`
-		Params *Json  `json:"params"`
-	})
-	val2 := new(struct {
-		Name   string `json:"name"`
-		Params *Json  `json:"params"`
-	})
-
-	raw := `{"name":"myobject","params":{"string":"simplejson"}}`
-
-	assert.Equal(t, nil, json.Unmarshal([]byte(raw), val))
-
-	assert.Equal(t, "myobject", val.Name)
-	assert.NotEqual(t, nil, val.Params.data)
-	s, _ := val.Params.Get("string").String()
-	assert.Equal(t, "simplejson", s)
-
-	p, err := json.Marshal(val)
-	assert.Equal(t, nil, err)
-	assert.Equal(t, nil, json.Unmarshal(p, val2))
-	assert.Equal(t, val, val2) // stable
-}
-
-func TestSet(t *testing.T) {
-	js, err := NewJson([]byte(`{}`))
-	assert.Equal(t, nil, err)
-
-	js.Set("baz", "bing")
-
-	s, err := js.GetPath("baz").String()
-	assert.Equal(t, nil, err)
-	assert.Equal(t, "bing", s)
-}
-
-func TestReplace(t *testing.T) {
-	js, err := NewJson([]byte(`{}`))
-	assert.Equal(t, nil, err)
-
-	err = js.UnmarshalJSON([]byte(`{"baz":"bing"}`))
-	assert.Equal(t, nil, err)
-
-	s, err := js.GetPath("baz").String()
-	assert.Equal(t, nil, err)
-	assert.Equal(t, "bing", s)
-}
-
-func TestSetPath(t *testing.T) {
-	js, err := NewJson([]byte(`{}`))
-	assert.Equal(t, nil, err)
-
-	js.SetPath([]string{"foo", "bar"}, "baz")
-
-	s, err := js.GetPath("foo", "bar").String()
-	assert.Equal(t, nil, err)
-	assert.Equal(t, "baz", s)
-}
-
-func TestSetPathNoPath(t *testing.T) {
-	js, err := NewJson([]byte(`{"some":"data","some_number":1.0,"some_bool":false}`))
-	assert.Equal(t, nil, err)
-
-	f := js.GetPath("some_number").MustFloat64(99.0)
-	assert.Equal(t, f, 1.0)
-
-	js.SetPath([]string{}, map[string]any{"foo": "bar"})
-
-	s, err := js.GetPath("foo").String()
-	assert.Equal(t, nil, err)
-	assert.Equal(t, "bar", s)
-
-	f = js.GetPath("some_number").MustFloat64(99.0)
-	assert.Equal(t, f, 99.0)
-}
-
-func TestPathWillAugmentExisting(t *testing.T) {
-	js, err := NewJson([]byte(`{"this":{"a":"aa","b":"bb","c":"cc"}}`))
-	assert.Equal(t, nil, err)
-
-	js.SetPath([]string{"this", "d"}, "dd")
-
-	cases := []struct {
-		path    []string
-		outcome string
-	}{
-		{
-			path:    []string{"this", "a"},
-			outcome: "aa",
-		},
-		{
-			path:    []string{"this", "b"},
-			outcome: "bb",
-		},
-		{
-			path:    []string{"this", "c"},
-			outcome: "cc",
-		},
-		{
-			path:    []string{"this", "d"},
-			outcome: "dd",
-		},
-	}
-
-	for _, tc := range cases {
-		s, err := js.GetPath(tc.path...).String()
-		assert.Equal(t, nil, err)
-		assert.Equal(t, tc.outcome, s)
-	}
-}
-
-func TestPathWillOverwriteExisting(t *testing.T) {
-	// notice how "a" is 0.1 - but then we'll try to set at path a, foo
-	js, err := NewJson([]byte(`{"this":{"a":0.1,"b":"bb","c":"cc"}}`))
-	assert.Equal(t, nil, err)
-
-	js.SetPath([]string{"this", "a", "foo"}, "bar")
-
-	s, err := js.GetPath("this", "a", "foo").String()
-	assert.Equal(t, nil, err)
-	assert.Equal(t, "bar", s)
-}
-
-func TestMustJson(t *testing.T) {
-	js := MustJson([]byte(`{"foo": "bar"}`))
-	assert.Equal(t, js.Get("foo").MustString(), "bar")
-
-	assert.PanicsWithValue(t, "could not unmarshal JSON: \"unexpected EOF\"", func() {
-		MustJson([]byte(`{`))
-	})
-}
--- a/pkg/tsdb/elasticsearch/standalone/datasource.go
+++ b/pkg/tsdb/elasticsearch/standalone/datasource.go
@@ -1,48 +0,0 @@
-package main
-
-import (
-	"context"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	elasticsearch "github.com/grafana/grafana/pkg/tsdb/elasticsearch"
-)
-
-var (
-	_ backend.QueryDataHandler    = (*Datasource)(nil)
-	_ backend.CheckHealthHandler  = (*Datasource)(nil)
-	_ backend.CallResourceHandler = (*Datasource)(nil)
-)
-
-func NewDatasource(context.Context, backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-	return &Datasource{
-		Service: elasticsearch.ProvideService(httpclient.NewProvider()),
-	}, nil
-}
-
-type Datasource struct {
-	Service *elasticsearch.Service
-}
-
-func contextualMiddlewares(ctx context.Context) context.Context {
-	cfg := backend.GrafanaConfigFromContext(ctx)
-	responseLimitMiddleware := httpclient.ResponseLimitMiddleware(cfg.ResponseLimit())
-	ctx = httpclient.WithContextualMiddleware(ctx, responseLimitMiddleware)
-	return ctx
-}
-
-func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	ctx = contextualMiddlewares(ctx)
-	return d.Service.QueryData(ctx, req)
-}
-
-func (d *Datasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
-	ctx = contextualMiddlewares(ctx)
-	return d.Service.CallResource(ctx, req, sender)
-}
-
-func (d *Datasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	ctx = contextualMiddlewares(ctx)
-	return d.Service.CheckHealth(ctx, req)
-}
--- a/pkg/tsdb/elasticsearch/standalone/main.go
+++ b/pkg/tsdb/elasticsearch/standalone/main.go
@@ -1,23 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-)
-
-func main() {
-	// Start listening to requests sent from Grafana. This call is blocking so
-	// it won't finish until Grafana shuts down the process or the plugin choose
-	// to exit by itself using os.Exit. Manage automatically manages life cycle
-	// of datasource instances. It accepts datasource instance factory as first
-	// argument. This factory will be automatically called on incoming request
-	// from Grafana to create different instances of SampleDatasource (per datasource
-	// ID). When datasource configuration changed Dispose method will be called and
-	// new datasource instance created using NewSampleDatasource factory.
-	if err := datasource.Manage("elasticsearch", NewDatasource, datasource.ManageOpts{}); err != nil {
-		log.DefaultLogger.Error(err.Error())
-		os.Exit(1)
-	}
-}
--- a/public/app/features/alerting/unified/navigation/useAlertRulesNav.ts
+++ b/public/app/features/alerting/unified/navigation/useAlertRulesNav.ts
@@ -0,0 +1,69 @@
+import { useLocation } from 'react-router-dom-v5-compat';
+
+import { NavModelItem } from '@grafana/data';
+import { t } from '@grafana/i18n';
+import { config } from '@grafana/runtime';
+import { useSelector } from 'app/types/store';
+
+export function useAlertRulesNav() {
+  const location = useLocation();
+  const navIndex = useSelector((state) => state.navIndex);
+
+  // Check if V2 navigation is enabled
+  const useV2Nav = config.featureToggles.alertingNavigationV2;
+
+  if (!useV2Nav) {
+    // Legacy navigation: return simple navId
+    return {
+      navId: 'alert-list',
+      pageNav: undefined,
+    };
+  }
+
+  // V2 Navigation: Create tabs structure
+  const alertRulesNav = navIndex['alert-rules'];
+
+  if (!alertRulesNav) {
+    // Fallback to legacy if nav item doesn't exist
+    return {
+      navId: 'alert-list',
+      pageNav: undefined,
+    };
+  }
+
+  // All available tabs
+  const allTabs = [
+    {
+      id: 'alert-rules-list',
+      text: t('alerting.navigation.alert-rules', 'Alert rules'),
+      url: '/alerting/list',
+      active: location.pathname === '/alerting/list',
+      icon: 'list-ul',
+      parentItem: alertRulesNav,
+    },
+    {
+      id: 'alert-rules-recently-deleted',
+      text: t('alerting.navigation.recently-deleted', 'Recently deleted'),
+      url: '/alerting/recently-deleted',
+      active: location.pathname === '/alerting/recently-deleted',
+      icon: 'history',
+      parentItem: alertRulesNav,
+    },
+  ].filter((tab) => {
+    // Filter based on permissions - if nav item doesn't exist, user doesn't have permission
+    const navItem = navIndex[tab.id];
+    return navItem !== undefined;
+  });
+
+  // Create pageNav that represents the Alert rules page with tabs as children
+  const pageNav: NavModelItem = {
+    ...alertRulesNav,
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    children: allTabs as NavModelItem[],
+  };
+
+  return {
+    navId: 'alert-rules',
+    pageNav,
+  };
+}
--- a/public/app/features/alerting/unified/rule-list/RuleList.v1.tsx
+++ b/public/app/features/alerting/unified/rule-list/RuleList.v1.tsx
@@ -20,6 +20,7 @@ import { shouldUsePrometheusRulesPrimary } from '../featureToggles';
 import { useCombinedRuleNamespaces } from '../hooks/useCombinedRuleNamespaces';
 import { useFilteredRules, useRulesFilter } from '../hooks/useFilteredRules';
 import { useUnifiedAlertingSelector } from '../hooks/useUnifiedAlertingSelector';
+import { useAlertRulesNav } from '../navigation/useAlertRulesNav';
 import { fetchAllPromAndRulerRulesAction, fetchAllPromRulesAction, fetchRulerRulesAction } from '../state/actions';
 import { RULE_LIST_POLL_INTERVAL_MS } from '../utils/constants';
 import { GRAFANA_RULES_SOURCE_NAME, getAllRulesSourceNames } from '../utils/datasource';
@@ -38,6 +39,7 @@ const LIMIT_ALERTS = INSTANCES_DISPLAY_LIMIT + 1;
 const prometheusRulesPrimary = shouldUsePrometheusRulesPrimary();

 const RuleListV1 = () => {
+  const { navId, pageNav } = useAlertRulesNav();
  const dispatch = useDispatch();
  const rulesDataSourceNames = useMemo(getAllRulesSourceNames, []);
  const [expandAll, setExpandAll] = useState(false);
@@ -119,7 +121,8 @@ const RuleListV1 = () => {
    // We don't want to show the Loading... indicator for the whole page.
    // We show separate indicators for Grafana-managed and Cloud rules
    <AlertingPageWrapper
-      navId="alert-list"
+      navId={navId}
+      pageNav={pageNav}
      isLoading={false}
      renderTitle={(title) => <RuleListPageTitle title={title} />}
      actions={<RuleListActionButtons hasAlertRulesCreated={hasAlertRulesCreated} />}
--- a/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
+++ b/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
@@ -13,6 +13,7 @@ import { useListViewMode } from '../components/rules/Filter/RulesViewModeSelecto
 import { AIAlertRuleButtonComponent } from '../enterprise-components/AI/AIGenAlertRuleButton/addAIAlertRuleButton';
 import { AlertingAction, useAlertingAbility } from '../hooks/useAbilities';
 import { useRulesFilter } from '../hooks/useFilteredRules';
+import { useAlertRulesNav } from '../navigation/useAlertRulesNav';
 import { getRulesDataSources } from '../utils/datasource';

 import { FilterView } from './FilterView';
@@ -123,10 +124,12 @@ export function RuleListActions() {

 export default function RuleListPage() {
  const { isApplying } = useApplyDefaultSearch();
+  const { navId, pageNav } = useAlertRulesNav();

  return (
    <AlertingPageWrapper
-      navId="alert-list"
+      navId={navId}
+      pageNav={pageNav}
      renderTitle={(title) => <RuleListPageTitle title={title} />}
      isLoading={isApplying}
      actions={<RuleListActions />}
--- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
+++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
@@ -284,7 +284,6 @@ function variableValueOptionsToVariableOptions(varState: MultiValueVariable['sta
    value: String(o.value),
    text: o.label,
    selected: Array.isArray(varState.value) ? varState.value.includes(o.value) : varState.value === o.value,
-    ...(o.properties && { properties: o.properties }),
  }));
 }

--- a/public/app/features/dashboard-scene/settings/variables/VariableEditorForm.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/VariableEditorForm.tsx
@@ -69,6 +69,7 @@ export function VariableEditorForm({ variable, onTypeChange, onGoBack, onDelete

  const isHasVariableOptions = hasVariableOptions(variable);
  const optionsForSelect = isHasVariableOptions ? variable.getOptionsForSelect(false) : [];
+  const hasMultiProps = 'valuesFormat' in variable.state && variable.state.valuesFormat === 'json';

  const onDeleteVariable = (hideModal: () => void) => () => {
    reportInteraction('Delete variable');
@@ -124,7 +125,7 @@ export function VariableEditorForm({ variable, onTypeChange, onGoBack, onDelete

      {EditorToRender && <EditorToRender variable={variable} onRunQuery={onRunQuery} />}

-      {isHasVariableOptions && <VariableValuesPreview options={optionsForSelect} />}
+      {isHasVariableOptions && <VariableValuesPreview options={optionsForSelect} hasMultiProps={hasMultiProps} />}

      <div className={styles.buttonContainer}>
        <Stack gap={2}>
--- a/public/app/features/dashboard-scene/settings/variables/components/VariableValuesPreview.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/components/VariableValuesPreview.tsx
@@ -10,16 +10,13 @@ import { Button, InlineFieldRow, InlineLabel, InteractiveTable, Text, useStyles2

 export interface Props {
  options: VariableValueOption[];
+  hasMultiProps?: boolean;
 }

-const hasMultiProps = (options: Props['options']) => {
-  return Object.keys(options[1]?.properties ?? options[0]?.properties ?? {}).length > 0;
-};
-
-export const VariableValuesPreview = ({ options }: Props) => {
+export const VariableValuesPreview = ({ options, hasMultiProps }: Props) => {
  const styles = useStyles2(getStyles);
  const hasOptions = options.length > 0;
-  const displayMultiPropsPreview = config.featureToggles.multiPropsVariables && hasOptions && hasMultiProps(options);
+  const displayMultiPropsPreview = config.featureToggles.multiPropsVariables && hasMultiProps;

  return (
    <div className={styles.previewContainer} style={{ gap: '8px' }}>
@@ -46,8 +43,7 @@ function VariableValuesWithPropsPreview({ options }: { options: VariableValueOpt

    return {
      data,
-      // the option at index 0 can be "All" so we try to grab the column names from the 2nd option
-      columns: Object.keys(data[1] ?? data[0] ?? {}).map((id) => ({
+      columns: Object.keys(data[0] ?? {}).map((id) => ({
        id,
        // see https://github.com/TanStack/table/issues/1671
        header: unsanitizeKey(id),
@@ -66,6 +62,7 @@ function VariableValuesWithPropsPreview({ options }: { options: VariableValueOpt
    />
  );
 }
+
 const sanitizeKey = (key: string) => key.replace(/\./g, '__dot__');
 const unsanitizeKey = (key: string) => key.replace(/__dot__/g, '.');

--- a/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor/ModalEditor.tsx
+++ b/public/app/features/dashboard-scene/settings/variables/editors/CustomVariableEditor/ModalEditor.tsx
@@ -69,7 +69,7 @@ function ModalEditorMultiProps(props: ModalEditorProps) {
          {queryValidationError && <FieldValidationMessage>{queryValidationError.message}</FieldValidationMessage>}
        </div>
        <div>
-          <VariableValuesPreview options={options} />
+          <VariableValuesPreview options={options} hasMultiProps={valuesFormat === 'json'} />
        </div>
      </Stack>
      <Modal.ButtonRow>
--- a/public/app/features/datasources/state/buildCategories.test.ts
+++ b/public/app/features/datasources/state/buildCategories.test.ts
@@ -53,7 +53,7 @@ describe('buildCategories', () => {
  it('should add enterprise phantom plugins', () => {
    const enterprisePluginsCategory = categories[3];
    expect(enterprisePluginsCategory.title).toBe('Enterprise plugins');
-    expect(enterprisePluginsCategory.plugins.length).toBe(32);
+    expect(enterprisePluginsCategory.plugins.length).toBe(31);
    expect(enterprisePluginsCategory.plugins[0].name).toBe('Adobe Analytics');
    expect(enterprisePluginsCategory.plugins[enterprisePluginsCategory.plugins.length - 1].name).toBe('Zendesk');
  });
--- a/public/app/features/datasources/state/buildCategories.ts
+++ b/public/app/features/datasources/state/buildCategories.ts
@@ -13,7 +13,6 @@ import catchpointSvg from 'img/plugins/catchpoint.svg';
 import cloudflareJpg from 'img/plugins/cloudflare.jpg';
 import cockroachdbJpg from 'img/plugins/cockroachdb.jpg';
 import datadogPng from 'img/plugins/datadog.png';
-import db2Svg from 'img/plugins/db2.svg';
 import droneSvg from 'img/plugins/drone.svg';
 import dynatracePng from 'img/plugins/dynatrace.png';
 import gitlabSvg from 'img/plugins/gitlab.svg';
@@ -419,12 +418,6 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] {
      name: 'SolarWinds',
      imgUrl: solarWindsSvg,
    }),
-    getPhantomPlugin({
-      id: 'grafana-ibmdb2-datasource',
-      description: t('datasources.get-enterprise-phantom-plugins.description.ibmdb2-datasource', 'IBM Db2 data source'),
-      name: 'IBM Db2',
-      imgUrl: db2Svg,
-    }),
  ];
 }

--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -81,17 +81,16 @@ const buildLabelPath = (label: string) => {
 };

 const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
-  if (!('options' in variable) || !variable.options[0].properties) {
+  if (!('valuesFormat' in variable) || variable.valuesFormat !== 'json') {
    return [];
  }

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function collectFieldPaths(properties: Record<string, any>, currentPath: string) {
+  function collectFieldPaths(option: Record<string, string>, currentPath: string) {
    let paths: string[] = [];
-    for (const field in properties) {
-      if (properties.hasOwnProperty(field)) {
+    for (const field in option) {
+      if (option.hasOwnProperty(field)) {
        const newPath = `${currentPath}.${field}`;
-        const value = properties[field];
+        const value = option[field];
        if (typeof value === 'object' && value !== null) {
          paths = [...paths, ...collectFieldPaths(value, newPath)];
        }
@@ -101,7 +100,11 @@ const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
    return paths;
  }

-  return collectFieldPaths(variable.options[0].properties, variable.name);
+  try {
+    return collectFieldPaths(JSON.parse(variable.query)[0], variable.name);
+  } catch {
+    return [];
+  }
 };

 export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [
--- a/public/app/features/panel/panellinks/specs/link_srv.test.ts
+++ b/public/app/features/panel/panellinks/specs/link_srv.test.ts
@@ -503,16 +503,13 @@ describe('linkSrv', () => {
  });

  describe('getPanelLinksVariableSuggestions', () => {
-    it('then it should return template variables, options properties and built-ins', () => {
+    it('then it should return template variables, json properties and built-ins', () => {
      const templateSrvWithJsonValues = initTemplateSrv('key', [
        {
          type: 'custom',
          name: 'customServers',
          valuesFormat: 'json',
-          options: [
-            { text: 'web', value: 'web', properties: { name: 'web', ip: '192.168.0.100' } },
-            { text: 'ads', value: 'ads', properties: { name: 'ads', ip: '192.168.0.142' } },
-          ],
+          query: '[{"name":"web","ip":"192.168.0.100"},{"name":"ads","ip":"192.168.0.142"}]',
        },
      ]);
      setTemplateSrv(templateSrvWithJsonValues);
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -4,6 +4,8 @@ const cloudwatchPlugin = async () =>
  await import(/* webpackChunkName: "cloudwatchPlugin" */ 'app/plugins/datasource/cloudwatch/module');
 const dashboardDSPlugin = async () =>
  await import(/* webpackChunkName "dashboardDSPlugin" */ 'app/plugins/datasource/dashboard/module');
+const elasticsearchPlugin = async () =>
+  await import(/* webpackChunkName: "elasticsearchPlugin" */ 'app/plugins/datasource/elasticsearch/module');
 const grafanaPlugin = async () =>
  await import(/* webpackChunkName: "grafanaPlugin" */ 'app/plugins/datasource/grafana/module');
 const influxdbPlugin = async () =>
@@ -73,6 +75,7 @@ const builtInPlugins: Record<string, System.Module | (() => Promise<System.Modul
  // datasources
  'core:plugin/cloudwatch': cloudwatchPlugin,
  'core:plugin/dashboard': dashboardDSPlugin,
+  'core:plugin/elasticsearch': elasticsearchPlugin,
  'core:plugin/grafana': grafanaPlugin,
  'core:plugin/influxdb': influxdbPlugin,
  'core:plugin/mixed': mixedPlugin,
--- a/public/app/features/theme-playground/ThemePlayground.tsx
+++ b/public/app/features/theme-playground/ThemePlayground.tsx
@@ -2,20 +2,8 @@ import { css } from '@emotion/css';
 import { useId, useState } from 'react';

 import { createTheme, GrafanaTheme2, NewThemeOptions } from '@grafana/data';
-import { NewThemeOptionsSchema } from '@grafana/data/internal';
-import aubergine from '@grafana/data/themes/definitions/aubergine.json';
-import debug from '@grafana/data/themes/definitions/debug.json';
-import desertbloom from '@grafana/data/themes/definitions/desertbloom.json';
-import gildedgrove from '@grafana/data/themes/definitions/gildedgrove.json';
-import gloom from '@grafana/data/themes/definitions/gloom.json';
-import mars from '@grafana/data/themes/definitions/mars.json';
-import matrix from '@grafana/data/themes/definitions/matrix.json';
-import sapphiredusk from '@grafana/data/themes/definitions/sapphiredusk.json';
-import synthwave from '@grafana/data/themes/definitions/synthwave.json';
-import tron from '@grafana/data/themes/definitions/tron.json';
-import victorian from '@grafana/data/themes/definitions/victorian.json';
-import zen from '@grafana/data/themes/definitions/zen.json';
-import themeJsonSchema from '@grafana/data/themes/schema.generated.json';
+import { experimentalThemeDefinitions, NewThemeOptionsSchema } from '@grafana/data/internal';
+import { themeJsonSchema } from '@grafana/data/unstable';
 import { t } from '@grafana/i18n';
 import { useChromeHeaderHeight } from '@grafana/runtime';
 import { CodeEditor, Combobox, Field, Stack, useStyles2 } from '@grafana/ui';
@@ -46,23 +34,8 @@ const themeMap: Record<string, NewThemeOptions> = {
  },
 };

-const experimentalDefinitions: Record<string, unknown> = {
-  aubergine,
-  debug,
-  desertbloom,
-  gildedgrove,
-  gloom,
-  mars,
-  matrix,
-  sapphiredusk,
-  synthwave,
-  tron,
-  victorian,
-  zen,
-};
-
 // Add additional themes
-for (const [name, json] of Object.entries(experimentalDefinitions)) {
+for (const [name, json] of Object.entries(experimentalThemeDefinitions)) {
  const result = NewThemeOptionsSchema.safeParse(json);
  if (!result.success) {
    console.error(`Invalid theme definition for theme ${name}: ${result.error.message}`);
--- a/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/ConfigEditor/ConfigEditor.tsx
@@ -1,10 +1,10 @@
 import { memo } from 'react';

-import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption } from '@grafana/data';
+import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { ConnectionConfig } from '@grafana/google-sdk';
 import { ConfigSection, DataSourceDescription } from '@grafana/plugin-ui';
-import { config, reportInteraction } from '@grafana/runtime';
-import { Divider, Field, Input, SecureSocksProxySettings, Stack } from '@grafana/ui';
+import { reportInteraction, config } from '@grafana/runtime';
+import { Divider, SecureSocksProxySettings } from '@grafana/ui';

 import { CloudMonitoringOptions, CloudMonitoringSecureJsonData } from '../../types/types';

@@ -36,33 +36,14 @@ export const ConfigEditor = memo(({ options, onOptionsChange }: Props) => {
          <Divider />
          <ConfigSection
            title="Additional settings"
-            description="Additional settings are optional settings that can be configured for more control over your data source. This includes Secure Socks Proxy and Universe Domain."
+            description="Additional settings are optional settings that can be configured for more control over your data source. This includes Secure Socks Proxy."
            isCollapsible
-            isInitiallyOpen={
-              options.jsonData.enableSecureSocksProxy !== undefined || options.jsonData.universeDomain !== undefined
-            }
+            isInitiallyOpen={options.jsonData.enableSecureSocksProxy !== undefined}
          >
-            <Stack direction={'column'}>
-              <Field noMargin label="Universe Domain">
-                <Input
-                  width={50}
-                  value={options.jsonData.universeDomain}
-                  onChange={(event) =>
-                    updateDatasourcePluginJsonDataOption(
-                      { options, onOptionsChange },
-                      'universeDomain',
-                      event.currentTarget.value
-                    )
-                  }
-                  placeholder="googleapis.com"
-                ></Input>
-              </Field>
-              <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
-            </Stack>
+            <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
          </ConfigSection>
        </>
      )}
-      <Divider />
    </>
  );
 });
--- a/public/app/plugins/datasource/cloud-monitoring/types/types.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/types/types.ts
@@ -38,7 +38,6 @@ export interface Aggregation {
 export interface CloudMonitoringOptions extends DataSourceOptions {
  gceDefaultProject?: string;
  enableSecureSocksProxy?: boolean;
-  universeDomain?: string;
 }

 export interface CloudMonitoringSecureJsonData extends DataSourceSecureJsonData {}
--- a/Show More
+++ b/Show More