update snapshot

.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

.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

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

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

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

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

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

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

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

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

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.tabs-and-rows-repeated.v0alpha1.json

@@ -586,7 +586,6 @@
         },
         "id": -1,
         "panels": [],
-        "repeat": "custom_var_tab",
         "title": "Repeated Tab by \"$custom_var_tab\"",
         "type": "row"
       },
@@ -611,11 +610,8 @@
           "y": 22
         },
         "id": 6,
-        "maxPerRow": 3,
         "options": {},
         "pluginVersion": "12.4.0-19736337744",
-        "repeat": "custom_var_panel",
-        "repeatDirection": "h",
         "targets": [
           {
             "refId": "A"

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.tabs-and-rows-repeated.v1beta1.json

@@ -586,7 +586,6 @@
         },
         "id": -1,
         "panels": [],
-        "repeat": "custom_var_tab",
         "title": "Repeated Tab by \"$custom_var_tab\"",
         "type": "row"
       },
@@ -611,11 +610,8 @@
           "y": 22
         },
         "id": 6,
-        "maxPerRow": 3,
         "options": {},
         "pluginVersion": "12.4.0-19736337744",
-        "repeat": "custom_var_panel",
-        "repeatDirection": "h",
         "targets": [
           {
             "refId": "A"

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

@@ -439,11 +439,6 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 		rowPanel["title"] = *tab.Spec.Title
 	}
 
-	if tab.Spec.Repeat != nil && tab.Spec.Repeat.Value != "" {
-		// We only use value here as V1 doesn't support mode
-		rowPanel["repeat"] = tab.Spec.Repeat.Value
-	}
-
 	rowPanel["gridPos"] = map[string]interface{}{
 		"x": 0,
 		"y": currentY,
@@ -824,21 +819,6 @@ func convertAutoGridLayoutToPanelsWithOffset(elements map[string]dashv2alpha1.Da
 			},
 		}
 
-		// Convert AutoGridRepeatOptions to RepeatOptions if present
-		// AutoGridRepeatOptions only has mode and value; infer direction and maxPerRow from AutoGrid settings:
-		// - direction: always "h" (AutoGrid flows horizontally, left-to-right then wraps)
-		// - maxPerRow: from AutoGrid's maxColumnCount
-		if item.Spec.Repeat != nil {
-			directionH := dashv2alpha1.DashboardRepeatOptionsDirectionH
-			maxPerRow := int64(maxColumnCount)
-			gridItem.Spec.Repeat = &dashv2alpha1.DashboardRepeatOptions{
-				Mode:      item.Spec.Repeat.Mode,
-				Value:     item.Spec.Repeat.Value,
-				Direction: &directionH,
-				MaxPerRow: &maxPerRow,
-			}
-		}
-
 		panel, err := convertPanelFromElement(&element, &gridItem)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-gauge/gauge_tests_new.v42.json

@@ -2117,7 +2117,7 @@
         }
       ],
       "title": "Numeric, no series",
-      "type": "radialbar"
+      "type": "gauge"
     },
     {
       "datasource": {
@@ -2183,7 +2183,7 @@
         }
       ],
       "title": "Non-numeric",
-      "type": "radialbar"
+      "type": "gauge"
     }
   ],
   "preload": false,
@@ -2201,4 +2201,4 @@
   "title": "Panel tests - Gauge (new)",
   "uid": "panel-tests-gauge-new",
   "weekStart": ""
-}
+}

devenv/dev-dashboards/panel-gauge/gauge_tests_new.json

@@ -2067,7 +2067,7 @@
         }
       ],
       "title": "Numeric, no series",
-      "type": "radialbar"
+      "type": "gauge"
     },
     {
       "datasource": {
@@ -2131,7 +2131,7 @@
         }
       ],
       "title": "Non-numeric",
-      "type": "radialbar"
+      "type": "gauge"
     }
   ],
   "preload": false,

devenv/frontend-service/Tiltfile

@@ -71,11 +71,6 @@ dc_resource("tempo", labels=["observability"])
 
 dc_resource("postgres", labels=["misc"])
 dc_resource("tempo-init", labels=["misc"])
-dc_resource("oauthkeycloakdb", labels=["auth"])
-dc_resource("oauthkeycloak",
-  resource_deps=["oauthkeycloakdb"],
-  labels=["auth"]
-)
 
 # paths in tilt files are confusing....
 # - if tilt is dealing with the path, it is relative to the Tiltfile
@@ -91,7 +86,6 @@ docker_build('grafana-fs-dev',
     'devenv/frontend-service/provisioning',
     'devenv/frontend-service/configs/grafana-api.local.ini',
     'devenv/frontend-service/configs/frontend-service.local.ini',
-    'devenv/frontend-service/oauth',
     'conf/defaults.ini',
     'public/emails',
     'public/views',
@@ -113,7 +107,6 @@ docker_build('grafana-fs-dev',
     sync('../../public/dashboards', '/grafana/public/dashboards'),
     sync('../../public/app/plugins', '/grafana/public/app/plugins'),
     sync('../../public/build/assets-manifest.json', '/grafana/public/build/assets-manifest.json'),
-    sync('./oauth', '/grafana/devenv/frontend-service/oauth'),
     sync('./provisioning', '/ignore/provisioning'),  # Just to trigger a restart instead of rebuild
     sync('./configs/grafana-api.local.ini', '/ignore/grafana-api.local.ini'),  # Just to trigger a restart instead of rebuild
     sync('./configs/frontend-service.local.ini', '/ignore/frontend-service.local.ini'),  # Just to trigger a restart instead of rebuild

devenv/frontend-service/configs/nginx.conf

@@ -73,7 +73,7 @@ server {
   }
 
   # API calls go to the backend
-  location ~ ^/(api|apis|avatar|bootdata|render|logout|public/plugins|public/openapi3|public/api-merged|goto|swagger|openapi/v3|login/generic_oauth) {
+  location ~ ^/(api|apis|avatar|bootdata|render|logout|public/plugins|public/openapi3|public/api-merged|goto|swagger|openapi/v3) {
     # Add debug headers to the response
     add_header Nginx-Trace-Id $otel_trace_id always;
     add_header Nginx-Route "backend" always;

devenv/frontend-service/docker-compose.yaml

@@ -150,36 +150,6 @@ services:
       tempo-init:
         condition: service_completed_successfully
 
-  oauthkeycloakdb:
-    image: docker.io/library/postgres:16-alpine
-    environment:
-      POSTGRES_DB: keycloak
-      POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: password
-    volumes:
-      - ./oauth/cloak.sql:/docker-entrypoint-initdb.d/cloak.sql
-      - oauth-keycloak-data:/var/lib/postgresql/data
-    labels:
-      - 'alloy.logs=true'
-
-  oauthkeycloak:
-    image: quay.io/keycloak/keycloak:23.0
-    command: start-dev
-    environment:
-      KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://oauthkeycloakdb/keycloak
-      KC_DB_USERNAME: keycloak
-      KC_DB_PASSWORD: password
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
-      PROXY_ADDRESS_FORWARDING: "true"
-    ports:
-      - '8087:8080'
-    depends_on:
-      - oauthkeycloakdb
-    labels:
-      - 'alloy.logs=true'
-
 volumes:
   backend-data:
   postgres-data:
@@ -187,4 +157,3 @@ volumes:
   loki-data:
   tempo-data:
   prometheus-data:
-  oauth-keycloak-data:

devenv/frontend-service/oauth/jwks.json

@@ -1,17 +0,0 @@
-{
-  "keys": [
-    {
-      "kid": "On2FQuJ8Y-909uJGWQEDkbzG-GRNmMc43HslEgVv_VQ",
-      "kty": "RSA",
-      "alg": "RS256",
-      "use": "sig",
-      "n": "qDmQHfTcOQOzmNJbVvtvuS8p_EgmiscP7vA_PZNyKx9O7utyGuoAmJH8e2w8gLIDDWHl5_x8aAIl_-TTPTSiyX8I68ryIdR28ZSe5u4pRdpXCVvJpOefKNIxQCTH7rs4KuRj0HZ2u1mu1Vz5_CeCCoKwKSmheD3u1xTJ8-VxQmdqfGxhuKtnkof7977HWOWy4GLDFqxyYHgihP_MmSeTmXUhVeZI6IOCqHMpF8eFWVGKM6V8rIKf8QO2K_vDJBM_3C933vMY8mqSQXbI3G54x-0myAaQXr4JkxjvUGKg5YC3ZXw7AjfZv_W_fQOG0GYp2hQ0akR4KNKT3XPNmpMVlQ",
-      "e": "AQAB",
-      "x5c": [
-        "MIICnTCCAYUCBgF+u1ir8jANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdncmFmYW5hMB4XDTIyMDIwMjE2NDkxN1oXDTMyMDIwMjE2NTA1N1owEjEQMA4GA1UEAwwHZ3JhZmFuYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKg5kB303DkDs5jSW1b7b7kvKfxIJorHD+7wPz2TcisfTu7rchrqAJiR/HtsPICyAw1h5ef8fGgCJf/k0z00osl/COvK8iHUdvGUnubuKUXaVwlbyaTnnyjSMUAkx+67OCrkY9B2drtZrtVc+fwnggqCsCkpoXg97tcUyfPlcUJnanxsYbirZ5KH+/e+x1jlsuBiwxascmB4IoT/zJknk5l1IVXmSOiDgqhzKRfHhVlRijOlfKyCn/EDtiv7wyQTP9wvd97zGPJqkkF2yNxueMftJsgGkF6+CZMY71BioOWAt2V8OwI32b/1v30DhtBmKdoUNGpEeCjSk91zzZqTFZUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABlW64QxuREB81VMGsyhj4Q5RykFaVuD5O8YlwUpmVfAVLzb0Drf54Kn4bnpnckKyYV+T+HsN4QXt81UE41xH0Aai2H3vrGH+PJf6aLPCDE+jpMqtN3n6IgImJXJPL8upMfhhWDv4nkM4uynEwWupzmrKi4oJuTETSMktJby4o6//XWnCzCVMoAGFJU4gtjBUzOMLW26zD+yc+BuUtfR3HzItVHSZKQSNSFO0kVS68RgrER8qJw07z3BOJ2bPpPM0PYyEngGMaowz/T6lI32ymGMWYMAnslthS1KAW9xcTBwnrW1nMhe5a0LPxIktys/wJtxIHZLc5sOddGT4xYklLg=="
-      ],
-      "x5t": "prs-h1NBqOSJMH-tQWLTqguWets",
-      "x5t#S256": "YjK3HobZW8xbNL1IPDgFhCM41UC5c0hG2cxaF6v961Q"
-    }
-  ]
-}

docs/sources/as-code/observability-as-code/_index.md

@@ -25,6 +25,10 @@ cards:
       height: 24
       href: ./foundation-sdk/
       description: The Grafana Foundation SDK is a set of tools, types, and libraries that let you define Grafana dashboards and resources using familiar programming languages like Go, TypeScript, Python, Java, and PHP. Use it in conjunction with `grafanactl` to push your programmatically generated resources.
+    - title: JSON schema v2
+      height: 24
+      href: ./schema-v2/
+      description: Grafana dashboards are represented as JSON objects that store metadata, panels, variables, and settings. Observability as Code works with all versions of the JSON model, and it's fully compatible with version 2.
     - title: Git Sync (private preview)
       height: 24
       href: ./provision-resources/intro-git-sync/
@@ -64,7 +68,7 @@ Historically, managing Grafana as code involved various community and Grafana La
 
 - This approach requires handling HTTP requests and responses but provides complete control over resource management.
 - `grafanactl`, Git Sync, and the Foundation SDK are all built on top of these APIs.
-- To understand Dashboard Schemas accepted by the APIs, refer to the [JSON models documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/build-dashboards/view-dashboard-json-model/index.md).
+- To understand Dashboard Schemas accepted by the APIs, refer to the [JSON models documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/).
 
 ## Explore
 

docs/sources/as-code/observability-as-code/schema-v2/_index.md

@@ -0,0 +1,243 @@
+---
+description: A reference for the JSON dashboard schemas used with Observability as Code, including the experimental V2 schema.
+keywords:
+  - configuration
+  - as code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: JSON schema v2
+weight: 500
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/
+aliases:
+  - ../../observability-as-code/schema-v2/ # /docs/grafana/next/observability-as-code/schema-v2/
+---
+
+# Dashboard JSON schema v2
+
+{{< admonition type="caution" >}}
+
+Dashboard JSON schema v2 is an [experimental](https://grafana.com/docs/release-life-cycle/) feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. To get early access to this feature, request it through [this form](https://docs.google.com/forms/d/e/1FAIpQLSd73nQzuhzcHJOrLFK4ef_uMxHAQiPQh1-rsQUT2MRqbeMLpg/viewform?usp=dialog).
+
+**Do not enable this feature in production environments as it may result in the irreversible loss of data.**
+
+{{< /admonition >}}
+
+Grafana dashboards are represented as JSON objects that store metadata, panels, variables, and settings.
+
+Observability as Code works with all versions of the JSON model, and it's fully compatible with version 2.
+
+## Before you begin
+
+Schema v2 is automatically enabled with the Dynamic Dashboards feature toggle.
+To get early access to this feature, request it through [this form](https://docs.google.com/forms/d/e/1FAIpQLSd73nQzuhzcHJOrLFK4ef_uMxHAQiPQh1-rsQUT2MRqbeMLpg/viewform?usp=dialog).
+It also requires the new dashboards API feature toggle, `kubernetesDashboards`, to be enabled as well.
+
+For more information on how dashboards behave depending on your feature flag configuration, refer to [Notes and limitations](#notes-and-limitations).
+
+## Accessing the JSON Model
+
+To view the JSON representation of a dashboard:
+
+1. Toggle on the edit mode switch in the top-right corner of the dashboard.
+1. Click the gear icon in the top navigation bar to go to **Settings**.
+1. Select the **JSON Model** tab.
+1. Copy or edit the JSON structure as needed.
+
+## JSON fields
+
+```json
+{
+  "annotations": [],
+  "cursorSync": "Off",
+  "editable": true,
+  "elements": {},
+  "layout": {
+    "kind": GridLayout, // Can also be AutoGridLayout, RowsLayout, or TabsLayout
+    "spec": {
+      "items": []
+    }
+  },
+  "links": [],
+  "liveNow": false,
+  "preload": false,
+  "tags": [], // Tags associated with the dashboard.
+  "timeSettings": {
+    "autoRefresh": "",
+    "autoRefreshIntervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "fiscalYearStartMonth": 0,
+    "from": "now-6h",
+    "hideTimepicker": false,
+    "timezone": "browser",
+    "to": "now"
+  },
+  "title": "",
+  "variables": []
+},
+```
+
+The dashboard JSON sample shown uses the default `GridLayoutKind`.
+The JSON in a new dashboard for the other three layout options, `AutoGridLayout`, `RowsLayout`, and `TabsLayout`, are as follows:
+
+**`AutoGridLayout`**
+
+```json
+  "layout": {
+    "kind": "AutoGridLayout",
+    "spec": {
+      "columnWidthMode": "standard",
+      "items": [],
+      "fillScreen": false,
+      "maxColumnCount": 3,
+      "rowHeightMode": "standard"
+    }
+  },
+```
+
+**`RowsLayout`**
+
+```json
+  "layout": {
+    "kind": "RowsLayout",
+    "spec": {
+      "rows": []
+  },
+```
+
+**`TabsLayout`**
+
+```json
+  "layout": {
+    "kind": "TabsLayout",
+    "spec": {
+      "tabs": []
+  },
+```
+
+### `DashboardSpec`
+
+The following table explains the usage of the dashboard JSON fields.
+The table includes default and other fields:
+
+<!-- prettier-ignore-start -->
+
+| Name         | Usage                                                                     |
+| ------------ | ------------------------------------------------------------------------- |
+| annotations  | Contains the list of annotations that are associated with the dashboard. |
+| cursorSync   | Dashboard cursor sync behavior.<ul><li>`Off` - No shared crosshair or tooltip (default)</li><li>`Crosshair` - Shared crosshair</li><li>`Tooltip` - Shared crosshair and shared tooltip</li></ul>  |
+| editable     | bool. Whether or not a dashboard is editable. |
+| elements     | Contains the list of elements included in the dashboard. Supported dashboard elements are: PanelKind and LibraryPanelKind. |
+| layout       | The dashboard layout. Supported layouts are:<ul><li>GridLayoutKind</li><li>AutoGridLayoutKind</li><li>RowsLayoutKind</li><li>TabsLayoutKind</li></ul>  |
+| links        | Links with references to other dashboards or external websites. |
+| liveNow      | bool. When set to `true`, the dashboard redraws panels at an interval matching the pixel width. This keeps data "moving left" regardless of the query refresh rate. This setting helps avoid dashboards presenting stale live data.    |
+| preload      | bool. When set to `true`, the dashboard loads all panels when the dashboard is loaded. |
+| tags         | Contains the list of tags associated with dashboard. |
+| timeSettings | All time settings for the dashboard. |
+| title        | Title of the dashboard.   |
+| variables    | Contains the list of configured template variables. |
+
+<!-- prettier-ignore-end -->
+
+### `annotations`
+
+The configuration for the list of annotations that are associated with the dashboard.
+For the JSON and field usage notes, refer to the [annotations schema documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/annotations-schema/).
+
+### `elements`
+
+Dashboards can contain the following elements:
+
+- [PanelKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/panel-schema/)
+- [LibraryPanelKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/librarypanel-schema/)
+
+### `layout`
+
+Dashboards can have four layout options:
+
+- [GridLayoutKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/layout-schema/#gridlayoutkind)
+- [AutoGridLayoutKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/layout-schema/#autogridlayoutkind)
+- [RowsLayoutKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/layout-schema/#rowslayoutkind)
+- [TabsLayoutKind](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/layout-schema/#tabslayoutkind)
+
+For the JSON and field usage notes about each of these, refer to the [layout schema documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/layout-schema/).
+
+### `links`
+
+The configuration for links with references to other dashboards or external websites.
+
+For the JSON and field usage notes, refer to the [links schema documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/links-schema/).
+
+### `tags`
+
+Tags associated with the dashboard. Each tag can be up to 50 characters long.
+
+` [...string]`
+
+### `timesettings`
+
+The `TimeSettingsSpec` defines the default time configuration for the time picker and the refresh picker for the specific dashboard.
+For the JSON and field usage notes about the `TimeSettingsSpec`, refer to the [timesettings schema documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/timesettings-schema/).
+
+### `variables`
+
+The `variables` schema defines which variables are used in the dashboard.
+
+There are eight variables types:
+
+- QueryVariableKind
+- TextVariableKind
+- ConstantVariableKind
+- DatasourceVariableKind
+- IntervalVariableKind
+- CustomVariableKind
+- GroupByVariableKind
+- AdhocVariableKind
+
+For the JSON and field usage notes about the `variables` spec, refer to the [variables schema documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/variables-schema/).
+
+## Notes and limitations
+
+### Existing dashboards
+
+With schema v2 enabled, you can still open and view your pre-existing dashboards.
+Upon saving, they’ll be updated to the new schema where you can take advantage of the new features and functionalities.
+
+### Dashboard behavior with disabled feature flags
+
+If you disable the Dynamic dashboards or `kubernetesDashboards` feature flags, you should be aware of how dashboards will behave.
+
+#### Disable Dynamic dashboards
+
+If the Dynamic dashboards feature toggle is disabled, depending on how the dashboard was built, it will behave differently:
+
+- Dashboards built on the new schema through the UI - View only
+- Dashboards built on Schema v1 - View and edit
+- Dashboards built on the new schema by way of Terraform or the CLI - View and edit
+- Provisioned dashboards built on the new schema - View and edit, but the edit experience will be the old experience
+
+#### Disable Dynamic dashboards and `kubernetesDashboards`
+
+You’ll be unable to view or edit dashboards created or updated in the new schema.
+
+### Import and export
+
+From the UI, dashboards created on schema v2 can be exported and imported like other dashboards.
+When you export them to use in another instance, references of data sources are not persisted but data source types are.
+You’ll have the option to select the data source of your choice in the import UI.

docs/sources/as-code/observability-as-code/schema-v2/annotations-schema.md

@@ -0,0 +1,86 @@
+---
+description: A reference for the JSON annotations schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - annotations
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: annotations schema
+title: annotations
+weight: 100
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/annotations-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/annotations-schema/ # /docs/grafana/next/observability-as-code/schema-v2/annotations-schema/
+---
+
+# `annotations`
+
+The configuration for the list of annotations that are associated with the dashboard.
+
+```json
+  "annotations": [
+    {
+      "kind": "AnnotationQuery",
+      "spec": {
+        "builtIn": false,
+        "datasource": {
+          "type": "",
+          "uid": ""
+        },
+        "enable": false,
+        "hide": false,
+        "iconColor": "",
+        "name": ""
+      }
+    }
+  ],
+```
+
+`AnnotationsQueryKind` consists of:
+
+- kind: "AnnotationQuery"
+- spec: [AnnotationQuerySpec](#annotationqueryspec)
+
+## `AnnotationQuerySpec`
+
+| Name       | Type/Definition                                                   |
+| ---------- | ----------------------------------------------------------------- |
+| datasource | [`DataSourceRef`](#datasourceref)                                 |
+| query      | [`DataQueryKind`](#dataquerykind)                                 |
+| enable     | bool                                                              |
+| hide       | bool                                                              |
+| iconColor  | string                                                            |
+| name       | string                                                            |
+| builtIn    | bool. Default is `false`.                                         |
+| filter     | [`AnnotationPanelFilter`](#annotationpanelfilter)                 |
+| options    | `[string]`: A catch-all field for datasource-specific properties. |
+
+### `DataSourceRef`
+
+| Name  | Usage                              |
+| ----- | ---------------------------------- |
+| type? | string. The plugin type-id.        |
+| uid?  | The specific data source instance. |
+
+### `DataQueryKind`
+
+| Name | Type   |
+| ---- | ------ |
+| kind | string |
+| spec | string |
+
+### `AnnotationPanelFilter`
+
+| Name     | Type/Definition                                                                |
+| -------- | ------------------------------------------------------------------------------ |
+| exclude? | bool. Should the specified panels be included or excluded. Default is `false`. |
+| ids      | `[...uint8]`. Panel IDs that should be included or excluded.                   |

docs/sources/as-code/observability-as-code/schema-v2/layout-schema.md

@@ -0,0 +1,339 @@
+---
+description: A reference for the JSON layout schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - layout
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: layout schema
+title: layout
+weight: 400
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/layout-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/layout-schema/ # /docs/grafana/next/observability-as-code/schema-v2/layout-schema/
+---
+
+# `layout`
+
+There are four layout options offering two types of panel control:
+
+**Panel layout options**
+
+These options control the size and position of panels:
+
+- [GridLayoutKind](#gridlayoutkind) - Corresponds to the **Custom** option in the UI. You define panel size and panel positions using x- and y- settings.
+- [AutoGridLayoutKind](#autogridlayoutkind) - Corresponds to the **Auto grid** option in the UI. Panel size and position are automatically set based on column and row parameters.
+
+**Panel grouping options**
+
+These options control the grouping of panels:
+
+- [RowsLayoutKind](#rowslayoutkind) - Groups panels into rows.
+- [TabsLayoutKind](#tabslayoutkind) - Groups panels into tabs.
+
+## `GridLayoutKind`
+
+The grid layout allows you to manually size and position grid items by setting the height, width, x, and y of each item.
+This layout corresponds to the **Custom** option in the UI.
+
+Following is the JSON for a default grid layout, a grid layout item, and a grid layout row:
+
+```json
+    "kind": "GridLayout",
+    "spec": {
+      "items": [
+        {
+          "kind": "GridLayoutItem",
+          "spec": {
+            "element": {...},
+            "height": 0,
+            "width": 0,
+            "x": 0,
+            "y": 0
+          }
+        },
+        {
+          "kind": "GridLayoutRow",
+          "spec": {
+            "collapsed": false,
+            "elements": [],
+            "title": "",
+            "y": 0
+          }
+        },
+      ]
+    }
+```
+
+`GridLayoutKind` consists of:
+
+- kind: "GridLayout"
+- spec: GridLayoutSpec
+  - items: GridLayoutItemKind` or GridLayoutRowKind`
+    - GridLayoutItemKind
+      - kind: "GridLayoutItem"
+      - spec: [GridLayoutItemSpec](#gridlayoutitemspec)
+    - GridLayoutRowKind
+      - kind: "GridLayoutRow"
+      - spec: [GridLayoutRowSpec](#gridlayoutrowspec)
+
+### `GridLayoutItemSpec`
+
+The following table explains the usage of the grid layout item JSON fields:
+
+| Name    | Usage                                                                                                                                                                                                                 |
+| ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| x       | integer. Position of the item x-axis.                                                                                                                                                                                 |
+| y       | integer. Position of the item y-axis.                                                                                                                                                                                 |
+| width   | Width of the item in pixels.                                                                                                                                                                                          |
+| height  | Height of the item in pixels.                                                                                                                                                                                         |
+| element | `ElementReference`. Reference to a [`PanelKind`](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/panel-schema/) from `dashboard.spec.elements` expressed as JSON Schema reference. |
+| repeat? | [RepeatOptions](#repeatoptions). Configured repeat options, if any                                                                                                                                                    |
+
+#### `RepeatOptions`
+
+The following table explains the usage of the repeat option JSON fields:
+
+| Name       | Usage                                                |
+| ---------- | ---------------------------------------------------- |
+| mode       | `RepeatMode` - "variable"                            |
+| value      | string                                               |
+| direction? | Options are `h` for horizontal and `v` for vertical. |
+| maxPerRow? | integer                                              |
+
+### `GridLayoutRowSpec`
+
+The following table explains the usage of the grid layout row JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| y | integer. Position of the row y-axis  |
+| collapsed | bool. Whether or not the row is collapsed  |
+| title | Row title |
+| elements | [`[...GridLayoutItemKind]`](#gridlayoutitemspec). Grid items in the row will have their y value be relative to the row's y value. This means a panel positioned at `y: 0` in a row with `y: 10` will be positioned at `y: 11` (row header has a height of 1) in the dashboard. |
+| repeat? | [RowRepeatOptions](#rowrepeatoptions) Configured row repeat options, if any</p> |
+
+<!-- prettier-ignore-end -->
+
+#### `RowRepeatOptions`
+
+| Name  | Usage                     |
+| ----- | ------------------------- |
+| mode  | `RepeatMode` - "variable" |
+| value | string                    |
+
+## `AutoGridLayoutKind`
+
+With an auto grid, Grafana sizes and positions your panels for the best fit based on the column and row constraints that you set.
+This layout corresponds to the **Auto grid** option in the UI.
+
+Following is the JSON for a default auto grid layout and a grid layout item:
+
+<!-- prettier-ignore-end -->
+
+```json
+    "kind": "AutoGridLayout",
+    "spec": {
+      "columnWidthMode": "standard",
+      "fillScreen": false,
+      "items": [
+        {
+          "kind": "AutoGridLayoutItem",
+          "spec": {
+            "element": {...},
+          }
+        }
+      ],
+      "maxColumnCount": 3,
+      "rowHeightMode": "standard"
+    }
+```
+
+`AutoGridLayoutKind` consists of:
+
+- kind: "AutoGridLayout"
+- spec: [AutoGridLayoutSpec](#autogridlayoutspec)
+
+### `AutoGridLayoutSpec`
+
+The following table explains the usage of the auto grid layout JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| maxColumnCount? | number. Default is `3`. |
+| columnWidthMode | Options are: `narrow`, `standard`, `wide`, and `custom`. Default is `standard`. |
+| columnWidth? | number |
+| rowHeightMode | Options are: `short`, `standard`, `tall`, and `custom`. Default is `standard`. |
+| rowHeight? | number |
+| fillScreen? | bool. Default is `false`. |
+| items | `AutoGridLayoutItemKind`. Consists of:<ul><li>kind: "AutoGridLayoutItem"</li><li>spec: [AutoGridLayoutItemSpec](#autogridlayoutitemspec)</li></ul> |
+
+<!-- prettier-ignore-end -->
+
+#### `AutoGridLayoutItemSpec`
+
+The following table explains the usage of the auto grid layout item JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| element | `ElementReference`. Reference to a [`PanelKind`](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/observability-as-code/schema-v2/panel-schema/) from `dashboard.spec.elements` expressed as JSON Schema reference. |
+| repeat? | [AutoGridRepeatOptions](#autogridrepeatoptions). Configured repeat options, if any. |
+| conditionalRendering? | `ConditionalRenderingGroupKind`. Rules for hiding or showing panels, if any. Consists of:<ul><li>kind: "ConditionalRenderingGroup"</li><li>spec: [ConditionalRenderingGroupSpec](#conditionalrenderinggroupspec)</li></ul> |
+
+<!-- prettier-ignore-end -->
+
+##### `AutoGridRepeatOptions`
+
+The following table explains the usage of the auto grid repeat option JSON fields:
+
+| Name  | Usage                     |
+| ----- | ------------------------- |
+| mode  | `RepeatMode` - "variable" |
+| value | String                    |
+
+##### `ConditionalRenderingGroupSpec`
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| visibility | Options are `show` and `hide` |
+| condition | Options are `and` and `or` |
+| items | Options are:<ul><li>ConditionalRenderingVariableKind<ul><li>kind: "ConditionalRenderingVariable"</li><li>spec: [ConditionalRenderingVariableSpec](#conditionalrenderingvariablespec)</li></ul></li><li>ConditionalRenderingDataKind<ul><li>kind: "ConditionalRenderingData"</li><li>spec: [ConditionalRenderingDataSpec](#conditionalrenderingdataspec)</li></ul></li><li>ConditionalRenderingTimeRangeSizeKind<ul><li>kind: "ConditionalRenderingTimeRangeSize"</li><li>spec: [ConditionalRenderingTimeRangeSizeSpec](#conditionalrenderingtimerangesizespec)</li></ul></li></ul> |
+
+<!-- prettier-ignore-end -->
+
+###### `ConditionalRenderingVariableSpec`
+
+| Name     | Usage                                |
+| -------- | ------------------------------------ |
+| variable | string                               |
+| operator | Options are `equals` and `notEquals` |
+| value    | string                               |
+
+###### `ConditionalRenderingDataSpec`
+
+| Name  | Type |
+| ----- | ---- |
+| value | bool |
+
+###### `ConditionalRenderingTimeRangeSizeSpec`
+
+| Name  | Type   |
+| ----- | ------ |
+| value | string |
+
+## `RowsLayoutKind`
+
+The `RowsLayoutKind` is one of two options that you can use to group panels.
+You can nest any other kind of layout inside a layout row.
+Rows can also be nested in auto grids or tabs.
+
+Following is the JSON for a default rows layout row:
+
+```json
+    "kind": "RowsLayout",
+    "spec": {
+      "rows": [
+        {
+          "kind": "RowsLayoutRow",
+          "spec": {
+            "layout": {
+              "kind": "GridLayout", // Can also be AutoGridLayout or TabsLayout
+              "spec": {...}
+            },
+            "title": ""
+          }
+        }
+      ]
+    }
+```
+
+`RowsLayoutKind` consists of:
+
+- kind: RowsLayout
+- spec: RowsLayoutSpec
+  - rows: RowsLayoutRowKind
+    - kind: RowsLayoutRow
+    - spec: [RowsLayoutRowSpec](#rowslayoutrowspec)
+
+### `RowsLayoutRowSpec`
+
+The following table explains the usage of the rows layout row JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| title? | Title of the row. |
+| collapse | bool. Whether or not the row is collapsed. |
+| hideHeader? | bool. Whether the row header is hidden or shown. |
+| fullScreen? | bool. Whether or not the row takes up the full screen. |
+| conditionalRendering? | `ConditionalRenderingGroupKind`. Rules for hiding or showing rows, if any. Consists of:<ul><li>kind: "ConditionalRenderingGroup"</li><li>spec: [ConditionalRenderingGroupSpec](#conditionalrenderinggroupspec)</li></ul> |
+| repeat? | [RowRepeatOptions](#rowrepeatoptions). Configured repeat options, if any. |
+| layout | Supported layouts are:<ul><li>[GridLayoutKind](#gridlayoutkind)</li><li>[RowsLayoutKind](#rowslayoutkind)</li><li>[AutoGridLayoutKind](#autogridlayoutkind)</li><li>[TabsLayoutKind](#tabslayoutkind)</li></ul> |
+
+<!-- prettier-ignore-end -->
+
+## `TabsLayoutKind`
+
+The `TabsLayoutKind` is one of two options that you can use to group panels.
+You can nest any other kind of layout inside a tab.
+Tabs can also be nested in auto grids or rows.
+
+Following is the JSON for a default tabs layout tab and a tab:
+
+```json
+    "kind": "TabsLayout",
+    "spec": {
+      "tabs": [
+        {
+          "kind": "TabsLayoutTab",
+          "spec": {
+            "layout": {
+              "kind": "GridLayout", // Can also be AutoGridLayout or RowsLayout
+              "spec": {...}
+            },
+            "title": "New tab"
+          }
+        }
+      ]
+    }
+```
+
+`TabsLayoutKind` consists of:
+
+- kind: TabsLayout
+  - spec: TabsLayoutSpec
+    - tabs: TabsLayoutTabKind
+      - kind: TabsLayoutTab
+      - spec: [TabsLayoutTabSpec](#tabslayouttabspec)
+
+### `TabsLayoutTabSpec`
+
+The following table explains the usage of the tabs layout tab JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| title? | The title of the tab. |
+| layout | Supported layouts are:<ul><li>[GridLayoutKind](#gridlayoutkind)</li><li>[RowsLayoutKind](#rowslayoutkind)</li><li>[AutoGridLayoutKind](#autogridlayoutkind)</li><li>[TabsLayoutKind](#tabslayoutkind)</li></ul> |
+| conditionalRendering? | `ConditionalRenderingGroupKind`. Rules for hiding or showing panels, if any. Consists of:<ul><li>kind: "ConditionalRenderingGroup"</li><li>spec: [ConditionalRenderingGroupSpec](#conditionalrenderinggroupspec)</li></ul> |
+
+<!-- prettier-ignore-end -->

docs/sources/as-code/observability-as-code/schema-v2/librarypanel-schema.md

@@ -0,0 +1,68 @@
+---
+description: A reference for the JSON library panel schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - library panel
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: LibraryPanelKind schema
+title: LibraryPanelKind
+weight: 300
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/librarypanel-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/librarypanel-schema/ # /docs/grafana/next/observability-as-code/schema-v2/librarypanel-schema/
+---
+
+# `LibraryPanelKind`
+
+A library panel is a reusable panel that you can use in any dashboard.
+When you make a change to a library panel, that change propagates to all instances of where the panel is used.
+Library panels streamline reuse of panels across multiple dashboards.
+
+Following is the default library panel element JSON:
+
+```json
+      "kind": "LibraryPanel",
+      "spec": {
+        "id": 0,
+        "libraryPanel": {
+          name: "",
+          uid: "",
+        }
+        "title": ""
+      }
+```
+
+The `LibraryPanelKind` consists of:
+
+- kind: "LibraryPanel"
+- spec: [LibraryPanelKindSpec](#librarypanelkindspec)
+  - libraryPanel: [LibraryPanelRef](#librarypanelref)
+
+## `LibraryPanelKindSpec`
+
+The following table explains the usage of the library panel element JSON fields:
+
+| Name         | Usage                                            |
+| ------------ | ------------------------------------------------ |
+| id           | Panel ID for the library panel in the dashboard. |
+| libraryPanel | [`LibraryPanelRef`](#librarypanelref)            |
+| title        | Title for the library panel in the dashboard.    |
+
+### `LibraryPanelRef`
+
+The following table explains the usage of the library panel reference JSON fields:
+
+| Name | Usage              |
+| ---- | ------------------ |
+| name | Library panel name |
+| uid  | Library panel uid  |

docs/sources/as-code/observability-as-code/schema-v2/links-schema.md

@@ -0,0 +1,67 @@
+---
+description: A reference for the JSON links schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - links
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: links schema
+title: links
+weight: 500
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/links-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/links-schema/ # /docs/grafana/next/observability-as-code/schema-v2/links-schema/
+---
+
+# `links`
+
+The `links` schema is the configuration for links with references to other dashboards or external websites.
+Following are the default JSON fields:
+
+```json
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "",
+      "includeVars": false,
+      "keepTime": false,
+      "tags": [],
+      "targetBlank": false,
+      "title": "",
+      "tooltip": "",
+      "type": "link",
+    },
+  ],
+```
+
+## `DashboardLink`
+
+The following table explains the usage of the dashboard link JSON fields.
+The table includes default and other fields:
+
+<!-- prettier-ignore-start -->
+
+| Name        | Usage                                   |
+| ----------- | --------------------------------------- |
+| title       | string. Title to display with the link. |
+| type        | `DashboardLinkType`. Link type. Accepted values are:<ul><li>dashboards - To refer to another dashboard</li><li>link - To refer to an external resource</li></ul> |
+| icon        | string. Icon name to be displayed with the link. |
+| tooltip     | string. Tooltip to display when the user hovers their mouse over it. |
+| url?        | string. Link URL. Only required/valid if the type is link. |
+| tags        | string. List of tags to limit the linked dashboards. If empty, all dashboards will be displayed. Only valid if the type is dashboards. |
+| asDropdown  | bool. If true, all dashboards links will be displayed in a dropdown. If false, all dashboards links will be displayed side by side. Only valid if the type is dashboards. Default is `false`. |
+| targetBlank | bool. If true, the link will be opened in a new tab. Default is `false`. |
+| includeVars | bool. If true, includes current template variables values in the link as query params. Default is `false`. |
+| keepTime    | bool. If true, includes current time range in the link as query params. Default is `false`. |
+| placement?  | string. Use placement to display the link somewhere else on the dashboard other than above the visualizations. Use  the `inControlsMenu` parameter to render the link in the dashboard controls dropdown menu. |
+
+<!-- prettier-ignore-end -->

docs/sources/as-code/observability-as-code/schema-v2/panel-schema.md

@@ -0,0 +1,305 @@
+---
+description: A reference for the JSON panel schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - panels
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: PanelKind schema
+title: PanelKind
+weight: 200
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/panel-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/panel-schema/ # /docs/grafana/next/observability-as-code/schema-v2/panel-schema/
+---
+
+# `PanelKind`
+
+The panel element contains all the information about the panel including the visualization type, panel and visualization configuration, queries, and transformations.
+There's a panel element for each panel contained in the dashboard.
+
+Following is the default panel element JSON:
+
+```json
+      "kind": "Panel",
+      "spec": {
+        "data": {
+          "kind": "QueryGroup",
+          "spec": {...},
+        "description": "",
+        "id": 0,
+        "links": [],
+        "title": "",
+        "vizConfig": {
+          "kind": "",
+          "spec": {...},
+        }
+      }
+```
+
+The `PanelKind` consists of:
+
+- kind: "Panel"
+- spec: [PanelSpec](#panelspec)
+
+## `PanelSpec`
+
+The following table explains the usage of the panel element JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name         | Usage                                                                 |
+| ------------ | --------------------------------------------------------------------- |
+| data         | `QueryGroupKind`, which includes queries and transformations. Consists of:<ul><li>kind: "QueryGroup"</li><li>spec: [QueryGroupSpec](#querygroupspec)</li></ul>                               |
+| description  | The panel description.                                                |
+| id           | The panel ID.                                                         |
+| links        | Links with references to other dashboards or external websites.       |
+| title        | The panel title.                                                      |
+| vizConfig    | `VizConfigKind`. Includes visualization type, field configuration options, and all other visualization options. Consists of:<ul><li>kind: string. Plugin ID.</li><li>spec: [VizConfigSpec](#vizconfigspec)</li></ul>                            |
+| transparent? | bool. Controls whether or not the panel background is transparent. |
+
+<!-- prettier-ignore-end -->
+
+### `QueryGroupSpec`
+
+<!-- prettier-ignore-start -->
+
+| Name            | Usage                                                                                                                                                  |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| queries         | `PanelQueryKind`. Consists of:<ul><li>kind: PanelQuery</li><li>spec: [PanelQuerySpec](#panelqueryspec)</li></ul>                                       |
+| transformations | `TransformationKind`. Consists of:<ul><li>kind: string. The transformation ID.</li><li>spec: [DataTransformerConfig](#datatransformerconfig)</li></ul> |
+| queryOptions    | [`QueryOptionsSpec`](#queryoptionsspec)                                                                                                                |
+
+<!-- prettier-ignore-end -->
+
+#### `PanelQuerySpec`
+
+| Name        | Usage                             |
+| ----------- | --------------------------------- |
+| query       | [`DataQueryKind`](#dataquerykind) |
+| datasource? | [`DataSourceRef`](#datasourceref) |
+
+##### `DataQueryKind`
+
+| Name | Type   |
+| ---- | ------ |
+| kind | string |
+| spec | string |
+
+##### `DataSourceRef`
+
+| Name  | Usage                              |
+| ----- | ---------------------------------- |
+| type? | string. The plugin type-id.        |
+| uid?  | The specific data source instance. |
+
+#### `DataTransformerConfig`
+
+Transformations allow you to manipulate data returned by a query before the system applies a visualization.
+Using transformations you can: rename fields, join time series data, perform mathematical operations across queries, or use the output of one transformation as the input to another transformation.
+
+<!-- prettier-ignore-start -->
+
+| Name      | Usage                                     |
+| --------- | ------------------------------------------- |
+| id        | string. Unique identifier of transformer.   |
+| disabled? | bool. Disabled transformations are skipped. |
+| filter?   | [`MatcherConfig`](#matcherconfig). Optional frame matcher. When missing it will be applied to all results.  |
+| topic?    | `DataTopic`. Where to pull `DataFrames` from as input to transformation. Options are: `series`, `annotations`, and `alertStates`. |
+| options   | Options to be passed to the transformer. Valid options depend on the transformer id.  |
+
+<!-- prettier-ignore-end -->
+
+##### `MatcherConfig`
+
+Matcher is a predicate configuration.
+Based on the configuration a set of field or values, it's filtered to apply an override or transformation.
+It comes with in id (to resolve implementation from registry) and a configuration that’s specific to a particular matcher type.
+
+| Name     | Usage                                                                                  |
+| -------- | -------------------------------------------------------------------------------------- |
+| id       | string. The matcher id. This is used to find the matcher implementation from registry. |
+| options? | The matcher options. This is specific to the matcher implementation.                   |
+
+#### `QueryOptionsSpec`
+
+| Name              | Type    |
+| ----------------- | ------- |
+| timeFrom?         | string  |
+| maxDataPoints?    | integer |
+| timeShift?        | string  |
+| queryCachingTTL?  | integer |
+| interval?         | string  |
+| cacheTimeout?     | string  |
+| hideTimeOverride? | bool    |
+
+### `VizConfigSpec`
+
+| Name          | Type/Definition                         |
+| ------------- | --------------------------------------- |
+| pluginVersion | string                                  |
+| options       | string                                  |
+| fieldConfig   | [FieldConfigSource](#fieldconfigsource) |
+
+#### `FieldConfigSource`
+
+The data model used in Grafana, namely the _data frame_, is a columnar-oriented table structure that unifies both time series and table query results.
+Each column within this structure is called a field.
+A field can represent a single time series or table column.
+Field options allow you to change how the data is displayed in your visualizations.
+
+<!-- prettier-ignore-start -->
+
+| Name       | Type/Definition                   |
+| ---------- | ------------------------------------- |
+| defaults   | [`FieldConfig`](#fieldconfig). Defaults are the options applied to all fields.  |
+| overrides  |  The options applied to specific fields overriding the defaults.  |
+| matcher    | [`MatcherConfig`](#matcherconfig). Optional frame matcher. When missing it will be applied to all results.  |
+| properties | `DynamicConfigValue`. Consists of:<ul><li>`id` - string</li><li>value?</li></ul> |
+
+<!-- prettier-ignore-end -->
+
+##### `FieldConfig`
+
+<!-- prettier-ignore-start -->
+
+| Name               | Type/Definition                  |
+| ------------------ | --------------------------------------- |
+| displayName?       | string. The display value for this field. This supports template variables where empty is auto.  |
+| displayNameFromDS? | string. This can be used by data sources that return an explicit naming structure for values and labels. When this property is configured, this value is used rather than the default naming strategy.  |
+| description?       | string. Human readable field metadata.  |
+|  path?             | string. An explicit path to the field in the data source. When the frame meta includes a path, this will default to `${frame.meta.path}/${field.name}`. When defined, this value can be used as an identifier within the data source scope, and may be used to update the results.                                      |
+| writeable?         | bool. True if the data source can write a value to the path. Auth/authz are supported separately. |
+| filterable?        | bool. True if the data source field supports ad-hoc filters. |
+| unit?              | string. Unit a field should use. The unit you select is applied to all fields except time. You can use the unit's ID available in Grafana or a custom unit. [Available units in Grafana](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/valueFormats/categories.ts). As custom units, you can use the following formats:<ul><li>`suffix:<suffix>` for custom unit that should go after value.</li><li>`prefix:<prefix>` for custom unit that should go before value.</li><li> `time:<format>` for custom date time formats type for example</li><li>`time:YYYY-MM-DD`</li><li>`si:<base scale><unit characters>` for custom SI units. For example: `si: mF`. You can specify both a unit and the source data scale, so if your source data is represented as milli (thousands of) something, prefix the unit with that SI scale character.</li><li>`count:<unit>` for a custom count unit.</li><li>`currency:<unit>` for custom a currency unit.</li></ul>                                         |
+| decimals?          | number. Specify the number of decimals Grafana includes in the rendered value. If you leave this field blank, Grafana automatically truncates the number of decimals based on the value. For example 1.1234 will display as 1.12 and 100.456 will display as 100. To display all decimals, set the unit to `string`. |
+| min?               | number. The minimum value used in percentage threshold calculations. Leave empty for auto calculation based on all series and fields.       |
+| max?               | number. The maximum value used in percentage threshold calculations. Leave empty for auto calculation based on all series and fields.       |
+| mappings?          | `[...ValueMapping]`. Convert input values into a display string. Options are: [`ValueMap`](#valuemap), [`RangeMap`](#rangemap), [`RegexMap`](#rangemap), [`SpecialValueMap`](#specialvaluemap).         |
+| thresholds?        | `ThresholdsConfig`. Map numeric values to states. Consists of:<ul><li>`mode` - `ThresholdsMode`. Options are: `absolute` and `percentage`.</li><li>`steps` - `[...Threshold]`</li></ul>    |
+| color?             | [`FieldColor`](#fieldcolor). Panel color configuration.  |
+| links?             | `[...]`. The behavior when clicking a result.  |
+| noValue?           | string. Alternative to an empty string.    |
+| custom?            | `{...}`. Specified by the `FieldConfig` field in panel plugin schemas.   |
+
+<!-- prettier-ignore-end -->
+
+###### `ValueMap`
+
+Maps text values to a color or different display text and color.
+For example, you can configure a value mapping so that all instances of the value 10 appear as Perfection! rather than the number.
+
+<!-- prettier-ignore-start -->
+
+| Name    | Usage                             |
+| ------- | -------- |
+| type    | `MappingType` & "value". `MappingType` options are: `value`, `range`, `regex`, and `special`.    |
+| options | string. [`ValueMappingResult`](#valuemappingresult). Map with `<value_to_match>`: `ValueMappingResult`. For example: `{ "10": { text: "Perfection!", color: "green" } }`.   |
+
+<!-- prettier-ignore-end -->
+
+###### `RangeMap`
+
+Maps numerical ranges to a display text and color.
+For example, if a value is within a certain range, you can configure a range value mapping to display Low or High rather than the number.
+
+<!-- prettier-ignore-start -->
+
+| Name    | Usage                                                              |
+| ------- | ---------------------------------------------------------------------------------------------------- |
+| type    | `MappingType` & "range". `MappingType` options are: `value`, `range`, `regex`, and `special`.                                                                  |
+| options | Range to match against and the result to apply when the value is within the range. Spec:<ul><li>`from` - `float64` or `null`. Min value of the range. It can be null which means `-Infinity`.</li><li>`to` - `float64` or `null`. Max value of the range. It can be null which means `+Infinity`.</li><li>`result` - [`ValueMappingResult`](#valuemappingresult) |
+
+<!-- prettier-ignore-end -->
+
+###### `RegexMap`
+
+Maps regular expressions to replacement text and a color.
+For example, if a value is `www.example.com`, you can configure a regex value mapping so that Grafana displays www and truncates the domain.
+
+<!-- prettier-ignore-start -->
+
+| Name    | Usage                                                                                         |
+| ------- | --------------------------------------------------------------------------------------------- |
+| type    | `MappingType` & "regex". `MappingType` options are: `value`, `range`, `regex`, and `special`. |
+| options | Regular expression to match against and the result to apply when the value matches the regex. Spec:<ul><li>`pattern` - string. Regular expression to match against.</li><li>`result` - [`ValueMappingResult`](#valuemappingresult)                                                         |
+
+<!-- prettier-ignore-end -->
+
+###### `SpecialValueMap`
+
+Maps special values like Null, NaN (not a number), and boolean values like true and false to a display text and color.
+See `SpecialValueMatch` in the following table to see the list of special values.
+For example, you can configure a special value mapping so that null values appear as N/A.
+
+<!-- prettier-ignore-start -->
+
+| Name    | Usage                                                                                           |
+| ------- | ----------------------------------------------------------------------------------------------- |
+| type    | `MappingType` & "special". `MappingType` options are: `value`, `range`, `regex`, and `special`. |
+| options | Spec:<ul><li>`match` - `SpecialValueMatch`. Special value to match against. Types are:<ul><li>true</li><li>false</li><li>null</li><li>nan</li><li>empty</li></ul> </li><li>`result` - [`ValueMappingResult`](#valuemappingresult)   |
+
+<!-- prettier-ignore-end -->
+
+###### `ValueMappingResult`
+
+Result used as replacement with text and color when the value matches.
+
+| Name  | Usage                                                                         |
+| ----- | ----------------------------------------------------------------------------- |
+| text  | string. Text to display when the value matches.                               |
+| color | string. Color to use when the value matches.                                  |
+| icon  | string. Icon to display when the value matches. Only specific visualizations. |
+| index | int32. Position in the mapping array. Only used internally.                   |
+
+###### `FieldColor`
+
+Map a field to a color.
+
+<!-- prettier-ignore-start -->
+
+| Name        | Usage                                                                |
+| ----------- | -------------------------------------------------------------------- |
+| mode        | [`FieldColorModeId`](#fieldcolormodeid). The main color scheme mode. |
+| FixedColor? | string. The fixed color value for fixed or shades color modes.       |
+| seriesBy?   |  `FieldColorSeriesByMode`. Some visualizations need to know how to assign a series color from by value color schemes. Defines how to assign a series color from "by value" color schemes. For example for an aggregated data points like a timeseries, the color can be assigned by the min, max or last value. Options are: `min`, `max`, and `last`. |
+
+<!-- prettier-ignore-end -->
+
+###### `FieldColorModeId`
+
+Color mode for a field.
+You can specify a single color, or select a continuous (gradient) color schemes, based on a value.
+Continuous color interpolates a color using the percentage of a value relative to min and max.
+Accepted values are:
+
+<!-- prettier-ignore-start -->
+
+| Name | Description |
+| --- | ---- |
+| thresholds | From thresholds. Informs Grafana to take the color from the matching threshold. |
+| palette-classic | Classic palette. Grafana will assign color by looking up a color in a palette by series index. Useful for graphs and pie charts and other categorical data visualizations. |
+| palette-classic-by-name | Classic palette (by name). Grafana will assign color by looking up a color in a palette by series name. Useful for Graphs and pie charts and other categorical data visualizations |
+| continuous-GrYlRd | Continuous Green-Yellow-Red palette mode |
+| continuous-RdYlGr | Continuous Red-Yellow-Green palette mode |
+| continuous-BlYlRd | Continuous Blue-Yellow-Red palette mode |
+| continuous-YlRd | Continuous Yellow-Red palette mode |
+| continuous-BlPu | Continuous Blue-Purple palette mode |
+| continuous-YlBl | Continuous Yellow-Blue palette mode |
+| continuous-blues | Continuous Blue palette mode |
+| continuous-reds | Continuous Red palette mode |
+| continuous-greens | Continuous Green palette mode |
+| continuous-purples | Continuous Purple palette mode |
+| shades | Shades of a single color. Specify a single color, useful in an override rule. |
+| fixed | Fixed color mode. Specify a single color, useful in an override rule. |
+
+<!-- prettier-ignore-end -->

docs/sources/as-code/observability-as-code/schema-v2/timesettings-schema.md

@@ -0,0 +1,87 @@
+---
+description: A reference for the JSON timesettings schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - time settings
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: timesettings schema
+title: timesettings
+weight: 600
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/timesettings-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/timesettings-schema/ # /docs/grafana/next/observability-as-code/schema-v2/timesettings-schema/
+---
+
+# `timeSettings`
+
+The `TimeSettingsSpec` defines the default time configuration for the time picker and the refresh picker for the specific dashboard.
+
+Following is the JSON for default time settings:
+
+```json
+  "timeSettings": {
+    "autoRefresh": "",
+    "autoRefreshIntervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "fiscalYearStartMonth": 0,
+    "from": "now-6h",
+    "hideTimepicker": false,
+    "timezone": "browser",
+    "to": "now"
+  },
+```
+
+`timeSettings` consists of:
+
+- [TimeSettingsSpec](#timesettingsspec)
+
+## `TimeSettingsSpec`
+
+The following table explains the usage of the time settings JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name | Usage |
+| ---- | ----- |
+| timezone? | string. Timezone of dashboard. Accepted values are IANA TZDB zone ID, `browser`, or `utc`. Default is `browser`.  |
+| from | string. Start time range for dashboard. Accepted values are relative time strings like `now-6h` or absolute time strings like `2020-07-10T08:00:00.000Z`. Default is `now-6h`. |
+| to | string. End time range for dashboard. Accepted values are relative time strings like `now-6h` or absolute time strings like `2020-07-10T08:00:00.000Z`. Default is `now`. |
+| autoRefresh | string. Refresh rate of dashboard. Represented by interval string. For example: `5s`, `1m`, `1h`, `1d`. No default. In schema v1: `refresh`. |
+| autoRefreshIntervals | string. Interval options available in the refresh picker drop-down menu. The default array is `["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]`. |
+|quickRanges? | Selectable options available in the time picker drop-down menu. Has no effect on provisioned dashboard. Defined in the [`TimeRangeOption`](#timerangeoption) spec. In schema v1: `timepicker.quick_ranges`, not exposed in the UI. |
+| hideTimepicker | bool. Whether or not the time picker is visible. Default is `false`. In schema v1: `timepicker.hidden`. |
+| weekStart? | Day when the week starts. Expressed by the name of the day in lowercase. For example: `monday`. Options are `saturday`, `monday`, and `sunday`. |
+| fiscalYearStartMonth | The month that the fiscal year starts on. `0` = January, `11` = December |
+| nowDelay? | string. Override the "now" time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values. In schema v1: `timepicker.nowDelay`. |
+
+<!-- prettier-ignore-end -->
+
+### `TimeRangeOption`
+
+The following table explains the usage of the time range option JSON fields:
+
+| Name    | Usage                              |
+| ------- | ---------------------------------- |
+| display | string. Default is `Last 6 hours`. |
+| from    | string. Default is `now-6h`.       |
+| to      | string. Default is `now`.          |

docs/sources/as-code/observability-as-code/schema-v2/variables-schema.md

@@ -0,0 +1,501 @@
+---
+description: A reference for the JSON variables schema used with Observability as Code.
+keywords:
+  - configuration
+  - as code
+  - as-code
+  - dashboards
+  - git integration
+  - git sync
+  - github
+  - variables
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: variables schema
+title: variables
+weight: 700
+canonical: https://grafana.com/docs/grafana/latest/as-code/observability-as-code/schema-v2/variables-schema/
+aliases:
+  - ../../../observability-as-code/schema-v2/variables-schema/ # /docs/grafana/next/observability-as-code/schema-v2/variables-schema/
+---
+
+# `variables`
+
+The available variable types described in the following sections:
+
+- [QueryVariableKind](#queryvariablekind)
+- [TextVariableKind](#textvariablekind)
+- [ConstantVariableKind](#constantvariablekind)
+- [DatasourceVariableKind](#datasourcevariablekind)
+- [IntervalVariableKind](#intervalvariablekind)
+- [CustomVariableKind](#customvariablekind)
+- [SwitchVariableKind](#switchvariablekind)
+- [GroupByVariableKind](#groupbyvariablekind)
+- [AdhocVariableKind](#adhocvariablekind)
+
+## `QueryVariableKind`
+
+Following is the JSON for a default query variable:
+
+```json
+  "variables": [
+    {
+      "kind": "QueryVariable",
+      "spec": {
+        "current": {
+          "text": "",
+          "value": ""
+        },
+        "hide": "dontHide",
+        "includeAll": false,
+        "multi": false,
+        "name": "",
+        "options": [],
+        "query": defaultDataQueryKind(),
+        "refresh": "never",
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": "disabled"
+      }
+    }
+  ]
+```
+
+`QueryVariableKind` consists of:
+
+- kind: "QueryVariable"
+- spec: [QueryVariableSpec](#queryvariablespec)
+
+### `QueryVariableSpec`
+
+The following table explains the usage of the query variable JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name         | Usage                                                  |
+| ------------ | ---------------------------------------------- |
+| name         | string. Name of the variable. |
+| current      | "Text" and a "value" or [`VariableOption`](#variableoption) |
+| label?       | string |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`. |
+| refresh      | `VariableRefresh`. Options are `never`, `onDashboardLoad`, and `onTimeChanged`. |
+| skipUrlSync  | bool. Default is `false`. |
+| description? | string |
+| datasource?  | [`DataSourceRef`](#datasourceref) |
+| query        | `DataQueryKind`. Consists of:<ul><li>kind: string</li><li>spec: string</li></ul> |
+| regex        | string |
+| sort         | `VariableSort`. Options are:<ul><li>disabled</li><li>alphabeticalAsc</li><li>alphabeticalDesc</li><li>numericalAsc</li><li>numericalDesc</li><li>alphabeticalCaseInsensitiveAsc</li><li>alphabeticalCaseInsensitiveDesc</li><li>naturalAsc</li><li>naturalDesc</li></ul> |
+| definition?  | string |
+| options      | [`VariableOption`](#variableoption)  |
+| multi        | bool. Default is `false`.  |
+| includeAll   | bool. Default is `false`. |
+| allValue?    | string |
+| placeholder? | string |
+
+<!-- prettier-ignore-end -->
+
+#### `VariableOption`
+
+| Name     | Usage                                        |
+| -------- | -------------------------------------------- |
+| selected | bool. Whether or not the option is selected. |
+| text     | string. Text to be displayed for the option. |
+| value    | string. Value of the option.                 |
+
+#### `DataSourceRef`
+
+| Name  | Usage                              |
+| ----- | ---------------------------------- |
+| type? | string. The plugin type-id.        |
+| uid?  | The specific data source instance. |
+
+## `TextVariableKind`
+
+Following is the JSON for a default text variable:
+
+```json
+  "variables": [
+    {
+      "kind": "TextVariable",
+      "spec": {
+        "current": {
+          "text": "",
+          "value": ""
+        },
+        "hide": "dontHide",
+        "name": "",
+        "query": "",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`TextVariableKind` consists of:
+
+- kind: TextVariableKind
+- spec: [TextVariableSpec](#textvariablespec)
+
+### `TextVariableSpec`
+
+The following table explains the usage of the query variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                    |
+| current      | "Text" and a "value" or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| query        | string                                                                                                                           |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`.                                                                                                        |
+| description? | string                                                                                                                           |
+
+## `ConstantVariableKind`
+
+Following is the JSON for a default constant variable:
+
+```json
+  "variables": [
+    {
+      "kind": "ConstantVariable",
+      "spec": {
+        "current": {
+          "text": "",
+          "value": ""
+        },
+        "hide": "hideVariable",
+        "name": "",
+        "query": "",
+        "skipUrlSync": true
+      }
+    }
+  ]
+```
+
+`ConstantVariableKind` consists of:
+
+- kind: "ConstantVariable"
+- spec: [ConstantVariableSpec](#constantvariablespec)
+
+### `ConstantVariableSpec`
+
+The following table explains the usage of the constant variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                    |
+| query        | string                                                                                                                           |
+| current      | "Text" and a "value" or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`.                                                                                                        |
+| description? | string                                                                                                                           |
+
+## `DatasourceVariableKind`
+
+Following is the JSON for a default data source variable:
+
+```json
+  "variables": [
+    {
+      "kind": "DatasourceVariable",
+      "spec": {
+        "current": {
+          "text": "",
+          "value": ""
+        },
+        "hide": "dontHide",
+        "includeAll": false,
+        "multi": false,
+        "name": "",
+        "options": [],
+        "pluginId": "",
+        "refresh": "never",
+        "regex": "",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`DatasourceVariableKind` consists of:
+
+- kind: "DatasourceVariable"
+- spec: [DatasourceVariableSpec](#datasourcevariablespec)
+
+### `DatasourceVariableSpec`
+
+The following table explains the usage of the data source variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                    |
+| pluginId     | string                                                                                                                           |
+| refresh      | `VariableRefresh`. Options are `never`, `onDashboardLoad`, and `onTimeChanged`.                                                  |
+| regex        | string                                                                                                                           |
+| current      | `Text` and a `value` or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| options      | `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`.                         |
+| multi        | bool. Default is `false`.                                                                                                        |
+| includeAll   | bool. Default is `false`.                                                                                                        |
+| allValue?    | string                                                                                                                           |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`.                                                                                                        |
+| description? | string                                                                                                                           |
+
+## `IntervalVariableKind`
+
+Following is the JSON for a default interval variable:
+
+```json
+  "variables": [
+    {
+      "kind": "IntervalVariable",
+      "spec": {
+        "auto": false,
+        "auto_count": 0,
+        "auto_min": "",
+        "current": {
+          "text": "",
+          "value": ""
+        },
+        "hide": "dontHide",
+        "name": "",
+        "options": [],
+        "query": "",
+        "refresh": "never",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`IntervalVariableKind` consists of:
+
+- kind: "IntervalVariable"
+- spec: [IntervalVariableSpec](#intervalvariablespec)
+
+### `IntervalVariableSpec`
+
+The following table explains the usage of the interval variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                    |
+| query        | string                                                                                                                           |
+| current      | `Text` and a `value` or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| options      | `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`.                         |
+| auto         | bool. Default is `false`.                                                                                                        |
+| auto_count   | integer. Default is `0`.                                                                                                         |
+| refresh      | `VariableRefresh`. Options are `never`, `onDashboardLoad`, and `onTimeChanged`.                                                  |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`                                                                                                         |
+| description? | string                                                                                                                           |
+
+## `CustomVariableKind`
+
+Following is the JSON for a default custom variable:
+
+```json
+  "variables": [
+    {
+      "kind": "CustomVariable",
+      "spec": {
+        "current": defaultVariableOption(),
+        "hide": "dontHide",
+        "includeAll": false,
+        "multi": false,
+        "name": "",
+        "options": [],
+        "query": "",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`CustomVariableKind` consists of:
+
+- kind: "CustomVariable"
+- spec: [CustomVariableSpec](#customvariablespec)
+
+### `CustomVariableSpec`
+
+The following table explains the usage of the custom variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                    |
+| query        | string                                                                                                                           |
+| current      | `Text` and a `value` or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| options      | `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`.                         |
+| multi        | bool. Default is `false`.                                                                                                        |
+| includeAll   | bool. Default is `false`.                                                                                                        |
+| allValue?    | string                                                                                                                           |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`.                                                                                                        |
+| description? | string                                                                                                                           |
+
+## `SwitchVariableKind`
+
+Following is the JSON for a default switch variable:
+
+```json
+  "variables": [
+    {
+      "kind": "SwitchVariable",
+      "spec": {
+        "current": "false",
+        "enabledValue": "true",
+        "disabledValue": "false",
+        "hide": "dontHide",
+        "name": "",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`SwitchVariableKind` consists of:
+
+- kind: "SwitchVariable"
+- spec: [SwitchVariableSpec](#switchvariablespec)
+
+### `SwitchVariableSpec`
+
+The following table explains the usage of the switch variable JSON fields:
+
+<!-- prettier-ignore-start -->
+
+| Name           | Usage                                                                                                                            |
+| -------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| name           | string. Name of the variable.                                                                                                    |
+| current        | string. Current value of the switch variable (either `enabledValue` or `disabledValue`).                                            |
+| enabledValue   | string. Value when the switch is in the enabled state.                                                                       |
+| disabledValue  | string. Value when the switch is in the disabled state.                                                                     |
+| label?         | string                                                                                                                           |
+| hide           | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync    | bool. Default is `false`.                                                                                                        |
+| description?   | string                                                                                                                           |
+
+<!-- prettier-ignore-end -->
+
+## `GroupByVariableKind`
+
+Following is the JSON for a default group by variable:
+
+```json
+  "variables": [
+    {
+      "kind": "GroupByVariable",
+      "spec": {
+        "current": {
+          "text": [
+            ""
+          ],
+          "value": [
+            ""
+          ]
+        },
+        "datasource": {},
+        "hide": "dontHide",
+        "multi": false,
+        "name": "",
+        "options": [],
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`GroupByVariableKind` consists of:
+
+- kind: "GroupByVariable"
+- spec: [GroupByVariableSpec](#groupbyvariablespec)
+
+### `GroupByVariableSpec`
+
+The following table explains the usage of the group by variable JSON fields:
+
+| Name         | Usage                                                                                                                            |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable                                                                                                     |
+| datasource?  | `DataSourceRef`. Refer to the [`DataSourceRef` definition](#datasourceref) under `QueryVariableKind`.                            |
+| current      | `Text` and a `value` or `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`. |
+| options      | `VariableOption`. Refer to the [`VariableOption` definition](#variableoption) under `QueryVariableKind`.                         |
+| multi        | bool. Default is `false`.                                                                                                        |
+| label?       | string                                                                                                                           |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                        |
+| skipUrlSync  | bool. Default is `false`.                                                                                                        |
+| description? | string.                                                                                                                          |
+
+## `AdhocVariableKind`
+
+Following is the JSON for a default ad hoc variable:
+
+```json
+  "variables": [
+    {
+      "kind": "AdhocVariable",
+      "spec": {
+        "baseFilters": [],
+        "defaultKeys": [],
+        "filters": [],
+        "hide": "dontHide",
+        "name": "",
+        "skipUrlSync": false
+      }
+    }
+  ]
+```
+
+`AdhocVariableKind` consists of:
+
+- kind: "AdhocVariable"
+- spec: [AdhocVariableSpec](#adhocvariablespec)
+
+### `AdhocVariableSpec`
+
+The following table explains the usage of the ad hoc variable JSON fields:
+
+| Name         | Usage                                                                                                                                        |
+| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| name         | string. Name of the variable.                                                                                                                |
+| datasource?  | `DataSourceRef`. Consists of:<ul><li>type? - string. The plugin type-id.</li><li>uid? - string. The specific data source instance.</li></ul> |
+| baseFilters  | [AdHocFilterWithLabels](#adhocfilterswithlabels)                                                                                             |
+| filters      | [AdHocFilterWithLabels](#adhocfilterswithlabels)                                                                                             |
+| defaultKeys  | [MetricFindValue](#metricfindvalue)                                                                                                          |
+| label?       | string                                                                                                                                       |
+| hide         | `VariableHide`. Options are: `dontHide`, `hideLabel`, and `hideVariable`.                                                                    |
+| skipUrlSync  | bool. Default is `false`.                                                                                                                    |
+| description? | string                                                                                                                                       |
+
+#### `AdHocFiltersWithLabels`
+
+The following table explains the usage of the ad hoc variable with labels JSON fields:
+
+| Name         | Type          |
+| ------------ | ------------- |
+| key          | string        |
+| operator     | string        |
+| value        | string        |
+| values?      | `[...string]` |
+| keyLabel     | string        |
+| valueLabels? | `[...string]` |
+| forceEdit?   | bool          |
+
+#### `MetricFindValue`
+
+The following table explains the usage of the metric find value JSON fields:
+
+| Name        | Type             |
+| ----------- | ---------------- |
+| text        | string           |
+| value?      | string or number |
+| group?      | string           |
+| expandable? | bool             |

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

docs/sources/developer-resources/api-reference/http-api/dashboard_versions.md

@@ -171,3 +171,146 @@ Status Codes:
 
 **Example response (JSON diff)**:
 
+```http
+HTTP/1.1 200 OK
+Content-Type: text/html; charset=UTF-8
+
+```
+
+The response is a textual representation of the diff, with the dashboard values being in JSON, similar to the diffs seen on sites like GitHub or GitLab.
+
+Status Codes:
+
+- **200** - Ok
+- **400** - Bad request (invalid JSON sent)
+- **401** - Unauthorized
+- **404** - Not found
+
+**Example response (basic diff)**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: text/html; charset=UTF-8
+
+```
+
+The response here is a summary of the changes, derived from the diff between the two JSON objects.
+
+Status Codes:
+
+- **200** - OK
+- **400** - Bad request (invalid JSON sent)
+- **401** - Unauthorized
+- **404** - Not found
+{
+  "id": 70,
+  "slug": "my-dashboard",
+  "status": "success",
+  "uid": "QA7wKklGz",
+  "url": "/d/QA7wKklGz/my-dashboard",
+  "version": 3
+}
+```
+
+JSON response body schema:
+
+- **slug** - the URL friendly slug of the dashboard's title
+- **status** - whether the restoration was successful or not
+- **version** - the new dashboard version, following the restoration
+
+Status codes:
+
+- **200** - OK
+- **400** - Bad request (specified version has the same content as the current dashboard)
+- **401** - Unauthorized
+- **404** - Not found (dashboard not found or dashboard version not found)
+- **500** - Internal server error (indicates issue retrieving dashboard tags from database)
+
+**Example error response**
+
+```http
+HTTP/1.1 404 Not Found
+Content-Type: application/json; charset=UTF-8
+Content-Length: 46
+
+{
+  "message": "Dashboard version not found"
+}
+```
+
+JSON response body schema:
+
+- **message** - Message explaining the reason for the request failure.
+
+## Compare dashboard versions
+
+`POST /api/dashboards/calculate-diff`
+
+Compares two dashboard versions by calculating the JSON diff of them.
+
+**Example request**:
+
+```http
+POST /api/dashboards/calculate-diff HTTP/1.1
+Accept: text/html
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+{
+  "base": {
+    "dashboardId": 1,
+    "version": 1
+  },
+  "new": {
+    "dashboardId": 1,
+    "version": 2
+  },
+  "diffType": "json"
+}
+```
+
+JSON body schema:
+
+- **base** - an object representing the base dashboard version
+- **new** - an object representing the new dashboard version
+- **diffType** - the type of diff to return. Can be "json" or "basic".
+
+**Example response (JSON diff)**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: text/html; charset=UTF-8
+
+<p id="l1" class="diff-line diff-json-same">
+  <!-- Diff omitted -->
+</p>
+```
+
+The response is a textual representation of the diff, with the dashboard values being in JSON, similar to the diffs seen on sites like GitHub or GitLab.
+
+Status Codes:
+
+- **200** - Ok
+- **400** - Bad request (invalid JSON sent)
+- **401** - Unauthorized
+- **404** - Not found
+
+**Example response (basic diff)**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: text/html; charset=UTF-8
+
+<div class="diff-group">
+  <!-- Diff omitted -->
+</div>
+```
+
+The response here is a summary of the changes, derived from the diff between the two JSON objects.
+
+Status Codes:
+
+- **200** - OK
+- **400** - Bad request (invalid JSON sent)
+- **401** - Unauthorized
+- **404** - Not found

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)

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

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

docs/sources/visualizations/dashboards/build-dashboards/view-dashboard-json-model/index.md

@@ -3,75 +3,45 @@ aliases:
   - ../../../reference/dashboard/ # /docs/grafana/next/reference/dashboard/
   - ../../../dashboards/json-model/ # /docs/grafana/next/dashboards/json-model/
   - ../../../dashboards/build-dashboards/view-dashboard-json-model/ # /docs/grafana/next/dashboards/build-dashboards/view-dashboard-json-model/
-  - ../../../as-code/observability-as-code/schema-v2/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/
-  - ../../../as-code/observability-as-code/schema-v2/annotations-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/annotations-schema/
-  - ../../../as-code/observability-as-code/schema-v2/panel-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/panel-schema/
-  - ../../../as-code/observability-as-code/schema-v2/librarypanel-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/librarypanel-schema/
-  - ../../../as-code/observability-as-code/schema-v2/layout-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/layout-schema/
-  - ../../../as-code/observability-as-code/schema-v2/links-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/links-schema/
-  - ../../../as-code/observability-as-code/schema-v2/timesettings-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/timesettings-schema/
-  - ../../../as-code/observability-as-code/schema-v2/variables-schema/ # /docs/grafana/latest/as-code/observability-as-code/schema-v2/variables-schema/
-  - ../../../observability-as-code/schema-v2/ # /docs/grafana/latest/observability-as-code/schema-v2/
-  - ../../../../next/observability-as-code/schema-v2/annotations-schema/ # /docs/grafana/next/observability-as-code/schema-v2/annotations-schema/
-  - ../../../../next/observability-as-code/schema-v2/panel-schema/ # /docs/grafana/next/observability-as-code/schema-v2/panel-schema/
-  - ../../../../next/observability-as-code/schema-v2/librarypanel-schema/ # /docs/grafana/next/observability-as-code/schema-v2/librarypanel-schema/
-  - ../../../../next/observability-as-code/schema-v2/layout-schema/ # /docs/grafana/next/observability-as-code/schema-v2/layout-schema/
-  - ../../../../next/observability-as-code/schema-v2/links-schema/ # /docs/grafana/next/observability-as-code/schema-v2/links-schema/
-  - ../../../../next/observability-as-code/schema-v2/timesettings-schema/ # /docs/grafana/next/observability-as-code/schema-v2/timesettings-schema/
-  - ../../../../next/observability-as-code/schema-v2/variables-schema/ # /docs/grafana/next/observability-as-code/schema-v2/variables-schema/
 keywords:
   - grafana
   - dashboard
   - documentation
   - json
   - model
-  - schema v2
-  - v1 resource
-  - v2 resource
-  - classic
 labels:
   products:
     - cloud
     - enterprise
     - oss
 title: JSON model
-description: View and update your Grafana dashboard JSON object
+description: View your Grafana dashboard JSON object
 weight: 700
+refs:
+  annotations:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/annotate-visualizations/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/annotate-visualizations/
 ---
 
 # Dashboard JSON model
 
-Grafana dashboards are represented as JSON objects that store metadata, panels, variables, and settings.
+A dashboard in Grafana is represented by a JSON object, which stores metadata of its dashboard. Dashboard metadata includes dashboard properties, metadata from panels, template variables, panel queries, etc.
 
-## Different dashboard schema models
-
-There are currently three dashboard JSON schema models:
-
-- [Classic](#classic-model) - A non-Kubernetes resource used before the adoption of the Kubernetes API by Grafana in v12.2.0. It's been widely used for exporting, importing, and sharing dashboards in the Grafana dashboards collection at [grafana.com/dashboards](https://grafana.com/grafana/dashboards/).
-- [V1 Resource](#v1-resource-model) - The Classic dashboard schema formatted as a Kubernetes-style resource. Its `spec` property contains the Classic model of the schema. This is the default format for API communication after Grafana v12.2.0, which enabled the Kubernetes Platform API as default backend for Grafana dashboards. Dashboards created using the Classic model can be exported using either the Classic or the V1 Resource format.
-- [V2 Resource](#v2-resource-model) - The latest format, supporting new features such as advanced layouts and conditional rendering. It models all dashboard elements as Kubernetes kinds, following Kubernetes conventions for declaring dashboard components. This format is future-proof and represents the evolving standard for dashboards.
-
-{{< admonition type="note" >}}
-[Observability as Code](https://grafana.com/docs/grafana/latest/as-code/observability-as-code/) works with all versions of the JSON model, and it's fully compatible with version 2.
-{{< /admonition >}}
-
-## Access and update the JSON model (#view-json)
-
-To access the JSON representation of a dashboard:
+To view the JSON of a dashboard:
 
 1. Click **Edit** in the top-right corner of the dashboard.
-1. Click the gear icon in the right sidebar and click **Settings** in the secondary sidebar.
-1. Select the **JSON Model** tab.
-1. Update the JSON structure as needed.
-1. Click **Save changes**.
+1. Click **Settings**.
+1. Go to the **JSON Model** tab.
+1. When you've finished viewing the JSON, click **Back to dashboard** and **Exit edit**.
 
-## Classic model
+## JSON fields
 
-When you create a new dashboard in self-managed Grafana, a new dashboard JSON object was initialized with the following fields:
+When a user creates a new dashboard, a new dashboard JSON object is initialized with the following fields:
 
 {{< admonition type="note" >}}
-In the following JSON, id is shown as null which is the default value assigned to it until a dashboard is saved.
-After a dashboard is saved, an integer value is assigned to the `id` field.
+In the following JSON, id is shown as null which is the default value assigned to it until a dashboard is saved. Once a dashboard is saved, an integer value is assigned to the `id` field.
 {{< /admonition >}}
 
 ```json
@@ -106,30 +76,26 @@ After a dashboard is saved, an integer value is assigned to the `id` field.
 
 Each field in the dashboard JSON is explained below with its usage:
 
-<!--prettier-ignore-start -->
-
-| Name              | Usage                                                                                      |
-| ----------------- | ------------------------------------------------------------------------------------------ |
-| **id**            | unique numeric identifier for the dashboard. (generated by the db) |
-| **uid**           | unique dashboard identifier that can be generated by anyone. string (8-40) |
-| **title**         | current title of dashboard |
-| **tags**          | tags associated with dashboard, an array of strings |
-| **style**         | theme of dashboard, i.e. `dark` or `light` |
-| **timezone**      | timezone of dashboard, i.e. `utc` or `browser` |
-| **editable**      | whether a dashboard is editable or not |
+| Name              | Usage                                                                                                             |
+| ----------------- | ----------------------------------------------------------------------------------------------------------------- |
+| **id**            | unique numeric identifier for the dashboard. (generated by the db)                                                |
+| **uid**           | unique dashboard identifier that can be generated by anyone. string (8-40)                                        |
+| **title**         | current title of dashboard                                                                                        |
+| **tags**          | tags associated with dashboard, an array of strings                                                               |
+| **style**         | theme of dashboard, i.e. `dark` or `light`                                                                        |
+| **timezone**      | timezone of dashboard, i.e. `utc` or `browser`                                                                    |
+| **editable**      | whether a dashboard is editable or not                                                                            |
 | **graphTooltip**  | 0 for no shared crosshair or tooltip (default), 1 for shared crosshair, 2 for shared crosshair AND shared tooltip |
-| **time**          | time range for dashboard, i.e. last 6 hours, last 7 days, etc |
-| **timepicker**    | timepicker metadata, see [timepicker section](#timepicker) for details |
-| **templating**    | templating metadata, see [templating section](#templating) for details |
-| **annotations**   | annotations metadata, see [annotations](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/annotate-visualizations/) for how to add them |
-| **refresh**       | auto-refresh interval|
-| **schemaVersion** | version of the JSON schema (integer), incremented each time a Grafana update brings changes to said schema |
-| **version**       | version of the dashboard (integer), incremented each time the dashboard is updated |
-| **panels**        | panels array, see below for detail. |
+| **time**          | time range for dashboard, i.e. last 6 hours, last 7 days, etc                                                     |
+| **timepicker**    | timepicker metadata, see [timepicker section](#timepicker) for details                                            |
+| **templating**    | templating metadata, see [templating section](#templating) for details                                            |
+| **annotations**   | annotations metadata, see [annotations](ref:annotations) for how to add them                                      |
+| **refresh**       | auto-refresh interval                                                                                             |
+| **schemaVersion** | version of the JSON schema (integer), incremented each time a Grafana update brings changes to said schema        |
+| **version**       | version of the dashboard (integer), incremented each time the dashboard is updated                                |
+| **panels**        | panels array, see below for detail.                                                                               |
 
-<!--prettier-ignore-end -->
-
-### Panels
+## Panels
 
 Panels are the building blocks of a dashboard. It consists of data source queries, type of graphs, aliases, etc. Panel JSON consists of an array of JSON objects, each representing a different panel. Most of the fields are common for all panels but some fields depend on the panel type. Following is an example of panel JSON of a text panel.
 
@@ -202,22 +168,18 @@ The grid has a negative gravity that moves panels up if there is empty space abo
 
 Usage of the fields is explained below:
 
-<!--prettier-ignore-start -->
-
-| Name                  | Usage                                                     |
-| --------------------- | --------------------------------------------------------- |
-| **collapse**          | whether timepicker is collapsed or not                    |
-| **enable**            | whether timepicker is enabled or not                      |
-| **notice**            |                                                           |
-| **now**               |                                                           |
-| **hidden**            | whether timepicker is hidden or not                       |
-| **nowDelay**          | override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.                                                   |
-| **quick_ranges**      | custom quick ranges                                       |
-| **refresh_intervals** | interval options available in the refresh picker dropdown |
-| **status**            |                                                           |
-| **type**              |                                                           |
-
-<!--prettier-ignore-end -->
+| Name                  | Usage                                                                                                                                 |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
+| **collapse**          | whether timepicker is collapsed or not                                                                                                |
+| **enable**            | whether timepicker is enabled or not                                                                                                  |
+| **notice**            |                                                                                                                                       |
+| **now**               |                                                                                                                                       |
+| **hidden**            | whether timepicker is hidden or not                                                                                                   |
+| **nowDelay**          | override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values. |
+| **quick_ranges**      | custom quick ranges                                                                                                                   |
+| **refresh_intervals** | interval options available in the refresh picker dropdown                                                                             |
+| **status**            |                                                                                                                                       |
+| **type**              |                                                                                                                                       |
 
 ### templating
 
@@ -308,82 +270,3 @@ Usage of the above mentioned fields in the templating section is explained below
 | **refresh**     | configures when to refresh a variable                                                                   |
 | **regex**       | extracts part of a series name or metric node segment                                                   |
 | **type**        | type of variable, i.e. `custom`, `query` or `interval`                                                  |
-
-## V1 Resource model
-
-The V1 Resource schema model formats the [Classic JSON model](#classic-model) schema as a Kubernetes-style resource.
-The `spec` property of the schema contains the Classic-style model of the schema.
-
-Dashboards created using the Classic model can be exported using either this model or the Classic one.
-
-The following code snippet shows the fields included in the V1 Resource model.
-
-```json
-{
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "isnt5ss",
-    "namespace": "stacks-521104",
-    "uid": "92674c0e-0360-4bb4-99ab-fb150581376d",
-    "resourceVersion": "1764705030717045",
-    "generation": 1,
-    "creationTimestamp": "2025-12-02T19:50:30Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "1329"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:u000000002",
-      "grafana.app/folder": "",
-      "grafana.app/saved-from-ui": "Grafana Cloud (instant)"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 1329,
-    "links": [],
-    "panels": [],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "Africa/Abidjan",
-    "title": "Graphite suggestions",
-    "uid": "isnt5ss",
-    "version": 1,
-    "weekStart": ""
-  },
-  "status": {}
-}
-```
-
-## V2 Resource model
-
-{{< docs/public-preview product="Dashboard JSON schema v2" >}}
-
-For the detailed V2 Resource model schema, refer to the [Swagger documentation](https://play.grafana.org/swagger?api=dashboard.grafana.app-v2beta1).

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

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

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

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

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=

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=

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

package.json

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

packages/grafana-api-clients/src/clients/rtkq/legacy/endpoints.gen.ts

@@ -727,6 +727,17 @@ const injectedRtkApi = api
         }),
         invalidatesTags: ['dashboards', 'permissions'],
       }),
+      restoreDashboardVersionByUid: build.mutation<
+        RestoreDashboardVersionByUidApiResponse,
+        RestoreDashboardVersionByUidApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/dashboards/uid/${queryArg.uid}/restore`,
+          method: 'POST',
+          body: queryArg.restoreDashboardVersionCommand,
+        }),
+        invalidatesTags: ['dashboards', 'versions'],
+      }),
       getDashboardVersionsByUid: build.query<GetDashboardVersionsByUidApiResponse, GetDashboardVersionsByUidApiArg>({
         query: (queryArg) => ({
           url: `/dashboards/uid/${queryArg.uid}/versions`,
@@ -2617,6 +2628,26 @@ export type UpdateDashboardPermissionsByUidApiArg = {
   uid: string;
   updateDashboardAclCommand: UpdateDashboardAclCommand;
 };
+export type RestoreDashboardVersionByUidApiResponse = /** status 200 (empty) */ {
+  /** FolderUID The unique identifier (uid) of the folder the dashboard belongs to. */
+  folderUid?: string;
+  /** ID The unique identifier (id) of the created/updated dashboard. */
+  id: number;
+  /** Status status of the response. */
+  status: string;
+  /** Slug The slug of the dashboard. */
+  title: string;
+  /** UID The unique identifier (uid) of the created/updated dashboard. */
+  uid: string;
+  /** URL The relative URL for accessing the created/updated dashboard. */
+  url: string;
+  /** Version The version of the dashboard. */
+  version: number;
+};
+export type RestoreDashboardVersionByUidApiArg = {
+  uid: string;
+  restoreDashboardVersionCommand: RestoreDashboardVersionCommand;
+};
 export type GetDashboardVersionsByUidApiResponse = /** status 200 (empty) */ DashboardVersionResponseMeta;
 export type GetDashboardVersionsByUidApiArg = {
   uid: string;
@@ -4537,6 +4568,9 @@ export type DashboardAclUpdateItem = {
 export type UpdateDashboardAclCommand = {
   items?: DashboardAclUpdateItem[];
 };
+export type RestoreDashboardVersionCommand = {
+  version?: number;
+};
 export type DashboardVersionMeta = {
   created?: string;
   createdBy?: string;
@@ -6599,6 +6633,7 @@ export const {
   useGetDashboardPermissionsListByUidQuery,
   useLazyGetDashboardPermissionsListByUidQuery,
   useUpdateDashboardPermissionsByUidMutation,
+  useRestoreDashboardVersionByUidMutation,
   useGetDashboardVersionsByUidQuery,
   useLazyGetDashboardVersionsByUidQuery,
   useGetDashboardVersionByUidQuery,

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

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

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

packages/grafana-data/src/index.ts

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

packages/grafana-data/src/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';
 

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

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
+  )
+);

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

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

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

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

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

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

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

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

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

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

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

packages/grafana-data/src/unstable.ts

@@ -9,4 +9,4 @@
  * and be subject to the standard policies
  */
 
-export {};
+export { default as themeJsonSchema } from './themes/schema.generated.json';

packages/grafana-data/tsconfig.json

@@ -8,8 +8,7 @@
     "emitDeclarationOnly": true,
     "isolatedModules": true,
     "rootDirs": ["."],
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true
+    "moduleResolution": "bundler"
   },
   "exclude": ["dist/**/*"],
   "include": [

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

packages/grafana-schema/src/raw/composable/newgauge/panelcfg/x/NewGaugePanelCfg_types.gen.ts

@@ -29,14 +29,11 @@ export interface Options extends common.SingleStatBaseOptions {
   barWidthFactor: number;
   effects: GaugePanelEffects;
   endpointMarker?: ('point' | 'glow' | 'none');
-  minVizHeight: number;
-  minVizWidth: number;
   segmentCount: number;
   segmentSpacing: number;
   shape: ('circle' | 'gauge');
   showThresholdLabels: boolean;
   showThresholdMarkers: boolean;
-  sizing: common.BarGaugeSizing;
   sparkline?: boolean;
   textMode?: ('auto' | 'value_and_name' | 'value' | 'name' | 'none');
 }
@@ -46,14 +43,11 @@ export const defaultOptions: Partial<Options> = {
   barWidthFactor: 0.5,
   effects: {},
   endpointMarker: 'point',
-  minVizHeight: 75,
-  minVizWidth: 75,
   segmentCount: 1,
   segmentSpacing: 0.3,
   shape: 'gauge',
   showThresholdLabels: false,
   showThresholdMarkers: true,
-  sizing: common.BarGaugeSizing.Auto,
   sparkline: true,
   textMode: 'auto',
 };

pkg/api/dashboard.go

@@ -795,10 +795,6 @@ func (hs *HTTPServer) GetDashboardVersion(c *contextmodel.ReqContext) response.R
 // swagger:route POST /dashboards/uid/{uid}/restore dashboards versions restoreDashboardVersionByUID
 //
 // Restore a dashboard to a given dashboard version using UID.
-// This API will be removed when /apis/dashboards.grafana.app/v1 is released.
-// You can restore a dashboard by reading it from history, then creating it again.
-//
-// Deprecated: true
 //
 // Responses:
 // 200: postDashboardResponse

pkg/registry/apis/datasource/converter.go

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

pkg/registry/apis/datasource/legacy_store.go

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

pkg/registry/apis/datasource/register.go

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

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

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

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

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

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

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

pkg/services/featuremgmt/registry.go

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

pkg/services/featuremgmt/toggles_gen.csv

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

pkg/services/featuremgmt/toggles_gen.go

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

pkg/services/featuremgmt/toggles_gen.json

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

pkg/services/frontend/frontend_service_test.go

@@ -187,112 +187,6 @@ func TestFrontendService_Middleware(t *testing.T) {
 	})
 }
 
-func TestFrontendService_LoginErrorCookie(t *testing.T) {
-	publicDir := setupTestWebAssets(t)
-	cfg := &setting.Cfg{
-		HTTPPort:               "3000",
-		StaticRootPath:         publicDir,
-		BuildVersion:           "10.3.0",
-		OAuthLoginErrorMessage: "oauth.login.error",
-		CookieSecure:           false,
-		CookieSameSiteDisabled: false,
-		CookieSameSiteMode:     http.SameSiteLaxMode,
-	}
-
-	t.Run("should detect login_error cookie and set generic error message", func(t *testing.T) {
-		service := createTestService(t, cfg)
-
-		mux := web.New()
-		service.addMiddlewares(mux)
-		service.registerRoutes(mux)
-
-		req := httptest.NewRequest("GET", "/", nil)
-		// Set the login_error cookie (with some encrypted-looking value)
-		req.AddCookie(&http.Cookie{
-			Name:  "login_error",
-			Value: "abc123encryptedvalue",
-		})
-		recorder := httptest.NewRecorder()
-
-		mux.ServeHTTP(recorder, req)
-
-		assert.Equal(t, 200, recorder.Code)
-		body := recorder.Body.String()
-
-		// Check that the generic error message is in the response
-		assert.Contains(t, body, "loginError", "Should contain loginError when cookie is present")
-		assert.Contains(t, body, "oauth.login.error", "Should contain the generic OAuth error message")
-
-		// Check that the cookie was deleted (MaxAge=-1)
-		cookies := recorder.Result().Cookies()
-		var foundDeletedCookie bool
-		for _, cookie := range cookies {
-			if cookie.Name == "login_error" {
-				assert.Equal(t, -1, cookie.MaxAge, "Cookie should be deleted (MaxAge=-1)")
-				assert.Equal(t, "", cookie.Value, "Cookie value should be empty")
-				foundDeletedCookie = true
-				break
-			}
-		}
-		assert.True(t, foundDeletedCookie, "Should have set a cookie deletion header")
-	})
-
-	t.Run("should not set error when login_error cookie is absent", func(t *testing.T) {
-		service := createTestService(t, cfg)
-
-		mux := web.New()
-		service.addMiddlewares(mux)
-		service.registerRoutes(mux)
-
-		req := httptest.NewRequest("GET", "/", nil)
-		// No login_error cookie
-		recorder := httptest.NewRecorder()
-
-		mux.ServeHTTP(recorder, req)
-
-		assert.Equal(t, 200, recorder.Code)
-		body := recorder.Body.String()
-
-		// The page should render but without the login error
-		assert.Contains(t, body, "window.grafanaBootData")
-		// Check that loginError is not set (or is empty/omitted in JSON)
-		// Since it's omitempty, it shouldn't appear at all
-		assert.NotContains(t, body, "loginError", "Should not contain loginError when cookie is absent")
-	})
-
-	t.Run("should handle custom OAuth error message from config", func(t *testing.T) {
-		customCfg := &setting.Cfg{
-			HTTPPort:               "3000",
-			StaticRootPath:         publicDir,
-			BuildVersion:           "10.3.0",
-			OAuthLoginErrorMessage: "Oh no a boo-boo happened!",
-			CookieSecure:           false,
-			CookieSameSiteDisabled: false,
-			CookieSameSiteMode:     http.SameSiteLaxMode,
-		}
-		service := createTestService(t, customCfg)
-
-		mux := web.New()
-		service.addMiddlewares(mux)
-		service.registerRoutes(mux)
-
-		req := httptest.NewRequest("GET", "/", nil)
-		req.AddCookie(&http.Cookie{
-			Name:  "login_error",
-			Value: "abc123encryptedvalue",
-		})
-		recorder := httptest.NewRecorder()
-
-		mux.ServeHTTP(recorder, req)
-
-		assert.Equal(t, 200, recorder.Code)
-		body := recorder.Body.String()
-
-		// Check that the custom error message is used
-		assert.Contains(t, body, "Oh no a boo-boo happened!", "Should use custom OAuth error message from config")
-	})
-}
-
 func TestFrontendService_IndexHooks(t *testing.T) {
 	publicDir := setupTestWebAssets(t)
 	cfg := &setting.Cfg{

pkg/services/frontend/frontend_settings.go

@@ -47,6 +47,4 @@ type FSFrontendSettings struct {
 	CSPReportOnlyEnabled             bool              `json:"cspReportOnlyEnabled,omitempty"`
 	Http2Enabled                     bool              `json:"http2Enabled,omitempty"`
 	ReportingStaticContext           map[string]string `json:"reportingStaticContext,omitempty"`
-
-	LoginError string `json:"loginError,omitempty"`
 }

pkg/services/frontend/index.go

@@ -148,30 +148,6 @@ func (p *IndexProvider) HandleRequest(writer http.ResponseWriter, request *http.
 	data.Nonce = nonce
 	data.PublicDashboardAccessToken = reqCtx.PublicDashboardAccessToken
 
-	// TODO -- reevaluate with mt authnz
-	// Check for login_error cookie and set a generic error message.
-	// The backend sets an encrypted cookie on oauth login failures that we can't read
-	// so we just show a generic error if the cookie is present.
-	if cookie, err := request.Cookie("login_error"); err == nil && cookie.Value != "" {
-		p.log.Info("request has login_error cookie")
-		// Defaults to a translation key that the frontend will resolve to a localized message
-		data.Settings.LoginError = p.data.Config.OAuthLoginErrorMessage
-
-		cookiePath := "/"
-		if p.data.AppSubUrl != "" {
-			cookiePath = p.data.AppSubUrl
-		}
-		http.SetCookie(writer, &http.Cookie{
-			Name:     "login_error",
-			Value:    "",
-			Path:     cookiePath,
-			MaxAge:   -1,
-			HttpOnly: true,
-			Secure:   p.data.Config.CookieSecure,
-			SameSite: p.data.Config.CookieSameSiteMode,
-		})
-	}
-
 	if data.CSPEnabled {
 		data.CSPContent = middleware.ReplacePolicyVariables(p.data.CSPContent, p.data.AppSubUrl, data.Nonce)
 		writer.Header().Set("Content-Security-Policy", data.CSPContent)

pkg/services/navtree/navtreeimpl/admin.go

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

pkg/services/ngalert/ngalert.go

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

pkg/services/ngalert/notifier/alertmanager.go

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

pkg/services/ngalert/notifier/dispatch_timer.go

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

pkg/services/ngalert/notifier/dispatch_timer_test.go

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

pkg/services/ngalert/notifier/file_store.go

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

pkg/services/ngalert/notifier/file_store_test.go

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

pkg/services/ngalert/notifier/multiorg_alertmanager.go

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

pkg/services/ngalert/notifier/state.go

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

pkg/services/ngalert/notifier/testing.go

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

pkg/services/ngalert/remote/alertmanager.go

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

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

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

pkg/services/updatemanager/plugins.go

@@ -13,8 +13,6 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
 	"github.com/open-feature/go-sdk/openfeature"
 	"go.opentelemetry.io/otel/codes"
 
@@ -49,7 +47,6 @@ type PluginsService struct {
 	updateStrategy  string
 
 	features featuremgmt.FeatureToggles
-	cfg      *setting.Cfg
 }
 
 func ProvidePluginsService(cfg *setting.Cfg,
@@ -92,7 +89,6 @@ func ProvidePluginsService(cfg *setting.Cfg,
 		features:         features,
 		updateChecker:    updateChecker,
 		updateStrategy:   cfg.PluginUpdateStrategy,
-		cfg:              cfg,
 	}, nil
 }
 
@@ -140,7 +136,7 @@ func (s *PluginsService) HasUpdate(ctx context.Context, pluginID string) (string
 // checkAndUpdate checks for updates and applies them if auto-update is enabled.
 func (s *PluginsService) checkAndUpdate(ctx context.Context) {
 	s.instrumentedCheckForUpdates(ctx)
-	if s.checkFlagPluginsAutoUpdate(ctx) {
+	if openfeature.NewDefaultClient().Boolean(ctx, featuremgmt.FlagPluginsAutoUpdate, false, openfeature.TransactionContext(ctx)) {
 		s.updateAll(ctx)
 	}
 }
@@ -222,17 +218,6 @@ func (s *PluginsService) checkForUpdates(ctx context.Context) error {
 	return nil
 }
 
-func (s *PluginsService) checkFlagPluginsAutoUpdate(ctx context.Context) bool {
-	ns := request.GetNamespaceMapper(s.cfg)(1)
-	ctx = identity.WithServiceIdentityForSingleNamespaceContext(ctx, ns)
-	flag, err := openfeature.NewDefaultClient().BooleanValueDetails(ctx, featuremgmt.FlagPluginsAutoUpdate, false, openfeature.TransactionContext(ctx))
-	if err != nil {
-		s.log.Error("flag evaluation error", "flag", featuremgmt.FlagPluginsAutoUpdate, "error", err)
-	}
-
-	return flag.Value
-}
-
 func (s *PluginsService) canUpdate(ctx context.Context, plugin pluginstore.Plugin, gcomVersion string) bool {
 	if !s.updateChecker.IsUpdatable(ctx, plugin) {
 		return false
@@ -242,7 +227,7 @@ func (s *PluginsService) canUpdate(ctx context.Context, plugin pluginstore.Plugi
 		return false
 	}
 
-	if s.checkFlagPluginsAutoUpdate(ctx) {
+	if openfeature.NewDefaultClient().Boolean(ctx, featuremgmt.FlagPluginsAutoUpdate, false, openfeature.TransactionContext(ctx)) {
 		return s.updateChecker.CanUpdate(plugin.ID, plugin.Info.Version, gcomVersion, s.updateStrategy == setting.PluginUpdateStrategyMinor)
 	}
 

pkg/setting/setting.go

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

pkg/setting/setting_unified_storage.go

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

pkg/storage/legacysql/dualwrite/context.go

@@ -0,0 +1,35 @@
+package dualwrite
+
+import (
+	"context"
+
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+type ctxKey struct{}
+
+type dualWriteContext struct {
+	updatedSecureValues common.InlineSecureValues
+}
+
+func addToContext(ctx context.Context) context.Context {
+	return context.WithValue(ctx, ctxKey{}, &dualWriteContext{})
+}
+
+// Get the Requester from context
+func SetUpdatedSecureValues(ctx context.Context, sv common.InlineSecureValues) {
+	u, ok := ctx.Value(ctxKey{}).(*dualWriteContext)
+	if !ok || u == nil {
+		return // OK, this can happen when things are in mode 0 (legacy only)
+	}
+	u.updatedSecureValues = sv
+}
+
+// Get the Requester from context
+func getUpdatedSecureValues(ctx context.Context) common.InlineSecureValues {
+	u, ok := ctx.Value(ctxKey{}).(*dualWriteContext)
+	if !ok || u == nil {
+		return nil
+	}
+	return u.updatedSecureValues
+}

pkg/storage/legacysql/dualwrite/dualwriter.go

@@ -16,14 +16,15 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/grafana/grafana-app-sdk/logging"
-
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
 )
 
 var (
-	_      grafanarest.Storage = (*dualWriter)(nil)
-	tracer                     = otel.Tracer("github.com/grafana/grafana/pkg/storage/legacysql/dualwrite")
+	_ grafanarest.Storage = (*dualWriter)(nil)
+
+	tracer = otel.Tracer("github.com/grafana/grafana/pkg/storage/legacysql/dualwrite")
 )
 
 const (
@@ -203,7 +204,7 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
 
 	log := logging.FromContext(ctx).With("method", "Create")
 
-	accIn, err := meta.Accessor(in)
+	accIn, err := utils.MetaAccessor(in)
 	if err != nil {
 		return nil, err
 	}
@@ -216,19 +217,19 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
 		return nil, fmt.Errorf("name or generatename have to be set")
 	}
 
+	secure, err := accIn.GetSecureValues()
+	if err != nil {
+		return nil, fmt.Errorf("unable to read secure values %w", err)
+	}
+
 	readFromUnifiedWriteToBothStorages := d.readUnified && d.legacy != nil && d.unified != nil
 
 	permissions := ""
 	if readFromUnifiedWriteToBothStorages {
-		objIn, err := utils.MetaAccessor(in)
-		if err != nil {
-			return nil, err
-		}
-
 		// keep permissions, we will set it back after the object is created
-		permissions = objIn.GetAnnotation(utils.AnnoKeyGrantPermissions)
+		permissions = accIn.GetAnnotation(utils.AnnoKeyGrantPermissions)
 		if permissions != "" {
-			objIn.SetAnnotation(utils.AnnoKeyGrantPermissions, "") // remove the annotation for now
+			accIn.SetAnnotation(utils.AnnoKeyGrantPermissions, "") // remove the annotation for now
 		}
 	}
 
@@ -241,35 +242,36 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
 	}
 
 	createdCopy := createdFromLegacy.DeepCopyObject()
-	accCreated, err := meta.Accessor(createdCopy)
+	accCreated, err := utils.MetaAccessor(createdCopy)
 	if err != nil {
 		return nil, err
 	}
 	accCreated.SetResourceVersion("")
 	accCreated.SetUID("")
+	if secure != nil {
+		if err = accCreated.SetSecureValues(secure); err != nil {
+			return nil, fmt.Errorf("unable to set secure values on duplicate object %w", err)
+		}
+	}
 
 	if readFromUnifiedWriteToBothStorages {
-		objCopy, err := utils.MetaAccessor(createdCopy)
-		if err != nil {
-			return nil, err
-		}
 		// restore the permissions annotation, as we removed it before creating in legacy
 		if permissions != "" {
-			objCopy.SetAnnotation(utils.AnnoKeyGrantPermissions, permissions)
+			accCreated.SetAnnotation(utils.AnnoKeyGrantPermissions, permissions)
 		}
 
 		// Propagate annotations and labels to the object saved in
 		// unified storage, making sure the `deprecatedID` is saved
 		// as well as provisioning metadata, when present.
 		for name, val := range accIn.GetAnnotations() {
-			objCopy.SetAnnotation(name, val)
+			accCreated.SetAnnotation(name, val)
 		}
 
 		legacyAcc, err := meta.Accessor(createdFromLegacy)
 		if err != nil {
 			return nil, err
 		}
-		objCopy.SetLabels(legacyAcc.GetLabels())
+		accCreated.SetLabels(legacyAcc.GetLabels())
 	}
 
 	// If unified storage is the primary storage, let's just create it in the foreground and return it.
@@ -384,6 +386,7 @@ func (d *dualWriter) Update(ctx context.Context, name string, objInfo rest.Updat
 	// but legacy failed, the user would get a failure, but see the update did apply to the source
 	// of truth, and be less likely to retry to save (and get the stores in sync again)
 
+	ctx = addToContext(ctx)
 	legacyInfo := objInfo
 	legacyForceCreate := forceAllowCreate
 	unifiedInfo := objInfo
@@ -417,6 +420,14 @@ func (d *dualWriter) Update(ctx context.Context, name string, objInfo rest.Updat
 		}
 	}
 
+	// Propagate secure values from the update request to the unified storage update.
+	if secure := getUpdatedSecureValues(ctx); secure != nil {
+		wrapped, ok := unifiedInfo.(*wrappedUpdateInfo)
+		if ok {
+			wrapped.updatedSecureValues = secure
+		}
+	}
+
 	if d.readUnified {
 		return d.unified.Update(ctx, name, unifiedInfo, createValidation, updateValidation, unifiedForceCreate, options)
 	} else if d.errorIsOK {
@@ -515,9 +526,10 @@ func (d *dualWriter) ConvertToTable(ctx context.Context, object runtime.Object,
 }
 
 type wrappedUpdateInfo struct {
-	objInfo           rest.UpdatedObjectInfo
-	legacyLabels      map[string]string
-	legacyAnnotations map[string]string
+	objInfo             rest.UpdatedObjectInfo
+	legacyLabels        map[string]string
+	legacyAnnotations   map[string]string
+	updatedSecureValues common.InlineSecureValues
 }
 
 // Preconditions implements rest.UpdatedObjectInfo.
@@ -560,6 +572,13 @@ func (w *wrappedUpdateInfo) UpdatedObject(ctx context.Context, oldObj runtime.Ob
 
 	meta.SetResourceVersion("")
 	meta.SetUID("")
+
+	if w.updatedSecureValues != nil {
+		if err = meta.SetSecureValues(w.updatedSecureValues); err != nil {
+			return nil, fmt.Errorf("unable to set secure values on duplicate object %w", err)
+		}
+	}
+
 	return obj, err
 }
 

pkg/storage/unified/apistore/prepare.go

@@ -3,8 +3,10 @@ package apistore
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"time"
 
 	"github.com/dustin/go-humanize"
@@ -83,6 +85,9 @@ func (s *Storage) prepareObjectForStorage(ctx context.Context, newObject runtime
 	if !ok {
 		return v, errors.New("missing auth info")
 	}
+	if err := s.checkGVK(newObject); err != nil {
+		return v, err
+	}
 
 	obj, err := utils.MetaAccessor(newObject)
 	if err != nil {
@@ -138,8 +143,7 @@ func (s *Storage) prepareObjectForStorage(ctx context.Context, newObject runtime
 		return v, err
 	}
 
-	err = s.codec.Encode(newObject, &v.raw)
-	if err == nil {
+	if err = s.encode(newObject, &v.raw); err == nil {
 		err = s.handleLargeResources(ctx, obj, &v.raw)
 	}
 	return v, err
@@ -152,6 +156,9 @@ func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runti
 	if !ok {
 		return v, errors.New("missing auth info")
 	}
+	if err := s.checkGVK(updateObject); err != nil {
+		return v, err
+	}
 
 	obj, err := utils.MetaAccessor(updateObject)
 	if err != nil {
@@ -233,8 +240,7 @@ func (s *Storage) prepareObjectForUpdate(ctx context.Context, updateObject runti
 		obj.SetAnnotation(utils.AnnoKeyUpdatedTimestamp, previous.GetAnnotation(utils.AnnoKeyUpdatedTimestamp))
 	}
 
-	err = s.codec.Encode(updateObject, &v.raw)
-	if err == nil {
+	if err = s.encode(updateObject, &v.raw); err == nil {
 		err = s.handleLargeResources(ctx, obj, &v.raw)
 	}
 	return v, err
@@ -268,7 +274,51 @@ func (s *Storage) handleLargeResources(ctx context.Context, obj utils.GrafanaMet
 		}
 
 		// Now encode the smaller version
-		return s.codec.Encode(orig, buf)
+		return s.encode(orig, buf)
 	}
 	return nil
 }
+
+func (s *Storage) checkGVK(obj runtime.Object) error {
+	if s.opts.Scheme == nil {
+		return nil // we can not do anything
+	}
+
+	// Ensure group+version+kind are configured
+	info := obj.GetObjectKind()
+	gvk := info.GroupVersionKind()
+	if gvk.Group == "" || gvk.Kind == "" || gvk.Version == "" {
+		gvks, _, err := s.opts.Scheme.ObjectKinds(obj)
+		if err != nil {
+			return fmt.Errorf("unknown object kind %w", err)
+		}
+		for _, v := range gvks {
+			if v.Group != s.gr.Group {
+				continue // skip values not in this group
+			}
+			gvk.Group = v.Group
+			gvk.Kind = v.Kind
+			if gvk.Version == "" {
+				gvk.Version = v.Version
+			}
+			info.SetGroupVersionKind(gvk)
+			return nil
+		}
+	}
+	return nil
+}
+
+func (s *Storage) encode(obj runtime.Object, w io.Writer) error {
+	// The standard encoder is fine when only one type maps to a group
+	if s.opts.Scheme == nil {
+		return s.codec.Encode(obj, w)
+	}
+	if err := s.checkGVK(obj); err != nil {
+		return err
+	}
+
+	// This will always write the saved GVK, unlike:
+	// https://github.com/kubernetes/kubernetes/blob/v1.34.3/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go#L267
+	// that picks an arbitrary GVK that may not match the same group!
+	return json.NewEncoder(w).Encode(obj)
+}

pkg/storage/unified/apistore/prepare_test.go

@@ -33,9 +33,11 @@ func TestPrepareObjectForStorage(t *testing.T) {
 	node, err := snowflake.NewNode(rand.Int64N(1024))
 	require.NoError(t, err)
 	s := &Storage{
+		gr:        dashv1.DashboardResourceInfo.GroupResource(),
 		codec:     apitesting.TestCodec(rtcodecs, dashv1.DashboardResourceInfo.GroupVersion()),
 		snowflake: node,
 		opts: StorageOptions{
+			Scheme:              rtscheme,
 			EnableFolderSupport: true,
 			LargeObjectSupport:  nil,
 			MaximumNameLength:   100,

pkg/storage/unified/apistore/store.go

@@ -57,6 +57,8 @@ type DefaultPermissionSetter = func(ctx context.Context, key *resourcepb.Resourc
 
 // Optional settings that apply to a single resource
 type StorageOptions struct {
+	Scheme *runtime.Scheme
+
 	// ????: should we constrain this to only dashboards for now?
 	// Not yet clear if this is a good general solution, or just a stop-gap
 	LargeObjectSupport LargeObjectSupport

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 {

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"

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

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

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

pkg/storage/unified/search/bleve_integration_test.go

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

pkg/storage/unified/search/bleve_mappings.go

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

pkg/storage/unified/search/bleve_mappings_test.go

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

pkg/storage/unified/search/bleve_search_test.go

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

pkg/storage/unified/search/bleve_test.go

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

pkg/storage/unified/search/options.go

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