undo changes to query library cause i cba dealing with enterprise rn

* Alerting: Fix and stabilize saved searches E2E tests

Stabilizes the saved searches E2E tests by ensuring correct feature
toggles are enabled and improving the data cleanup logic.

Previously, `clearSavedSearches` relied on clearing localStorage, which
was insufficient as saved searches are persisted server-side via the
UserStorage API. The cleanup now correctly invokes the UserStorage API.

Changes:
- Add `alerting` project to Playwright configuration with authentication
- Enable `alertingListViewV2`, `alertingFilterV2`, and `alertingSavedSearches` toggles in tests
- Update `clearSavedSearches` helper to use UserStorage API for reliable cleanup
- Improve test selectors to use more robust `getByRole` and `getByText` queries
- Update `SavedSearchItem` to merge `aria-label` into `tooltip` for consistency

* Fix saved searchers unit tests

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

@@ -586,6 +586,7 @@
         },
         "id": -1,
         "panels": [],
+        "repeat": "custom_var_tab",
         "title": "Repeated Tab by \"$custom_var_tab\"",
         "type": "row"
       },
@@ -610,8 +611,11 @@
           "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,6 +586,7 @@
         },
         "id": -1,
         "panels": [],
+        "repeat": "custom_var_tab",
         "title": "Repeated Tab by \"$custom_var_tab\"",
         "type": "row"
       },
@@ -610,8 +611,11 @@
           "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,6 +439,11 @@ 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,
@@ -819,6 +824,21 @@ 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": "gauge"
+      "type": "radialbar"
     },
     {
       "datasource": {
@@ -2183,7 +2183,7 @@
         }
       ],
       "title": "Non-numeric",
-      "type": "gauge"
+      "type": "radialbar"
     }
   ],
   "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": "gauge"
+      "type": "radialbar"
     },
     {
       "datasource": {
@@ -2131,7 +2131,7 @@
         }
       ],
       "title": "Non-numeric",
-      "type": "gauge"
+      "type": "radialbar"
     }
   ],
   "preload": false,

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

@@ -25,10 +25,6 @@ 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/
@@ -68,7 +64,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>/observability-as-code/schema-v2/).
+- 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).
 
 ## Explore
 

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

@@ -1,243 +0,0 @@
----
-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

@@ -1,86 +0,0 @@
----
-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

@@ -1,339 +0,0 @@
----
-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

@@ -1,68 +0,0 @@
----
-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

@@ -1,67 +0,0 @@
----
-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

@@ -1,305 +0,0 @@
----
-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

@@ -1,87 +0,0 @@
----
-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

@@ -1,501 +0,0 @@
----
-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/developer-resources/api-reference/http-api/dashboard_versions.md

@@ -171,146 +171,3 @@ Status Codes:
 - **200** - Ok
 - **401** - Unauthorized
 - **404** - Dashboard version not found
-```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/visualizations/dashboards/assess-dashboard-usage/index.md

@@ -78,9 +78,9 @@ For every dashboard and data source, you can access usage information.
 
 ### Dashboard insights
 
-To see dashboard usage information, click the dashboard insights icon in the header.
+To see dashboard usage information, click the dashboard insights icon in the sidebar.
 
-![Dashboard insights icon](/media/docs/grafana/dashboards/screenshot-dashboard-insights-icon-11.2.png)
+{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-insights-v12.4.png" max-width="500px" alt="Dashboard insights icon" >}}
 
 Dashboard insights show the following information:
 

docs/sources/visualizations/dashboards/build-dashboards/create-dashboard/index.md

@@ -2,238 +2,423 @@
 aliases:
   - ../../../dashboards/build-dashboards/add-organize-panels/ # /docs/grafana/next/dashboards/build-dashboards/add-organize-panels/
   - ../../../dashboards/build-dashboards/create-dashboard/ # /docs/grafana/next/dashboards/build-dashboards/create-dashboard/
+  - ../../../dashboards/build-dashboards/create-dynamic-dashboard/ # /docs/grafana/latest/dashboards/build-dashboards/create-dynamic-dashboard/
+  - ./create-dynamic-dashboard/ # /docs/grafana/latest/visualizations/dashboards/build-dashboards/create-dynamic-dashboard/
 keywords:
   - panel
   - dashboard
   - create
+  - dynamic dashboard
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Create a dashboard
-title: Create a dashboard
+title: Create dashboards
 description: Create and edit a dashboard
 weight: 1
-refs:
-  built-in-special-data-sources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#special-data-sources
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/#special-data-sources
-  visualization-specific-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/visualizations/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/
-  configure-standard-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-standard-options/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options/
-  configure-value-mappings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-value-mappings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-value-mappings/
-  generative-ai-features:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-  configure-thresholds:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-thresholds/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-thresholds/
-  data-sources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/
-  add-a-data-source:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#add-a-data-source
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#add-a-data-source
-  about-users-and-permissions:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/
-  visualizations-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/visualizations/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/
-  configure-repeating-panels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-panel-options/#configure-repeating-panels
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-panel-options/#configure-repeating-panels
-  override-field-values:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-overrides/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides/
-  saved-queries:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/query-transform-data/#saved-queries
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/#saved-queries
-  save-query:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/query-transform-data/#save-a-query
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/#save-a-query
+image_maps:
+  - key: editpane-sidebar
+    src: /media/docs/grafana/dashboards/screenshot-edit-sidebar-v12.4.png
+    alt: An annotated image of the edit pane and sidebar
+    points:
+      - x_coord: 96
+        y_coord: 17
+        content: |
+          **Dashboard options**
+
+          Click the icon to open the edit pane. Edit mode only.
+      - x_coord: 96
+        y_coord: 25
+        content: |
+          **Feedback**
+
+          Submit feedback on the new editing experience. Edit mode only.
+      - x_coord: 96
+        y_coord: 33
+        content: |
+          **Export**
+
+          Click to display [export](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/share-dashboards-panels/#export-dashboards) options.
+      - x_coord: 96
+        y_coord: 41
+        content: |
+          **Content outline**
+
+          Navigate a dashboard using the [Content outline](#navigate-using-the-content-outline).
+      - x_coord: 96
+        y_coord: 49
+        content: |
+          **Dashboard insights**
+
+          View [dashboard analytics](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/assess-dashboard-usage/) including information about users, activity, and query counts.
 ---
 
-## Create a dashboard
+# Create dashboards
 
-Dashboards and panels allow you to show your data in visual form. Each panel needs at least one query to display a visualization.
+{{< admonition type="note">}}
+Dynamic dashboards is currently in public preview. Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+
+For information on the generally available dashboard creation experience, refer to the [documentation for the latest self-managed version of Grafana](https://grafana.com/docs/grafana/latest/visualizations/dashboards/build-dashboards/create-dashboard/).
+{{< /admonition >}}
+
+Dashboards and panels allow you to show your data in visual form.
+Each panel needs at least one query to display a visualization.
 
 **Before you begin:**
 
-- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions](ref:about-users-and-permissions).
-- Identify the dashboard to which you want to add the panel.
+- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/).
 - Understand the query language of the target data source.
-- Ensure that data source for which you are writing a query has been added. For more information about adding a data source, refer to [Add a data source](ref:add-a-data-source) if you need instructions.
+
+## Create a dashboard
 
 To create a dashboard, follow these steps:
 
-{{< shared id="create-dashboard" >}}
-
 1. Click **Dashboards** in the main menu.
 1. Click **New** and select **New Dashboard**.
-1. On the empty dashboard, click **+ Add visualization**.
-
-   ![Empty dashboard state](/media/docs/grafana/dashboards/empty-dashboard-10.2.png)
-
-{{< /shared >}}
-
+1. Click **+ Add visualization**.
 1. In the dialog box that opens, do one of the following:
    - Select one of your existing data sources.
-   - Select one of the Grafana [built-in special data sources](ref:built-in-special-data-sources).
+   - Select one of the Grafana [built-in special data sources](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/#special-data-sources).
    - Click **Configure a new data source** to set up a new one (Admins only).
 
    {{< figure class="float-right"  src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source modal" >}}
 
    The **Edit panel** view opens with your data source selected.
-   You can change the panel data source later using the drop-down in the **Queries** tab of the panel editor if needed.
+   You can change the panel data source later using the drop-down in the **Query** tab of the panel editor if needed.
 
-   For more information about data sources, refer to [Data sources](ref:data-sources) for specific guidelines.
+   For more information about data sources, refer to [Data sources](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/) for specific guidelines.
 
 1. To create a query, do one of the following:
    - Write or construct a query in the query language of your data source.
-   - Open the **Saved queries** drop-down menu and click **Replace query** to reuse a [saved query](ref:saved-queries).
+   - Open the **Saved queries** drop-down menu and click **Replace query** to reuse a [saved query](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/query-transform-data/#saved-queries).
 
-1. (Optional) To [save the query](ref:save-query) for reuse, open the **Saved queries** drop-down menu and click the **Save query** option.
-1. Click **Refresh** to query the data source.
-1. (Optional) To add subsequent queries, click **+ Add query** or **+ Add from saved queries**, and refresh the data source as many times as needed.
+1. (Optional) To [save the query](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/query-transform-data/#save-a-query) for reuse, open the **Saved queries** drop-down menu and click the **Save query** option.
 
    {{< admonition type="note" >}}
-   [Saved queries](ref:saved-queries) is currently in [public preview](https://grafana.com/docs/release-life-cycle/) in Grafana Enterprise and Grafana Cloud only.
+   [Saved queries](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/query-transform-data/#saved-queries) is currently in [public preview](https://grafana.com/docs/release-life-cycle/) in Grafana Enterprise and Grafana Cloud only.
    {{< /admonition >}}
 
+1. Click **Refresh** to query the data source.
 1. In the visualization list, select a visualization type.
 
-   ![Visualization selector](/media/docs/grafana/dashboards/screenshot-select-visualization-11-2.png)
+   {{< figure src="/media/docs/grafana/dashboards/screenshot-select-visualization-v12.png" max-width="350px" alt="Visualization selector" >}}
 
    Grafana displays a preview of your query results with the visualization applied.
 
-   For more information about individual visualizations, refer to [Visualizations options](ref:visualizations-options).
+   For more information about configuring individual visualizations, refer to [Visualizations options](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/visualizations/).
 
-1. Under **Panel options**, enter a title and description for your panel or have Grafana create them using [generative AI features](ref:generative-ai-features).
+1. Under **Panel options**, enter a title and description for the panel or have Grafana create them using [generative AI features](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards).
 1. Refer to the following documentation for ways you can adjust panel settings.
 
    While not required, most visualizations need some adjustment before they properly display the information that you need.
-   - [Configure value mappings](ref:configure-value-mappings)
-   - [Visualization-specific options](ref:visualization-specific-options)
-   - [Override field values](ref:override-field-values)
-   - [Configure thresholds](ref:configure-thresholds)
-   - [Configure standard options](ref:configure-standard-options)
+   - [Configure value mappings](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-value-mappings/)
+   - [Visualization-specific options](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/visualizations/)
+   - [Override field values](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-overrides/)
+   - [Configure thresholds](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-thresholds/)
+   - [Configure standard options](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/panels-visualizations/configure-standard-options/)
 
-1. When you've finished editing your panel, click **Save dashboard**.
-
-   Alternatively, click **Back to dashboard** if you want to see your changes applied to the dashboard first. Then click **Save dashboard** when you're ready.
-
-1. Enter a title and description for your dashboard or have Grafana create them using [generative AI features](ref:generative-ai-features).
+1. When you've finished editing the panel, click **Save**.
+1. Enter a title and description for the dashboard if you haven't already or have Grafana create them using [generative AI features](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards).
 1. Select a folder, if applicable.
+1. Click **Save**
+1. Click **Back to dashboard**.
+1. (Optional) Continue building the dashboard by clicking one or more of the following options:
+   - **+ Add panel**: Set panel options in the edit pane or click **Configure** to complete panel setup.
+   - **+ Add variable**: Follow the steps to [add a variable to the dashboard](#add-variables).
+   - **Group panels**: Choose from **Group into row** or **Group into tab**. For more information on groupings, refer to [Panel groupings](#panel-groupings).
+   - **Dashboard options** icon: Open the edit pane to access [panel layout options](#panel-layouts).
+
+1. When you've finished making changes, click **Save**.
+1. (Optional) Enter a description of the changes you've made.
 1. Click **Save**.
-1. To add more panels to the dashboard, click **Back to dashboard**.
-   Then click **Add** in the dashboard header and select **Visualization** in the drop-down.
+1. Click **Exit edit**.
 
-   ![Add drop-down](/media/docs/grafana/dashboards/screenshot-add-dropdown-11.2.png)
+## Dashboard edit
 
-   When you add additional panels to the dashboard, you're taken straight to the **Edit panel** view.
+Now that you've created a basic dashboard, you can augment it with more options.
+You can make several updates without leaving the dashboard by using the edit pane, which is explained in the next section.
 
-1. When you've saved all the changes you want to make to the dashboard, click **Exit edit**.
+### The edit pane and sidebar
 
-   Now, when you want to make more changes to the saved dashboard, click **Edit** in the top-right corner.
+The _edit pane_ allows you to make changes without leaving the dashboard, by displaying options associated with the part of the dashboard that's in focus.
+The _sidebar_ is on the next to the edit pane, and it includes options that are useful to have available all the time.
 
-### Begin dashboard creation from data source configuration
+The following image shows the parts of the edit pane and the sidebar.
+Hover your cursor over the numbers to display descriptions of the sidebar options (descriptions also follow the image):
 
-You can start the process of creating a dashboard directly from a data source rather than from the **Dashboards** page.
+{{< image-map key="editpane-sidebar" >}}
 
-To begin building a dashboard directly from a data source, follow these steps:
+{{< admonition type="note" >}}
+The sidebar is displayed in both edit and view mode, but the **Dashboard options** and **Feedback** icons aren't available in view mode.
+{{< /admonition >}}
 
-1. Navigate to **Connections > Data sources**.
-1. On the row of the data source for which you want to build a dashboard, click **Build a dashboard**.
+You can dock, undock, and resize the edit pane.
+When the edit pane is closed, you can resize the sidebar so the icon names are visible.
 
-   The empty dashboard page opens.
+{{< video-embed src="/media/docs/grafana/dashboards/screenrecord-edit-side-v12.4.mp4" >}}
 
+The available configuration options in the edit pane differ depending on the selected dashboard element:
+
+- Dashboards: High-level options are in the edit pane and further configuration options are in the **Settings** page.
+- Groupings (rows and tabs): All configuration options are available in the edit pane.
+- Panels: High-level options are in the edit pane and further configuration options are in the **Edit panel** view.
+
+### Navigate using the content outline
+
+The **Content outline** provides a tree-like structure that shows you all the parts of the dashboard and their relationships to each other, including panels, rows, tabs, and variables.
+The outline also lets you quickly navigate the dashboard and is available in both view and edit modes (note that variables are only included in edit mode).
+
+{{< figure src="/media/docs/grafana/dashboards/screenshot-content-outline-v12.4.png" max-width="750px" alt="Dashboard with outline open" >}}
+
+To navigate the dashboard using the outline, follow these steps:
+
+1. Navigate to the dashboard you want to view or update.
+1. In the right sidebar, click the **Content outline** icon to open it.
+1. Expand the outline to find the part of the dashboard you want to view or update.
+1. Click the tree item to navigate that part of the dashboard.
+
+### Edit a dashboard
+
+To edit a dashboard, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the part of the dashboard you want to update to open the edit pane, or click the **Dashboard options** icon to open it.
+
+   If the dashboard is large, open the **Content outline** and use it to navigate to the part of the dashboard you want to update.
+
+1. Update the dashboard as needed.
+1. When you've finished making changes, click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Back to dashboard**, if needed.
+1. Click **Exit edit**
+
+## Panel layouts
+
+Panel layouts control the size and arrangement of panels in the dashboard.
+There are two panel layout options:
+
+- **Custom**: You can position and size panels individually. This is the default selection for a new dashboard. **Show/hide rules** are not supported.
+- **Auto grid**: Panels resize and fit automatically to create a uniform grid. You can't make manual changes to this layout. **Show/hide rules** are supported.
+
+You can use both layouts in row or tab groupings.
+
+### Auto grid layout
+
+In the auto grid layout, panels are automatically sized and positioned as you add them.
+There are default parameters to constrain the layout, and you can update these to have more control over the display:
+
+- **Min column width**: Choose from **Standard**, **Narrow**, **Wide**, or **Custom**, for which you can enter the minimum width in pixels.
+- **Max columns**: Set a number up to 10.
+- **Row height**: Choose from **Standard**, **Short**, **Tall**, and **Custom**, for which you can enter the row height in pixels.
+- **Fill screen**: Toggle the switch on to have the panel fill the entire height of the screen. If the panel is in a row, the **Fill screen** toggle for the row must also be enabled (refer to [grouping configuration options](#grouping-configuration-options)).
+
+### Update panel layout
+
+To update the panel layout, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the dashboard or the grouping that contains the panel layout you want to update.
+1. Click the **Dashboard options** icon to open the edit pane, if needed.
+1. Under **Layout**, select **Custom** or **Auto grid**.
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**
+
+## Panel groupings
+
+To help create meaningful sections in your dashboard, you can group panels into rows or tabs.
+Rows and tabs let you break up big dashboards or make one dashboard out of several smaller ones.
+
+You can think of the dashboard as a series of nested containers: the dashboard is the largest container and it contains panels, rows, or tabs.
+Rows and tabs are the next largest containers, and they contain panels.
+
+You can also nest:
+
+- Rows in a row
+- Rows in a tab
+- Tabs in a row
+
+You can nest up to two levels deep, which means a dashboard can have a maximum of four configuration levels:
+
+- Dashboard
+- Grouping 1 - Row or tab
+- Grouping 2 - Row or tab
+- Panels
+
+You can only have one type of grouping at each level.
+Inside of those groupings however, you have to freedom to add different elements.
+Also, custom and auto grid panel layouts are supported for rows and tabs, so each grouping can have a different panel layout.
+
+<!-- {{< figure src="/media/docs/grafana/dashboards/screenshot-groupings-v12.4.png" alt="Dashboard with nested groupings" max-width="750px" >}} -->
+
+The following sections describe:
+
+- [Grouping configuration options](#grouping-configuration-options)
+- [Grouping layouts](#grouping-layouts)
+- [How to group panels](#group-panels)
+- [How to ungroup panels](#ungroup-panels)
+
+### Grouping configuration options
+
+The following table describes the options you can set for a row or tab:
+
+<!-- prettier-ignore-start -->
+
+| Option          | Description                                                                 |
+| ----------------| --------------------------------------------------------------------------- |
+| Title           | Title of the row or tab.                                                    |
+| Fill screen     | Toggle the switch on to make the row fill the screen. Rows only. |
+| Hide row header | Toggle the switch on to hide row headers in view mode. In edit mode, the row header is visible, but crossed out with the hidden icon next to it. Rows only. |
+| Layout          | Select the layout. If the grouping contains another grouping, choose from **Rows** or **Tabs**. If the grouping contains panels, choose from **Custom** or **Auto grid**. For more information, refer to [Panel layouts](#panel-layouts) or [Grouping layouts](#grouping-layouts). |
+| Repeat options > [Repeat by variable](#configure-repeat-options) | Configure the dashboard to dynamically add panels, rows, or tabs based on the value of a variable. |
+| Show / hide rules > [Panel/Row/Tab visibility](#configure-showhide-rules) | Control whether or not panels, rows, or tabs are displayed based on variable values, a time range, or query results (panels only). |
+
+<!-- prettier-ignore-end -->
+
+### Grouping layouts
+
+When you have panels grouped into rows or tabs, the **Layout** options available depend on which dashboard element is selected and the nesting level of that element.
+
+You can nest up to two levels deep, which means a dashboard can have a maximum of four configuration levels, with the following layout options:
+
+- **Dashboard**: Layout options allow you to choose between rows or tabs.
+- **Grouping 1 (outer)**: Layout options allow you to choose between rows or tabs.
+- **Grouping 2 (inner)**: Layout options allow you to choose between custom and auto grid (refer to [Panel layouts](#panel-layouts)).
+- **Panels**: No layout options
+
+You can switch between rows and tabs or update the panel layout by clicking the parent container and changing the layout selection.
+
+### Group panels
+
+To group panels, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Under a panel, click **Group panels**.
+
+   While grouping is typically used for multiple panels, you can start a grouping with just one panel.
+
+1. Select **Group into row** or **Group into tab**.
+
+   All the panels are moved into the grouping, and a dotted blue line surrounds the row or tab.
+   The edit pane opens, displaying the relevant options.
+
+1. Set the [grouping configuration options](#grouping-configuration-options) in the edit pane.
+1. (Optional) Add one or both of the following:
+   - A [nested grouping](#add-nested-groupings)
+   - Other [groupings at the same level](#add-more-groupings-at-the-same-level).
+
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**.
+
+#### Add nested groupings
+
+To add a second-level (or nested) grouping, follow these steps:
+
+1. In the existing grouping, under the panels, click **Group panels**.
+
+   {{< figure src="/media/docs/grafana/dashboards/screenshot-nest-group-v12.4.png" alt="Adding a nested grouping" max-width="500px" >}}
+
+1. Click **Group into row** or **Group into tab** (**Group into tab** is only available if the parent grouping is a row).
+
+   The new grouping is added inside the first grouping, and the panels are moved into the nested grouping.
+   The edit pane opens displaying the relevant options.
+
+1. Set the configuration options for the nested grouping.
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**.
+
+#### Add more groupings at the same level
+
+To add more first-level groupings, follow these steps:
+
+1. On the dashboard, outside the existing first-level grouping, click **New row** or **New tab** (only one option will be available).
+
+   {{< figure src="/media/docs/grafana/dashboards/screenshot-add-group-v12.4.png" alt="Adding a nested grouping" max-width="500px" >}}
+
+1. Set the configuration options for the new grouping.
+1. Click **+ Add panel** to begin adding panels.
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**.
+
+### Ungroup panels
+
+You can ungroup some or all of the dashboard groupings without losing your panels.
+Ungrouping behavior depends on whether you're working with first-level or nested groupings:
+
+| Grouping   | Action and outcome                                                                                 |
+| ---------- | -------------------------------------------------------------------------------------------------- |
+| Rows       | **Ungroup rows** ungroups all first-level rows in the dashboard and all of their nested groupings. |
+| Tabs       | **Ungroup tabs** ungroups all first-level tabs in the dashboard and all of their nested groupings. |
+| Row > row  | **Ungroup rows** ungroups the nested row.                                                          |
+| Row > tabs | **Ungroup tabs** ungroups all the nested tabs in that row. Tabs in other rows are not affected.    |
+| Tab > rows | **Ungroup rows** ungroups all the nested rows in that tab. Rows in other tabs are not affected.    |
+
+{{< figure src="/media/docs/grafana/dashboards/screenshot-ungrouping-v12.4.png" alt="Dashboard with ungrouping behavior annotated" max-width="750px" >}}
+
+{{< admonition type="caution" >}}
+If you delete a grouping, rather than ungrouping it, its panels are deleted as well.
+{{< /admonition >}}
+
+To remove groupings, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. (Optional) Click the **Content outline** icon to quickly navigate to the grouping you want to remove.
 1. Do one of the following:
-   - Click **+Add visualization** to configure all the elements of the new dashboard.
-   - Select one of the suggested dashboards by clicking its **Use dashboard** button. This can be helpful when you're not sure how to most effectively visualize your data.
-     The suggested dashboards are specific to your data source type (for example, Prometheus, Loki, or Elasticsearch). If there are more than three dashboard suggestions, you can click **View all** to see the rest of them.
-
-   ![Empty dashboard with add visualization and suggested dashboard options](/media/docs/grafana/dashboards/screenshot-suggested-dashboards-v12.3.png)
-
-   {{< docs/public-preview product="Suggested dashboards" >}}
-
-1. Complete the rest of the dashboard configuration. For more detailed steps, refer to [Create a dashboard](#create-a-dashboard), beginning at step five.
-
-## Copy a dashboard
-
-To copy a dashboard, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Open the dashboard you want to copy.
-1. Click **Edit** in top-right corner.
-1. Click the **Save dashboard** drop-down and select **Save as copy**.
-1. (Optional) Specify the name, folder, description, and whether or not to copy the original dashboard tags for the copied dashboard.
-
-   By default, the copied dashboard has the same name as the original dashboard with the word "Copy" appended and is in the same folder.
+   - Click **Ungroup rows** or **Ungroup tabs** at the bottom of the dashboard to ungroup all rows or tabs, including any nested groupings.
+   - Click in a grouping and click **Ungroup rows** or **Ungroup tabs** to ungroup only the tabs or rows nested in that grouping.
 
+1. If you've ungrouped panels that were previously in different panel layouts, you'll be prompted to select a common layout type for all the panels; click **Convert to Auto grid** or **Convert to Custom**.
 1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**.
 
-## Configure repeating rows
+## Configure repeat options
 
-You can configure Grafana to dynamically add panels or rows to a dashboard based on the value of a variable. Variables dynamically change your queries across all rows in a dashboard. For more information about repeating panels, refer to [Configure repeating panels](ref:configure-repeating-panels).
+You can configure Grafana to dynamically add panels, rows, or tabs to a dashboard based on the value of a variable.
+Variables dynamically change your queries across all panels, rows, or tabs in a dashboard.
 
-To see an example of repeating rows, refer to [Dashboard with repeating rows](https://play.grafana.org/d/000000153/repeat-rows). The example shows that you can also repeat rows if you have variables set with `Multi-value` or `Include all values` selected.
+This only applies to queries that include a multi-value variable.
 
-**Before you begin:**
+To configure repeats, follow these steps:
 
-- Ensure that the query includes a multi-value variable.
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the panel, row, or tab you want to update to open the edit pane, or click the **Dashboard options** icon to open it.
 
-**To configure repeating rows:**
+   If the dashboard is large, open the **Content outline** and use it to navigate to the part of the dashboard you want to update.
 
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to work on.
-1. At the top of the dashboard, click **Add** and select **Row** in the drop-down.
+1. Expand the **Repeat options** section.
+1. Select the **Repeat by variable**.
+1. For panels in a custom layout, set the following options:
+   1. Under **Repeat direction**, choose one of the following:
+      - **Horizontal** - Arrange panels side-by-side. Grafana adjusts the width of a repeated panel. You can’t mix other panels on a row with a repeated panel.
+      - **Vertical** - Arrange panels in a column. The width of repeated panels is the same as the original, repeated panel.
+   1. If you selected **Horizontal**, select a value in the **Max per row** drop-down list to control the maximum number of panels that can be in a row.
 
-   If the dashboard is empty, you can click the **+ Add row** button in the middle of the dashboard.
+1. (Optional) To provide context to dashboard users, add the variable name to the panel, row, or tab title.
+1. When you've finished setting the repeat option, click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**.
 
-1. Hover over the row title and click the cog icon.
-1. In the **Row Options** dialog box, add a title and select the variable for which you want to add repeating rows.
-1. Click **Update**.
+### Repeating rows and tabs and the Dashboard special data source
 
-To provide context to dashboard users, add the variable to the row title.
-
-### Repeating rows and the Dashboard special data source
-
-If a row includes panels using the special [Dashboard data source](ref:built-in-special-data-sources)&mdash;the data source that uses a result set from another panel in the same dashboard&mdash;then corresponding panels in repeated rows will reference the panel in the original row, not the ones in the repeated rows.
+If a row includes panels using the special [Dashboard data source](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/#special-data-sources)&mdash;the data source that uses a result set from another panel in the same dashboard&mdash;then corresponding panels in repeated rows will reference the panel in the original row, not the ones in the repeated rows.
+The same behavior applies to tabs.
 
 For example, in a dashboard:
 
@@ -242,28 +427,196 @@ For example, in a dashboard:
 - Repeating row, `Row 2`, includes `Panel 2A` and `Panel 2B`
 - `Panel 2B` references `Panel 1A`, not `Panel 2A`
 
-## Move a panel
+## Show/hide rules
 
-You can place a panel on a dashboard in any location.
+You can configure panels, rows, and tabs to be shown or hidden based on rules.
+For example, you can set a panel to be hidden if there's no data returned by a query or a tab to only be shown if a specific variable value is present.
 
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to work on.
-1. Click **Edit** in the top-right corner.
-1. Click the panel title and drag the panel to the new location.
-1. Click **Save dashboard**.
+There are three types of show/hide rules to choose from:
+
+- [Query result](#query-result-rule)
+- [Template variable](#template-variable-rule)
+- [Time range less than](#time-range-less-than-rule)
+
+For steps on how to create show/hide rules, refer to [Configure show/hide rules](#configure-showhide-rules).
+
+{{< admonition type="note" >}}
+You can only configure show/hide rules for panels in the **Auto grid** layout. Set the panel layout at the dashboard, row, or tab-level.
+{{< /admonition >}}
+
+### Query result rule
+
+Show or hide a panel based on whether or not the query returns any results.
+The rule provides **Has data** and **No data** options, so you can choose to show or hide the panel based on the presence or absence of data.
+
+For example, if you have a dashboard with several panels and only want panels that return data to appear, set the rule as follows:
+
+- Panel visibility > Show
+- Query result > Has data
+
+Alternatively, you might also want to troubleshoot a dashboard with several panels to see which ones contain broken queries that aren't returning any results.
+In this case, you'd set the rule as follows:
+
+- Panel visibility > Show
+- Query result > No data
+
+### Template variable rule
+
+Show or hide a panel, row, or tab dynamically based on the variable value.
+You can select any variable that's configured for the dashboard and choose from the following operators for maximum flexibility:
+
+- Equals
+- Not equals
+- Matches (regular expression values)
+- Not matches (regular expression values)
+
+You can [add more variables](#add-variables) if you need to without leaving the dashboard.
+
+### Time range less than rule
+
+Show or hide a panel, row, or tab if the dashboard time range is shorter than the selected time range.
+This ensures that as you change the time range of the dashboard, you only see data relevant to that time period.
+
+For example, a dashboard is tracking adoption of a feature over time has the following setup:
+
+- Dashboard time range is **Last 7 days**
+- One panel tracks weekly stats
+- One panel tracks daily stats
+
+For the panel tracking weekly stats, a rule is set up to hide it if the dashboard time range is less than 7 days.
+For the panel tracking daily stats, a rule is set up to hide it if the dashboard time range is less 24 hours.
+This configuration ensures that these time-based panels are only displayed when enough time has passed to make them relevant.
+
+For this rule type, you can select time ranges from **5 minutes** to **5 years**.
+
+### Configure show/hide rules
+
+To configure show/hide rules, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the panel, row, or tab you want to update to open the edit pane, or click the **Dashboard options** icon to open it.
+
+   If the dashboard is large, open the **Content outline** and use it to navigate to the part of the dashboard you want to update.
+
+1. Expand the **Show / hide rules** section.
+1. Select **Show** or **Hide** to set whether the panel, row, or tab is shown or hidden based on the rules outcome.
+1. Click **+ Add rule**.
+1. Select a rule type:
+   - **Query result**: Show or hide a panel based on query results. Choose from **Has data** and **No data**.
+   - **Template variable**: Show or hide the panel, row, or tab dynamically based on the variable value. Select a variable and operator and enter a value.
+   - **Time range less than**: Show or hide the panel, row, or tab if the dashboard time range is shorter than the selected time range. Select a time range from **5 minutes** to **5 years**.
+
+1. If you've configured more than rule, under **Match rules**, select one of the following:
+   - **Match all**: The panel, row, or tab is shown or hidden only if _all_ the rules are matched.
+   - **Match any**: The panel, row, or tab is shown or hidden if _any_ of the rules are matched.
+
+   This option is only displayed if you add multiple rules.
+
+1. When you've finished setting rules, click **Save**.
 1. (Optional) Enter a description of the changes you've made.
 1. Click **Save**.
-1. Click **Exit edit**.
+1. Click **Exit edit**
+
+Hidden panels, rows, or tabs aren't visible when the dashboard is in view mode.
+In edit mode, hidden dashboard elements are displayed with an icon or overlay indicating this.
+
+## Move a panel
+
+To move a panel, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Navigate to the panel you want to move.
+
+   If the dashboard is large, open the **Content outline** and use it to navigate to the panel.
+
+1. Click the panel title and drag the panel to another row or tab, or to a new position on the dashboard.
+
+   If the dashboard has groupings, you can only move the panel to another grouping.
+
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**
 
 ## Resize a panel
 
-You can size a dashboard panel to suits your needs.
+When your dashboard or grouping has a **Custom** layout, you can manually resize a panel.
 
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to work on.
-1. Click **Edit** in the top-right corner.
-1. To adjust the size of the panel, click and drag the lower-right corner of the panel.
-1. Click **Save dashboard**.
+To resize a panel, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Navigate to the panel you want to resize.
+
+   If the dashboard is large, open the **Content outline** and use it to navigate to the panel.
+
+1. Click and drag the lower-right corner of the panel to change the size of the panel.
+1. Click **Save**.
 1. (Optional) Enter a description of the changes you've made.
 1. Click **Save**.
-1. Click **Exit edit**.
+1. Click **Exit edit**
+
+## Add variables
+
+To add variables without leaving the dashboard, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click **+ Add variable** at the top of the dashboard.
+1. Choose a variable type from the list.
+1. Set the options for the variable.
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**
+
+### Add variables using the content outline
+
+You can also add variables without leaving the dashboard using the content outline.
+
+To access the variables creation flow this way, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the **Content outline** icon.
+1. Click **Variables** in the outline.
+1. Click **+ Add variable**.
+1. Complete the rest of the steps to [add a variable without leaving the dashboard](#add-variables).
+
+## Copy or duplicate dashboard elements
+
+You can copy and paste or duplicate panels, rows, and tabs.
+
+To copy or duplicate dashboard elements, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the panel, row, or tab you want to update to open the edit pane, or click the **Dashboard options** icon to open it.
+
+   If the dashboard is large, open the **Content outline** and use it to navigate to the part of the dashboard you want to update.
+
+1. In the top-corner of the edit pane, click the **Copy or Duplicate** icon and do one of the following:
+   - Click **Copy**.
+   - Click **Duplicate**. The duplicated element is added next to the original one. Proceed to step 6.
+
+1. If you selected **Copy**, navigate to the part of the dashboard where you want to add the copied element, and click **Paste panel**, **Paste row**, or **Paste tab**.
+1. Update the copied or duplicated element if needed.
+1. Click **Save**.
+1. (Optional) Enter a description of the changes you've made.
+1. Click **Save**.
+1. Click **Exit edit**
+
+## Copy a dashboard
+
+To make a copy of a dashboard, follow these steps:
+
+1. Navigate to the dashboard you want to update.
+1. Click **Edit**.
+1. Click the **Save** drop-down list and select **Save as copy**.
+1. (Optional) Specify the name, folder, description, and whether or not to copy the original dashboard tags for the copied dashboard.
+
+   By default, the copied dashboard has the same name as the original dashboard with the word "Copy" appended and is in the same folder.
+
+1. Click **Save**.

docs/sources/visualizations/dashboards/build-dashboards/create-dynamic-dashboard/index.md

@@ -1,416 +0,0 @@
----
-labels:
-  products:
-    - cloud
-    - oss
-  stage:
-    - experimental
-_build:
-  list: false
-noindex: true
-title: Create a dynamic dashboard
-description: Create and edit a dynamic dashboard
-weight: 900
-refs:
-  built-in-special-data-sources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#special-data-sources
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/#special-data-sources
-  visualization-specific-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/
-  configure-standard-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-standard-options/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-standard-options/
-  configure-value-mappings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-value-mappings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-value-mappings/
-  generative-ai-features:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-  configure-thresholds:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-thresholds/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-thresholds/
-  data-sources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/
-  add-a-data-source:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#add-a-data-source
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/#add-a-data-source
-  about-users-and-permissions:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/
-  visualizations-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/
-  configure-repeating-panels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-panel-options/#configure-repeating-panels
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-panel-options/#configure-repeating-panels
-  override-field-values:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides/
-aliases:
-  - ../../../dashboards/build-dashboards/create-dynamic-dashboard/ # /docs/grafana/next/dashboards/build-dashboards/create-dynamic-dashboard/
----
-
-# Create and edit dynamic dashboards
-
-{{< admonition type="caution" >}}
-
-Dynamic dashboards 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 >}}
-
-Dashboards and panels allow you to show your data in visual form. Each panel needs at least one query to display a visualization.
-
-## Before you begin
-
-- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions](ref:about-users-and-permissions).
-- Identify the dashboard to which you want to add the panel.
-- Understand the query language of the target data source.
-- Ensure that data source for which you are writing a query has been added. For more information about adding a data source, refer to [Add a data source](ref:add-a-data-source) if you need instructions.
-
-## Create a dashboard
-
-To create a dashboard, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Click **New** and select **New Dashboard**.
-1. In the edit pane, enter the dashboard title and description.
-
-   {{< figure src="/media/docs/grafana/dashboards/screenshot-new-dashboard-v12.png" max-width="750px" alt="New dashboard" >}}
-
-1. Under **Panel layout**, choose one of the following options:
-   - **Custom** - Position and size panels manually. The default selection.
-   - **Auto grid** - Panels are automatically resized to create a uniform grid based on the column and row settings.
-
-1. Click **+ Add visualization**.
-1. In the dialog box that opens, do one of the following:
-   - Select one of your existing data sources.
-   - Select one of the Grafana [built-in special data sources](ref:built-in-special-data-sources).
-   - Click **Configure a new data source** to set up a new one (Admins only).
-
-   {{< figure class="float-right"  src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source modal" >}}
-
-   The **Edit panel** view opens with your data source selected.
-   You can change the panel data source later using the drop-down in the **Query** tab of the panel editor if needed.
-
-   For more information about data sources, refer to [Data sources](ref:data-sources) for specific guidelines.
-
-1. Write or construct a query in the query language of your data source.
-1. Click **Refresh** to query the data source.
-1. In the visualization list, select a visualization type.
-
-   {{< figure src="/media/docs/grafana/dashboards/screenshot-select-visualization-v12.png" max-width="350px" alt="Visualization selector" >}}
-
-   Grafana displays a preview of your query results with the visualization applied.
-
-   For more information about configuring individual visualizations, refer to [Visualizations options](ref:visualizations-options).
-
-1. Under **Panel options**, enter a title and description for your panel or have Grafana create them using [generative AI features](ref:generative-ai-features).
-1. Refer to the following documentation for ways you can adjust panel settings.
-
-   While not required, most visualizations need some adjustment before they properly display the information that you need.
-   - [Configure value mappings](ref:configure-value-mappings)
-   - [Visualization-specific options](ref:visualization-specific-options)
-   - [Override field values](ref:override-field-values)
-   - [Configure thresholds](ref:configure-thresholds)
-   - [Configure standard options](ref:configure-standard-options)
-
-1. When you've finished editing your panel, click **Save**.
-
-   Alternatively, click **Back to dashboard** if you want to see your changes applied to the dashboard first. Then click **Save** when you're ready.
-
-1. Enter a title and description for your dashboard if you haven't already or have Grafana create them using [generative AI features](ref:generative-ai-features).
-1. Select a folder, if applicable.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-1. To add more panels to the dashboard, click **Back to dashboard** and at the bottom-left corner of the dashboard, click **+ Add panel**.
-
-   {{< figure src="/media/docs/grafana/dashboards/screenshot-add-panel-v12.png" max-width="500px" alt="Add panel button" >}}
-
-1. (Optional) In the edit pane, enter a title and description for the panel and set the panel transparency and repeat options, if applicable.
-1. Click **Configure** in either the edit pane or on the panel to the configuration process.
-1. When you've saved all the changes you want to make to the dashboard, click **Back to dashboard**.
-1. Toggle off the edit mode switch.
-
-{{< admonition type="caution" >}}
-
-Dynamic dashboards 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 >}}
-
-## Group panels
-
-To help create meaningful sections in your dashboard, you can group panels into rows or tabs.
-Rows and tabs let you break up big dashboards or make one dashboard out of several smaller ones.
-You can nest tabs and rows within each other or themselves.
-Also, tabs are included in the dashboard URL.
-
-The following sections describe the configuration options for adding tabs and rows.
-While grouping is meant for multiple panels, you can start a grouping with just one panel.
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-1. At the bottom-left corner of the dashboard, click **Group panels**.
-1. Select **Group into row** or **Group into tab**.
-
-   A dotted line surrounds the panels and the **Row** or **Tab** edit pane is displayed on the right side of the dashboard.
-
-1. Set the [grouping configuration options](#grouping-configuration-options).
-1. When you're finished, click **Save** at the top-right corner of the dashboard.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-
-### Grouping configuration options
-
-The following table describes the options you can set for a row.
-
-<!-- prettier-ignore-start -->
-
-| Option | Description |
-| ------ | ----------- |
-| Title                    | Title of the row or tab. |
-| Fill screen              | Toggle the switch on to make the row fill the screen. Only applies to rows. |
-| Hide row header          | Toggle the switch on to hide the header. In edit mode, the row header is visible, but crossed out with the hidden icon next to it. Only applies to rows. |
-| Group layout             | Select the grouping option, between **Rows** and **Tabs**. Only available when there's a nested grouping and applies to the nested grouping. |
-| Panel layout             | Select whether panels are sized and positioned manually, **Custom**, or automatically, **Auto grid**. Only available when a grouping contains panels. |
-| Repeat options > [Repeat by variable](#configure-repeat-options) | Configure the dashboard to dynamically add rows or tabs based on the value of a variable. |
-| Show / hide rules > [Row/Tab visibility](#configure-showhide-rules) | Control whether or not rows or tabs are displayed based on variables or a time range. |
-
-<!-- prettier-ignore-end -->
-
-## Configure repeat options
-
-<!-- previous heading "Configure repeating rows" -->
-
-You can configure Grafana to dynamically add panels, rows, or tabs to a dashboard based on the value of that variable.
-Variables dynamically change your queries across all rows in a dashboard.
-
-This only applies to queries that include a multi-value variable.
-
-<!-- To see an example of repeating rows, refer to [Dashboard with repeating rows](https://play.grafana.org/d/000000153/repeat-rows).
-The example shows that you can also repeat rows if you have variables set with `Multi-value` or `Include all values` selected.
-Might be good to update this Play example -->
-
-To configure repeats, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-
-   The **Dashboard** edit pane opens on the right side of the dashboard.
-
-1. Click in the panel, row, or tab you want to work with to bring it into focus and display the associated options in the edit pane.
-1. Expand the **Repeat options** section.
-1. Select the **Repeat by variable**.
-1. For panels only, set the following options:
-   - Under **Repeat direction**, choose one of the following:
-     - **Horizontal** - Arrange panels side-by-side. Grafana adjusts the width of a repeated panel. You can’t mix other panels on a row with a repeated panel.
-     - **Vertical** - Arrange panels in a column. The width of repeated panels is the same as the original, repeated panel.
-
-   - If you selected **Horizontal**, select a value in the **Max per row** drop-down list to control the maximum number of panels that can be in a row.
-
-1. (Optional) To provide context to dashboard users, add the variable name to the panel, row, or tab title.
-1. When you've finished setting the repeat option, click **Save**.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-1. Toggle off the edit mode switch.
-
-### Repeating rows and tabs and the Dashboard special data source
-
-<!-- is this next section still true? -->
-
-If a row includes panels using the special [Dashboard data source](ref:built-in-special-data-sources)&mdash;the data source that uses a result set from another panel in the same dashboard&mdash;then corresponding panels in repeated rows will reference the panel in the original row, not the ones in the repeated rows.
-The same behavior applies to tabs.
-
-For example, in a dashboard:
-
-- `Row 1` includes `Panel 1A` and `Panel 1B`
-- `Panel 1B` uses the results from `Panel 1A` by way of the `-- Dashboard --` data source
-- Repeating row, `Row 2`, includes `Panel 2A` and `Panel 2B`
-- `Panel 2B` references `Panel 1A`, not `Panel 2A`
-
-## Configure show/hide rules
-
-You can configure panels, rows, and tabs to be shown or hidden based on rules.
-For example, you might want to set a panel to be hidden if there's no data returned by a query or a tab to only be shown based on a variable being present.
-
-{{< admonition type="note" >}}
-You can only configure show/hide rules for panels when the dashboard is using the **Auto grid** panel layout.
-{{< /admonition >}}
-
-To configure show/hide rules, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-
-   The **Dashboard** edit pane opens on the right side of the dashboard.
-
-1. Click in the panel, row, or tab you want to work with to bring it into focus and display the associated options in the edit pane.
-1. Expand the **Show / hide rules** section.
-1. Select **Show** or **Hide** to set whether the panel, row, or tab is shown or hidden based on the rules outcome.
-1. Click **+ Add rule**.
-1. Select a rule type:
-   - **Query result** - Show or hide a panel based on query results. Choose from **Has data** and **No data**. For panels only.
-   - **Template variable** - Show or hide the panel, row, or tab dynamically based on the variable value. Select a variable and operator and enter a value.
-   - **Time range less than** - Show or hide the panel, row, or tab if the dashboard time range is shorter than the selected time frame. Select or enter a time range.
-
-1. Configure the rule.
-1. Under **Match rules**, select one of the following:
-   - **Match all** - The panel, row, or tab is shown or hidden only if _all_ the rules are matched.
-   - **Match any** - The panel, row, or tab is shown or hidden if _any_ of the rules are matched.
-
-   This option is only displayed if you add multiple rules.
-
-1. When you've finished setting rules, click **Save**.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-1. Toggle off the edit mode switch.
-
-{{< admonition type="caution" >}}
-
-Dynamic dashboards 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 >}}
-
-## Edit dashboards
-
-When the dashboard is in edit mode, the edit pane that opens displays options associated with the part of the dashboard that it's in focus.
-For example, if you click in the area of a panel, row, or tab, that area comes into focus and the edit pane shows the options for that area:
-
-{{< figure src="/media/docs/grafana/dashboards/screenshot-edit-pane-focus-v12.png" max-width="750px" alt="Dashboard with a panel in focus" >}}
-
-- For rows and tabs, all of the available options are in the edit pane.
-- For panels, high-level options are in the edit pane and further configuration options are in the **Edit panel** view.
-- For dashboards, high-level options are in the edit pane and further configuration options are in the **Settings** page.
-
-To edit dashboards, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-
-   The **Dashboard** edit pane opens on the right side of the dashboard.
-
-1. Click in the area you want to work with to bring it into focus and display the associated options in the edit pane.
-1. Do one of the following:
-   - For rows or tabs, make the required changes using the edit pane.
-   - For panels, update the panel title, description, repeat options or show/hide rules in the edit pane. For more changes, click **Configure** and continue in **Edit panel** view.
-   - For dashboards, update the dashboard title, description, grouping or panel layout. For more changes, click the settings (gear) icon in the top-right corner.
-
-1. When you've finished making changes, click **Save**.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-1. Toggle off the edit mode switch.
-
-### Undo and redo
-
-When a dashboard is in edit mode, you can undo and redo changes you've made using the buttons on the toolbar:
-
-{{< figure src="/media/docs/grafana/dashboards/screenshot-undo-redo-icons-v12.0.png" max-width="500px" alt="Undo and redo buttons" >}}
-
-When you've made a change and hover the cursor over the buttons, the tooltip displays the change you're about to undo or redo.
-Also, you can continue undoing or redoing as many changes as you need:
-
-{{< video-embed src="/media/docs/grafana/dashboards/screen-record-undo-redo-v12.0.mp4" >}}
-
-The undo and redo buttons are only available at the dashboard level and only apply to changes made there, such as dashboard layout and grouping and high-level dashboard or panel updates.
-They aren't visible and don't apply when you're configuring a panel or making changes in the dashboard settings.
-
-{{< admonition type="note" >}}
-Not all dashboard edit actions can be undone or redone yet.
-{{< /admonition >}}
-
-## Move or resize a panel
-
-<!-- previous headings Move a panel & Resize a panel -->
-
-When you're dashboard has a **Custom** layout, you can resize or move a panel to any location on the dashboard.
-
-To move or resize, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-1. Do one of the following:
-   - Click the panel title and drag the panel to the new location.
-   - Click and drag the lower-right corner of the panel to change the size of the panel.
-
-1. Click **Save**.
-1. (Optional) Enter a description of the changes you've made.
-1. Click **Save**.
-1. Toggle off the edit mode switch.
-
-## Navigate using the dashboard outline
-
-The dashboard **Outline** provides a tree-like structure that shows you all of the parts of your dashboard and their relationships to each other including panels, rows, tabs, and variables.
-The outline also lets you quickly navigate the dashboard so that you don't have to spend time finding a particular element to work with it.
-By default, the outline is collapsed except for the part that's currently in focus.
-
-{{< figure src="/media/docs/grafana/dashboards/screenshot-dashboard-outline-v12.png" max-width="750px" alt="Dashboard with outline open showing panel in focus" >}}
-
-To navigate the dashboard using the outline, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-
-   The **Dashboard** edit pane opens on the right side of the dashboard.
-
-1. In the edit pane, expand the **Outline** section.
-1. Expand the outline to find the dashboard part to which you want to navigate.
-1. Click the tree item to navigate that part of the dashboard.
-
-## Copy a dashboard
-
-To make a copy of a dashboard, follow these steps:
-
-1. Click **Dashboards** in the main menu.
-1. Navigate to the dashboard you want to update.
-1. Toggle on the edit mode switch.
-1. Click the **Save** drop-down and select **Save as copy**.
-1. (Optional) Specify the name, folder, description, and whether or not to copy the original dashboard tags for the copied dashboard.
-
-   By default, the copied dashboard has the same name as the original dashboard with the word "Copy" appended and is in the same folder.
-
-1. Click **Save**.
-
-{{< admonition type="caution" >}}
-
-Dynamic dashboards 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 >}}

docs/sources/visualizations/dashboards/build-dashboards/create-template-dashboards/_index.md

@@ -3,20 +3,25 @@ keywords:
   - grafana
   - dashboard
   - template
+  - suggestions
 labels:
   products:
     - cloud
     - enterprise
     - oss
-menuTitle: Create template dashboards
-title: Create dashboards from templates
-description: Learn how to create dashboards from templates
+menuTitle: Create template and suggested dashboards
+title: Create dashboards from templates and suggestions
+description: Learn how to create dashboards from templates and suggestions
 weight: 3
 ---
 
-{{< docs/public-preview product="Dashboard templates" >}}
+# Create dashboards from templates and suggestions
 
-# Create dashboards from templates
+Grafana provides alternative ways to start building a dashboard.
+
+## Create dashboards from templates
+
+{{< docs/public-preview product="Dashboard templates" >}}
 
 Grafana provides a variety of pre-built dashboard templates that you can use to quickly set up visualizations for your data. These dashboards use sample data, which you can replace with your own data, making it easier to get started with monitoring and analysis.
 
@@ -48,3 +53,23 @@ To create a dashboard from a template, follow these steps:
    {{< figure src="/media/docs/grafana/dashboards/screenshot-remove-banner-v12.3.png" max-width="750px" alt="Removing the sample data banner panel" >}}
 
 1. Click **Save dashboard**.
+
+## Create dashboards from suggestions
+
+{{< docs/public-preview product="Suggested dashboards" >}}
+
+You can start the process of creating a dashboard directly from a data source rather than from the **Dashboards** page, which gives you access to suggestions based on the data source.
+
+To begin building a dashboard directly from a data source, follow these steps:
+
+1. Navigate to **Connections > Data sources**.
+1. On the row of the data source for which you want to build a dashboard, click **Build a dashboard**.
+
+   The empty dashboard page opens.
+
+1. Select one of the suggested dashboards by clicking its **Use dashboard** button. This can be helpful when you're not sure how to most effectively visualize your data.
+   The suggested dashboards are specific to your data source type (for example, Prometheus, Loki, or Elasticsearch). If there are more than three dashboard suggestions, you can click **View all** to see the rest of them.
+
+   ![Empty dashboard with add visualization and suggested dashboard options](/media/docs/grafana/dashboards/screenshot-suggested-dashboards-v12.3.png)
+
+1. Complete the rest of the dashboard configuration. For more detailed steps, refer to [Create a dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/build-dashboards/create-dashboard/), beginning at step five.

docs/sources/visualizations/dashboards/build-dashboards/manage-dashboard-links/index.md

@@ -85,7 +85,8 @@ Once you've added a dashboard link, it appears in the upper right corner of your
 Add links to other dashboards at the top of your current dashboard.
 
 1. In the dashboard you want to link, click **Edit**.
-1. Click **Settings**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **Links** tab and then click **Add dashboard link**.
 
    The default link type is **Dashboards**.
@@ -109,7 +110,8 @@ Add links to other dashboards at the top of your current dashboard.
 Add a link to a URL at the top of your current dashboard. You can link to any available URL, including dashboards, panels, or external sites. You can even control the time range to ensure the user is zoomed in on the right data in Grafana.
 
 1. In the dashboard you want to link, click **Edit**.
-1. Click **Settings**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **Links** tab and then click **Add dashboard link**.
 1. In the **Type** drop-down, select **Link**.
 1. In the **URL** field, enter the URL to which you want to link.
@@ -132,7 +134,8 @@ Add a link to a URL at the top of your current dashboard. You can link to any av
 To edit, duplicate, or delete dashboard link, follow these steps:
 
 1. In the dashboard you want to link, click **Edit**.
-1. Click **Settings**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **Links** tab.
 1. Do one of the following:
    - **Edit** - Click the name of the link and update the link settings.

docs/sources/visualizations/dashboards/build-dashboards/manage-version-history/index.md

@@ -14,7 +14,7 @@ labels:
     - cloud
     - enterprise
     - oss
-menutitle: Manage version history
+menuTitle: Manage version history
 title: Manage dashboard version history
 description: View and compare previous versions of your dashboard
 weight: 400
@@ -32,8 +32,9 @@ The dashboard version history feature lets you compare and restore to previously
 
 To compare two dashboard versions, follow these steps:
 
-1. Click **Edit** in the top-right corner of the dashboard.
-1. Click **Settings**.
+1. Click **Edit**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **Versions** tab.
 1. Select the two dashboard versions that you want to compare.
 1. Click **Compare versions** to view the diff between the two versions.
@@ -49,8 +50,9 @@ When you're comparing versions, if one of the versions you've selected is the la
 
 To restore to a previously saved dashboard version, follow these steps:
 
-1. Click **Edit** in the top-right corner of the dashboard.
-1. Click **Settings**.
+1. Click **Edit**.
+1. Click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **Versions** tab.
 1. Click the **Restore** button next to the version.
 

docs/sources/visualizations/dashboards/build-dashboards/modify-dashboard-settings/index.md

@@ -50,8 +50,9 @@ The dashboard settings page allows you to:
 
 To access the dashboard setting page:
 
-1. Click **Edit** in the top-right corner of the dashboard.
-1. Click **Settings**.
+1. Click **Edit**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 
 ## Modify dashboard time settings
 

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

@@ -3,45 +3,75 @@ 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 your Grafana dashboard JSON object
+description: View and update 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
 
-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.
+Grafana dashboards are represented as JSON objects that store metadata, panels, variables, and settings.
 
-To view the JSON of a dashboard:
+## Different dashboard schema models
 
-1. Click **Edit** in the top-right corner of the dashboard.
-1. Click **Settings**.
+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:
+
+1. Click **Edit**.
+1. In the sidebar, click the **Dashboard options** icon.
+1. In the edit pane, click **Settings**.
 1. Go to the **JSON Model** tab.
 1. When you've finished viewing the JSON, click **Back to dashboard** and **Exit edit**.
 
-## JSON fields
+## Classic model
 
-When a user creates a new dashboard, a new dashboard JSON object is initialized with the following fields:
+When you create a new dashboard in self-managed Grafana, a new dashboard JSON object was 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. Once 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.
+After a dashboard is saved, an integer value is assigned to the `id` field.
 {{< /admonition >}}
 
 ```json
@@ -76,26 +106,30 @@ In the following JSON, id is shown as null which is the default value assigned t
 
 Each field in the dashboard JSON is explained below with its usage:
 
-| 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](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-start -->
 
-## Panels
+| 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. |
+
+<!--prettier-ignore-end -->
+
+### 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.
 
@@ -168,18 +202,22 @@ The grid has a negative gravity that moves panels up if there is empty space abo
 
 Usage of the fields is explained below:
 
-| 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-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 -->
 
 ### templating
 
@@ -270,3 +308,82 @@ 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/dashboards/share-dashboards-panels/_index.md

@@ -213,7 +213,7 @@ To export a dashboard in its current state as a PDF, follow these steps:
 
 1. Click **Dashboards** in the main menu.
 1. Open the dashboard you want to export.
-1. Click the **Export** drop-down in the top-right corner and select **Export as PDF**.
+1. Click the **Export** drop-down in the sidebar and select **Export as PDF**.
 1. In the **Export dashboard PDF** drawer that opens, select either **Landscape** or **Portrait** for the PDF orientation.
 1. Select either **Grid** or **Simple** for the PDF layout.
 1. Set the **Zoom** level; zoom in to enlarge text, or zoom out to see more data (like table columns) per panel.
@@ -229,7 +229,7 @@ Export a Grafana JSON file that contains everything you need, including layout,
 
 1. Click **Dashboards** in the main menu.
 1. Open the dashboard you want to export.
-1. Click the **Export** drop-down list in the top-right corner and select **Export as code**.
+1. Click the **Export** drop-down list in the sidebar and select **Export as code**.
 
    The **Export dashboard** drawer opens.
 
@@ -255,7 +255,7 @@ To export a dashboard in its current state as a PNG image file, follow these ste
 
 1. Click **Dashboards** in the main menu.
 1. Open the dashboard you want to export.
-1. Click the **Export** drop-down list in the top-right corner and select **Export as image**.
+1. Click the **Export** drop-down list in the sidebar and select **Export as image**.
 
    The **Export as image** drawer opens.
 

docs/sources/visualizations/dashboards/use-dashboards/index.md

@@ -21,67 +21,144 @@ menuTitle: Use dashboards
 title: Use dashboards
 description: Learn about the features of a Grafana dashboard
 weight: 100
-refs:
-  dashboard-analytics:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/assess-dashboard-usage/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/assess-dashboard-usage/
-  generative-ai-features:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards
-  dashboard-settings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/modify-dashboard-settings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/modify-dashboard-settings/
-  repeating-rows:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows
-  variables:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/variables/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/variables/
-  dashboard-folders:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/manage-dashboards/
-  sharing:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/share-dashboards-panels/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/share-dashboards-panels/
-  dashboard-links:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/manage-dashboard-links/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/manage-dashboard-links/
-  panel-overview:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/panel-overview/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/panel-overview/
-  export-dashboards:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/share-dashboards-panels/#export-dashboards
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/share-dashboards-panels/#export-dashboards
-  add-ad-hoc-filters:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/variables/add-template-variables/#add-ad-hoc-filters
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/variables/add-template-variables/#add-ad-hoc-filters
-  shared-dashboards:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/share-dashboards-panels/shared-dashboards/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/share-dashboards-panels/shared-dashboards/
+image_maps:
+  - key: annotated-dashboard
+    src: /media/docs/grafana/dashboards/screenshot-ann-dashboards-v12.4.png
+    alt: An annotated image of a Grafana dashboard
+    points:
+      - x_coord: 8
+        y_coord: 5
+        content: |
+          **Dashboard folder**
+
+          Click the dashboard folder name to access the folder and perform other [folder management tasks](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/).
+      - x_coord: 17
+        y_coord: 5
+        content: |
+          **Dashboard title**
+
+          Create your own dashboard titles or have Grafana create them for you using [generative AI features](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards).
+      - x_coord: 23
+        y_coord: 5
+        content: |
+          **Mark as favorite**
+
+          Mark the dashboard as one of your favorites to include it in your list of **Starred** dashboards in the main menu.
+      - x_coord: 27
+        y_coord: 5
+        content: |
+          **Public label**
+
+          [Externally shared dashboards](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/share-dashboards-panels/shared-dashboards/), it's marked with the **Public** label.
+      - x_coord: 84
+        y_coord: 5
+        content: |
+          **Grafana Assistant**
+
+          [Grafana Assistant](https://grafana.com/docs/grafana-cloud/machine-learning/assistant/introduction/) combines large language models with Grafana-integrated tools.
+      - x_coord: 89
+        y_coord: 5
+        content: |
+          **Invite new users**
+
+          Invite new users to join your Grafana organization.
+      - x_coord: 32
+        y_coord: 23
+        content: |
+          **Variables**
+
+          Use [variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/variables/), including ad hoc filters, to create more interactive and dynamic dashboards.
+      - x_coord: 45
+        y_coord: 23
+        content: |
+          **Dashboard links**
+
+          Link to other dashboards, panels, and external websites. Learn more about [dashboard links](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/build-dashboards/manage-dashboard-links/).
+      - x_coord: 59
+        y_coord: 29
+        content: |
+          **Current dashboard time range and time picker**
+
+          Select [relative time range](#relative-time-range) options or set custom [absolute time ranges](#absolute-time-range).
+          You can also change the **Timezone** and **Fiscal year** settings by clicking the **Change time settings** button.
+      - x_coord: 67
+        y_coord: 29
+        content: |
+          **Time range zoom out**
+
+          Click to zoom out the time range. Learn more about [common time range controls](#common-time-range-controls).
+      - x_coord: 73
+        y_coord: 29
+        content: |
+          **Refresh dashboard**
+
+          Trigger queries and refresh dashboard data.
+      - x_coord: 78
+        y_coord: 29
+        content: |
+          **Auto refresh control**
+
+          Select a dashboard auto refresh time interval.
+      - x_coord: 85
+        y_coord: 29
+        content: |
+          **Share dashboard**
+
+          Access [dashboard sharing](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/share-dashboards-panels/) options.
+      - x_coord: 98
+        y_coord: 22.5
+        content: |
+          **Edit**
+
+          Enter edit mode, so you can make changes and access dashboard settings.
+      - x_coord: 98
+        y_coord: 31
+        content: |
+          **Export**
+
+          Access [dashboard exporting](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/share-dashboards-panels/#export-dashboards) options.
+      - x_coord: 98
+        y_coord: 39
+        content: |
+          **Content outline**
+
+          The outline provides a tree-like structure that lets you quickly navigate the dashboard.
+      - x_coord: 98
+        y_coord: 47
+        content: |
+          **Dashboard insights**
+
+          View [dashboard analytics](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/assess-dashboard-usage/) including information about users, activity, query counts.
+      - x_coord: 11.5
+        y_coord: 30
+        content: |
+          **Row title**
+
+          A row is one way you can [group panels](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/build-dashboards/create-dashboard/#panel-groupings) in a dashboard.
+      - x_coord: 20
+        y_coord: 36
+        content: |
+          **Tab title**
+
+          A tab is one way you can [group panels](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/build-dashboards/create-dashboard/#panel-groupings) in a dashboard.
+      - x_coord: 21
+        y_coord: 45
+        content: |
+          **Panel title**
+
+          Create your own panel titles or have Grafana create them for you using [generative AI features](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards).
+      - x_coord: 27
+        y_coord: 63
+        content: |
+          **Dashboard panel**
+
+          The [panel](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/panel-overview/) is the primary building block of a dashboard.
+      - x_coord: 19.5
+        y_coord: 91
+        content: |
+          **Panel legend**
+
+          Change series colors as well as y-axis and series visibility directly from the legend.
 ---
 
 # Use dashboards
@@ -95,32 +172,9 @@ This topic provides an overview of dashboard features and shortcuts, and describ
 The dashboard user interface provides a number of features that you can use to customize the presentation of your data.
 
 The following image and descriptions highlight all dashboard features.
+Hover your cursor over a number to display information about the dashboard element.
 
-![An annotated image of a dashboard](/media/docs/grafana/dashboards/screenshot-dashboard-annotated-v11.3-2.png)
-
-1. **Dashboard folder** - When you click the dashboard folder name, you can search for other dashboards contained in the folder and perform other [folder management tasks](ref:dashboard-folders).
-1. **Dashboard title** - You can create your own dashboard titles or have Grafana create them for you using [generative AI features](ref:generative-ai-features).
-1. **Kiosk mode** - Click to display the dashboard on a large screen such as a TV or a kiosk. Kiosk mode hides the main menu, navbar, and dashboard controls. Learn more about kiosk mode in our [How to Create Kiosks to Display Dashboards on a TV blog post](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/). Press `Esc` to leave kiosk mode.
-1. **Mark as favorite** - Mark the dashboard as one of your favorites so it's included in your list of **Starred** dashboards in the main menu.
-1. **Public label** - When you [share a dashboard externally](ref:shared-dashboards), it's marked with the **Public** label.
-1. **Dashboard insights** - Click to view analytics about your dashboard including information about users, activity, query counts. Learn more about [dashboard analytics](ref:dashboard-analytics).
-1. **Edit** - Click to leave view-only mode and enter edit mode, where you can make changes directly to the dashboard and access dashboard settings, as well as several panel editing functions.
-1. **Export** - Access [dashboard exporting](ref:export-dashboards) options.
-1. **Share dashboard** - Access several [dashboard sharing](ref:sharing) options.
-1. **Variables** - Use [variables](ref:variables), including ad hoc filters, to create more interactive and dynamic dashboards.
-1. **Dashboard links** - Link to other dashboards, panels, and external websites. Learn more about [dashboard links](ref:dashboard-links).
-1. **Current dashboard time range and time picker** - Click to select [relative time range](#relative-time-range) options and set custom [absolute time ranges](#absolute-time-range).
-   - You can change the **Timezone** and **Fiscal year** settings from the time range controls by clicking the **Change time settings** button.
-   - Time settings are saved on a per-dashboard basis.
-1. **Time range zoom out** - Click to zoom out the time range. Learn more about how to use [common time range controls](#common-time-range-controls).
-1. **Refresh dashboard** - Click to immediately trigger queries and refresh dashboard data.
-1. **Auto refresh control** - Click to select a dashboard auto refresh time interval.
-1. **Dashboard row** - A dashboard row is a logical divider within a dashboard that groups panels together.
-   - Rows can be collapsed or expanded allowing you to hide parts of the dashboard.
-   - Panels inside a collapsed row do not issue queries.
-   - Use [repeating rows](ref:repeating-rows) to dynamically create rows based on a template variable.
-1. **Dashboard panel** - The [panel](ref:panel-overview) is the primary building block of a dashboard.
-1. **Panel legend** - Change series colors as well as y-axis and series visibility directly from the legend.
+{{< image-map key="annotated-dashboard" >}}
 
 ## Keyboard shortcuts
 
@@ -134,7 +188,7 @@ Grafana has a number of keyboard shortcuts available. Press `?` on your keyboard
 - `Ctrl+K`: Opens the command palette.
 - `Esc`: Exits panel when in full screen view or edit mode. Also returns you to the dashboard from dashboard settings.
 
-**Focused panel**
+### Focused panel
 
 By hovering over a panel with the mouse you can use some shortcuts that will target that panel.
 
@@ -285,7 +339,7 @@ Selecting the **Auto** interval schedules a refresh based on the query time rang
 
 ## Filter dashboard data
 
-Once you've [added an ad hoc filter](ref:add-ad-hoc-filters) in the dashboard settings, you can create label/value filter pairs on the dashboard.
+Once you've [added an ad hoc filter](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/visualizations/dashboards/variables/add-template-variables/#add-ad-hoc-filters) in the dashboard settings, you can create label/value filter pairs on the dashboard.
 These filters are applied to all metric queries that use the specified data source and to all panels on the dashboard.
 
 To filter dashboard data, follow these steps:

docs/sources/visualizations/panels-visualizations/configure-panel-options/index.md

@@ -35,9 +35,9 @@ refs:
       destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/manage-dashboard-links/#panel-links
   configure-repeating-rows:
     - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows
+      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/#configure-repeat-options
     - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/#configure-repeating-rows
+      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/#configure-repeat-options
   set-up-generative-ai-features-for-dashboards:
     - pattern: /docs/grafana/
       destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/manage-dashboards/#set-up-generative-ai-features-for-dashboards

e2e-playwright/alerting-suite/saved-searches.spec.ts

@@ -2,6 +2,15 @@ import { Page } from '@playwright/test';
 
 import { test, expect } from '@grafana/plugin-e2e';
 
+// Enable required feature toggles for Saved Searches (part of RuleList.v2)
+test.use({
+  featureToggles: {
+    alertingListViewV2: true,
+    alertingFilterV2: true,
+    alertingSavedSearches: true,
+  },
+});
+
 /**
  * UI selectors for Saved Searches e2e tests.
  * Each selector is a function that takes the page and returns a locator.
@@ -26,26 +35,50 @@ const ui = {
 
   // Indicators
   emptyState: (page: Page) => page.getByText(/no saved searches/i),
-  defaultIcon: (page: Page) => page.locator('[title="Default search"]'),
+  defaultIcon: (page: Page) => page.getByRole('img', { name: /default search/i }),
   duplicateError: (page: Page) => page.getByText(/already exists/i),
 };
 
 /**
- * Helper to clear saved searches storage.
- * UserStorage uses localStorage as fallback, so we clear both potential keys.
+ * Helper to clear saved searches from UserStorage.
+ * UserStorage persists data server-side via k8s API, so we need to delete via API.
  */
 async function clearSavedSearches(page: Page) {
-  await page.evaluate(() => {
-    // Clear localStorage keys that might contain saved searches
-    // UserStorage stores under 'grafana.userstorage.alerting' pattern
-    const keysToRemove = Object.keys(localStorage).filter(
-      (key) => key.includes('alerting') && (key.includes('savedSearches') || key.includes('userstorage'))
-    );
-    keysToRemove.forEach((key) => localStorage.removeItem(key));
+  // Get namespace and user info from Grafana config
+  const storageInfo = await page.evaluate(() => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const bootData = (window as any).grafanaBootData;
+    const user = bootData?.user;
+    const userUID = user?.uid === '' || !user?.uid ? String(user?.id ?? 'anonymous') : user.uid;
+    const resourceName = `alerting:${userUID}`;
+    const namespace = bootData?.settings?.namespace || 'default';
 
-    // Also clear session storage visited flag
-    const sessionKeysToRemove = Object.keys(sessionStorage).filter((key) => key.includes('alerting'));
-    sessionKeysToRemove.forEach((key) => sessionStorage.removeItem(key));
+    return { namespace, resourceName };
+  });
+
+  // Delete the UserStorage resource
+  try {
+    await page.request.delete(
+      `/apis/userstorage.grafana.app/v0alpha1/namespaces/${storageInfo.namespace}/user-storage/${storageInfo.resourceName}`
+    );
+  } catch (error) {
+    // Ignore 404 errors (resource doesn't exist)
+    if (!(error && typeof error === 'object' && 'status' in error && error.status === 404)) {
+      console.warn('Failed to clear saved searches:', error);
+    }
+  }
+
+  // Also clear localStorage as fallback storage
+  await page.evaluate(({ resourceName }) => {
+    // The UserStorage key pattern is always `{resourceName}:{key}`
+    // For saved searches, the key is 'savedSearches'
+    const key = `${resourceName}:savedSearches`;
+    window.localStorage.removeItem(key);
+  }, storageInfo);
+
+  // Clear session storage visited flag
+  await page.evaluate(() => {
+    window.sessionStorage.removeItem('grafana.alerting.ruleList.visited');
   });
 }
 
@@ -150,7 +183,7 @@ test.describe(
 
       await ui.saveButton(page).click();
 
-      await ui.saveNameInput(page).fill('Apply Test');
+      await ui.saveNameInput(page).fill('Firing Rules');
       await ui.saveConfirmButton(page).click();
 
       // Clear the search
@@ -159,7 +192,7 @@ test.describe(
 
       // Apply the saved search
       await ui.savedSearchesButton(page).click();
-      await page.getByRole('button', { name: /apply search.*apply test/i }).click();
+      await page.getByRole('button', { name: /apply.*search.*firing rules/i }).click();
 
       // Verify the search input is updated
       await expect(ui.searchInput(page)).toHaveValue('state:firing');
@@ -182,7 +215,7 @@ test.describe(
       await ui.renameMenuItem(page).click();
 
       // Enter new name
-      const renameInput = page.getByDisplayValue('Original Name');
+      const renameInput = page.getByRole('textbox', { name: /enter a name/i });
       await renameInput.clear();
       await renameInput.fill('Renamed Search');
       await page.keyboard.press('Enter');
@@ -260,12 +293,12 @@ test.describe(
 
       await expect(ui.saveNameInput(page)).toBeVisible();
 
-      // Press Escape to cancel
+      // Press Escape to cancel - this closes the entire dropdown
       await page.keyboard.press('Escape');
 
-      // Verify we're back to list mode
-      await expect(ui.saveNameInput(page)).not.toBeVisible();
-      await expect(ui.saveButton(page)).toBeVisible();
+      // Verify the entire dialog is closed
+      await expect(ui.dropdown(page)).not.toBeVisible();
+      await expect(ui.saveButton(page)).not.toBeVisible();
     });
   }
 );

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

@@ -727,17 +727,6 @@ 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`,
@@ -2628,26 +2617,6 @@ 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;
@@ -4568,9 +4537,6 @@ export type DashboardAclUpdateItem = {
 export type UpdateDashboardAclCommand = {
   items?: DashboardAclUpdateItem[];
 };
-export type RestoreDashboardVersionCommand = {
-  version?: number;
-};
 export type DashboardVersionMeta = {
   created?: string;
   createdBy?: string;
@@ -6633,7 +6599,6 @@ export const {
   useGetDashboardPermissionsListByUidQuery,
   useLazyGetDashboardPermissionsListByUidQuery,
   useUpdateDashboardPermissionsByUidMutation,
-  useRestoreDashboardVersionByUidMutation,
   useGetDashboardVersionsByUidQuery,
   useLazyGetDashboardVersionsByUidQuery,
   useGetDashboardVersionByUidQuery,

packages/grafana-flamegraph/src/FlameGraph/rendering.ts

@@ -22,7 +22,7 @@ import { getBarColorByDiff, getBarColorByPackage, getBarColorByValue } from './c
 import { CollapseConfig, CollapsedMap, FlameGraphDataContainer, LevelItem } from './dataTransform';
 
 type RenderOptions = {
-  canvasRef: RefObject<HTMLCanvasElement>;
+  canvasRef: RefObject<HTMLCanvasElement | null>;
   data: FlameGraphDataContainer;
   root: LevelItem;
   direction: 'children' | 'parents';
@@ -373,7 +373,7 @@ function useColorFunction(
   );
 }
 
-function useSetupCanvas(canvasRef: RefObject<HTMLCanvasElement>, wrapperWidth: number, numberOfLevels: number) {
+function useSetupCanvas(canvasRef: RefObject<HTMLCanvasElement | null>, wrapperWidth: number, numberOfLevels: number) {
   const [ctx, setCtx] = useState<CanvasRenderingContext2D>();
 
   useEffect(() => {

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

@@ -29,11 +29,14 @@ 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');
 }
@@ -43,11 +46,14 @@ 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',
 };

packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/hooks.ts

@@ -7,7 +7,7 @@ const CAUGHT_KEYS = ['ArrowUp', 'ArrowDown', 'Home', 'End', 'Enter', 'Tab'];
 
 /** @internal */
 export interface UseListFocusProps {
-  localRef: RefObject<HTMLUListElement>;
+  localRef: RefObject<HTMLUListElement | null>;
   options: TimeOption[];
 }
 

packages/grafana-ui/src/components/Input/utils.ts

@@ -1,7 +1,7 @@
 import { RefObject, useRef } from 'react';
 
-export function useFocus(): [RefObject<HTMLInputElement>, () => void] {
-  const ref = useRef<HTMLInputElement>(null);
+export function useFocus(): [RefObject<HTMLInputElement | null>, () => void] {
+  const ref = useRef<HTMLInputElement | null>(null);
   const setFocus = () => {
     ref.current && ref.current.focus();
   };

packages/grafana-ui/src/components/Menu/hooks.ts

@@ -6,7 +6,7 @@ const UNFOCUSED = -1;
 
 /** @internal */
 export interface UseMenuFocusProps {
-  localRef: RefObject<HTMLDivElement>;
+  localRef: RefObject<HTMLDivElement | null>;
   isMenuOpen?: boolean;
   close?: () => void;
   onOpen?: (focusOnItem: (itemId: number) => void) => void;

packages/grafana-ui/src/components/ScrollContainer/ScrollContainer.tsx

@@ -22,7 +22,7 @@ interface Props extends Omit<BoxProps, 'display' | 'direction' | 'element' | 'fl
  *
  * https://developers.grafana.com/ui/latest/index.html?path=/docs/layout-scrollcontainer--docs
  */
-export const ScrollContainer = forwardRef<HTMLDivElement, PropsWithChildren<Props>>(
+export const ScrollContainer = forwardRef<HTMLDivElement | null, PropsWithChildren<Props>>(
   (
     {
       children,

packages/grafana-ui/src/components/Table/TableNG/components/TableCellTooltip.tsx

@@ -20,7 +20,7 @@ export interface TableCellTooltipProps {
   field: Field;
   getActions: (field: Field, rowIdx: number) => ActionModel[];
   getTextColorForBackground: (bgColor: string) => string;
-  gridRef: RefObject<DataGridHandle>;
+  gridRef: RefObject<DataGridHandle | null>;
   height: number;
   placement?: TableCellTooltipPlacement;
   renderer: TableCellRenderer;

packages/grafana-ui/src/components/Table/TableNG/hooks.ts

@@ -463,7 +463,7 @@ export function useColumnResize(
   return dataGridResizeHandler;
 }
 
-export function useScrollbarWidth(ref: RefObject<DataGridHandle>, height: number) {
+export function useScrollbarWidth(ref: RefObject<DataGridHandle | null>, height: number) {
   const [scrollbarWidth, setScrollbarWidth] = useState(0);
 
   useLayoutEffect(() => {

packages/grafana-ui/src/components/Table/TableRT/Table.tsx

@@ -135,7 +135,7 @@ export const Table = memo((props: Props) => {
   // `useTableStateReducer`, which is needed to construct options for `useTable` (the hook that returns
   // `toggleAllRowsExpanded`), and if we used a variable, that variable would be undefined at the time
   // we initialize `useTableStateReducer`.
-  const toggleAllRowsExpandedRef = useRef<(value?: boolean) => void>();
+  const toggleAllRowsExpandedRef = useRef<((value?: boolean) => void) | null>(null);
 
   // Internal react table state reducer
   const stateReducer = useTableStateReducer({

packages/grafana-ui/src/components/Table/hooks.ts

@@ -14,8 +14,8 @@ import { GrafanaTableState } from './types';
   Select the scrollbar element from the VariableSizeList scope
  */
 export function useFixScrollbarContainer(
-  variableSizeListScrollbarRef: React.RefObject<HTMLDivElement>,
-  tableDivRef: React.RefObject<HTMLDivElement>
+  variableSizeListScrollbarRef: React.RefObject<HTMLDivElement | null>,
+  tableDivRef: React.RefObject<HTMLDivElement | null>
 ) {
   useEffect(() => {
     if (variableSizeListScrollbarRef.current && tableDivRef.current) {
@@ -43,7 +43,7 @@ export function useFixScrollbarContainer(
  */
 export function useResetVariableListSizeCache(
   extendedState: GrafanaTableState,
-  listRef: React.RefObject<VariableSizeList>,
+  listRef: React.RefObject<VariableSizeList | null>,
   data: DataFrame,
   hasUniqueId: boolean
 ) {

packages/grafana-ui/src/components/uPlot/geometries/EventsCanvas.tsx

@@ -19,7 +19,7 @@ interface EventsCanvasProps {
 }
 
 export function EventsCanvas({ id, events, renderEventMarker, mapEventToXYCoords, config }: EventsCanvasProps) {
-  const plotInstance = useRef<uPlot>();
+  const plotInstance = useRef<uPlot | null>(null);
   // render token required to re-render annotation markers. Rendering lines happens in uPlot and the props do not change
   // so we need to force the re-render when the draw hook was performed by uPlot
   const [renderToken, setRenderToken] = useState(0);

packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx

@@ -140,7 +140,7 @@ export const TooltipPlugin2 = ({
 
   const [{ plot, isHovering, isPinned, contents, style, dismiss }, setState] = useReducer(mergeState, null, initState);
 
-  const sizeRef = useRef<TooltipContainerSize>();
+  const sizeRef = useRef<TooltipContainerSize | null>(null);
   const styles = useStyles2(getStyles, maxWidth);
 
   const renderRef = useRef(render);

packages/grafana-ui/src/graveyard/GraphNG/GraphNG.tsx

@@ -96,7 +96,7 @@ export interface GraphNGState {
 export class GraphNG extends Component<GraphNGProps, GraphNGState> {
   static contextType = PanelContextRoot;
   panelContext: PanelContext = {} as PanelContext;
-  private plotInstance: React.RefObject<uPlot>;
+  private plotInstance: React.RefObject<uPlot | null>;
 
   private subscription = new Subscription();
 

pkg/api/dashboard.go

@@ -795,6 +795,10 @@ 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/services/updatemanager/plugins.go

@@ -13,6 +13,8 @@ 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"
 
@@ -47,6 +49,7 @@ type PluginsService struct {
 	updateStrategy  string
 
 	features featuremgmt.FeatureToggles
+	cfg      *setting.Cfg
 }
 
 func ProvidePluginsService(cfg *setting.Cfg,
@@ -89,6 +92,7 @@ func ProvidePluginsService(cfg *setting.Cfg,
 		features:         features,
 		updateChecker:    updateChecker,
 		updateStrategy:   cfg.PluginUpdateStrategy,
+		cfg:              cfg,
 	}, nil
 }
 
@@ -136,7 +140,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 openfeature.NewDefaultClient().Boolean(ctx, featuremgmt.FlagPluginsAutoUpdate, false, openfeature.TransactionContext(ctx)) {
+	if s.checkFlagPluginsAutoUpdate(ctx) {
 		s.updateAll(ctx)
 	}
 }
@@ -218,6 +222,17 @@ 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
@@ -227,7 +242,7 @@ func (s *PluginsService) canUpdate(ctx context.Context, plugin pluginstore.Plugi
 		return false
 	}
 
-	if openfeature.NewDefaultClient().Boolean(ctx, featuremgmt.FlagPluginsAutoUpdate, false, openfeature.TransactionContext(ctx)) {
+	if s.checkFlagPluginsAutoUpdate(ctx) {
 		return s.updateChecker.CanUpdate(plugin.ID, plugin.Info.Version, gcomVersion, s.updateStrategy == setting.PluginUpdateStrategyMinor)
 	}
 

playwright.config.ts

@@ -179,6 +179,10 @@ export default defineConfig<PluginOptions>({
       name: 'cloud-plugins',
       testDir: path.join(testDirRoot, '/cloud-plugins-suite'),
     }),
+    withAuth({
+      name: 'alerting',
+      testDir: path.join(testDirRoot, '/alerting-suite'),
+    }),
     withAuth({
       name: 'dashboard-new-layouts',
       testDir: path.join(testDirRoot, '/dashboard-new-layouts'),

public/api-merged.json

@@ -4024,12 +4024,14 @@
     },
     "/dashboards/uid/{uid}/restore": {
       "post": {
+        "description": "This API will be removed when /apis/dashboards.grafana.app/v1 is released.\nYou can restore a dashboard by reading it from history, then creating it again.",
         "tags": [
           "dashboards",
           "versions"
         ],
         "summary": "Restore a dashboard to a given dashboard version using UID.",
         "operationId": "restoreDashboardVersionByUID",
+        "deprecated": true,
         "parameters": [
           {
             "name": "Body",

public/app/core/components/GraphNG/GraphNG.tsx

@@ -109,7 +109,7 @@ const defaultMatchers = {
  * "Time as X" core component, expects ascending x
  */
 export class GraphNG extends Component<GraphNGProps, GraphNGState> {
-  private plotInstance: React.RefObject<uPlot>;
+  private plotInstance: React.RefObject<uPlot | null>;
 
   constructor(props: GraphNGProps) {
     super(props);

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

@@ -0,0 +1,67 @@
+import { render, screen } from 'test/test-utils';
+
+import { KnownProvenance } from '../types/knownProvenance';
+
+import { ProvisioningBadge } from './Provisioning';
+
+describe('ProvisioningBadge', () => {
+  describe('when the provenance is file', () => {
+    it('should render the badge with the correct text', () => {
+      render(<ProvisioningBadge provenance={KnownProvenance.File} />);
+
+      expect(screen.getByText('Provisioned')).toBeInTheDocument();
+      expect(screen.queryByText('Imported')).not.toBeInTheDocument();
+    });
+
+    it('should render correct tooltip text', async () => {
+      const { user } = render(<ProvisioningBadge tooltip provenance={KnownProvenance.File} />);
+
+      const badge = screen.getByText('Provisioned');
+      await user.hover(badge);
+
+      expect(
+        screen.getByText('This resource has been provisioned via file and cannot be edited through the UI')
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('when the provenance is ConvertedPrometheus', () => {
+    it('should render the badge with the correct text', () => {
+      render(<ProvisioningBadge provenance={KnownProvenance.ConvertedPrometheus} />);
+
+      expect(screen.getByText('Imported')).toBeInTheDocument();
+      expect(screen.queryByText('Provisioned')).not.toBeInTheDocument();
+    });
+
+    it('should render correct tooltip text', async () => {
+      const { user } = render(<ProvisioningBadge tooltip provenance={KnownProvenance.ConvertedPrometheus} />);
+
+      const badge = screen.getByText('Imported');
+      await user.hover(badge);
+
+      expect(
+        screen.getByText('This resource has been provisioned via Prometheus/Mimir and cannot be edited through the UI')
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('when the provenance is API', () => {
+    it('should render the badge with the correct text', () => {
+      render(<ProvisioningBadge provenance={KnownProvenance.API} />);
+
+      expect(screen.getByText('Provisioned')).toBeInTheDocument();
+      expect(screen.queryByText('Imported')).not.toBeInTheDocument();
+    });
+
+    it('should render correct tooltip text', async () => {
+      const { user } = render(<ProvisioningBadge tooltip provenance={KnownProvenance.API} />);
+
+      const badge = screen.getByText('Provisioned');
+      await user.hover(badge);
+
+      expect(
+        screen.getByText('This resource has been provisioned via api and cannot be edited through the UI')
+      ).toBeInTheDocument();
+    });
+  });
+});

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

@@ -3,6 +3,8 @@ import { ComponentPropsWithoutRef } from 'react';
 import { Trans, t } from '@grafana/i18n';
 import { Alert, Badge, Tooltip } from '@grafana/ui';
 
+import { KnownProvenance } from '../types/knownProvenance';
+
 export enum ProvisionedResource {
   ContactPoint = 'contact point',
   Template = 'template',
@@ -64,11 +66,17 @@ export const ProvisioningBadge = ({
    */
   provenance?: string;
 }) => {
-  const badge = <Badge text={t('alerting.provisioning-badge.badge.text-provisioned', 'Provisioned')} color="purple" />;
+  const isConvertedPrometheus = provenance === KnownProvenance.ConvertedPrometheus;
+  const badgeText = isConvertedPrometheus
+    ? t('alerting.provisioning-badge.badge.text-converted-prometheus', 'Imported')
+    : t('alerting.provisioning-badge.badge.text-provisioned', 'Provisioned');
+  const badgeColor = isConvertedPrometheus ? 'blue' : 'purple';
+  const badge = <Badge text={badgeText} color={badgeColor} />;
 
   if (tooltip) {
+    const provenanceText = isConvertedPrometheus ? 'Prometheus/Mimir' : provenance;
     const provenanceTooltip = (
-      <Trans i18nKey="alerting.provisioning.badge-tooltip-provenance" values={{ provenance }}>
+      <Trans i18nKey="alerting.provisioning.badge-tooltip-provenance" values={{ provenance: provenanceText }}>
         This resource has been provisioned via {{ provenance }} and cannot be edited through the UI
       </Trans>
     );

public/app/features/alerting/unified/components/contact-points/ContactPointHeader.test.tsx

@@ -0,0 +1,60 @@
+import { render, screen } from 'test/test-utils';
+
+import { AccessControlAction } from 'app/types/accessControl';
+
+import { setupMswServer } from '../../mockApi';
+import { grantUserPermissions } from '../../mocks';
+import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+import { KnownProvenance } from '../../types/knownProvenance';
+
+import { ContactPointHeader } from './ContactPointHeader';
+import { ContactPointWithMetadata } from './utils';
+
+setupMswServer();
+
+const renderWithProvider = (component: React.ReactElement, alertmanagerSourceName?: string) => {
+  return render(
+    <AlertmanagerProvider accessType="notification" alertmanagerSourceName={alertmanagerSourceName}>
+      {component}
+    </AlertmanagerProvider>
+  );
+};
+
+describe('ContactPointHeader', () => {
+  beforeEach(() => {
+    grantUserPermissions([
+      AccessControlAction.AlertingNotificationsRead,
+      AccessControlAction.AlertingNotificationsWrite,
+    ]);
+  });
+
+  const mockContactPoint: ContactPointWithMetadata = {
+    id: 'test-contact-point',
+    name: 'Test Contact Point',
+    provenance: KnownProvenance.API,
+    policies: [],
+    grafana_managed_receiver_configs: [],
+  };
+
+  it('shows Provisioned badge when contact point has file provenance via K8s annotations', () => {
+    const contactPointWithFile = {
+      ...mockContactPoint,
+      provenance: KnownProvenance.File,
+    };
+
+    renderWithProvider(<ContactPointHeader contactPoint={contactPointWithFile} onDelete={jest.fn()} />);
+
+    expect(screen.getByText('Provisioned')).toBeInTheDocument();
+  });
+
+  it('shows correct badge when contact point has converted_prometheus provenance', () => {
+    const contactPointWithConvertedPrometheus = {
+      ...mockContactPoint,
+      provenance: KnownProvenance.ConvertedPrometheus,
+    };
+
+    renderWithProvider(<ContactPointHeader contactPoint={contactPointWithConvertedPrometheus} onDelete={jest.fn()} />);
+
+    expect(screen.getByText('Imported')).toBeInTheDocument();
+  });
+});

public/app/features/alerting/unified/components/contact-points/ContactPointHeader.tsx

@@ -13,6 +13,7 @@ import {
   canDeleteEntity,
   canEditEntity,
   getAnnotation,
+  isProvisionedResource,
   shouldUseK8sApi,
 } from 'app/features/alerting/unified/utils/k8s/utils';
 
@@ -31,13 +32,15 @@ interface ContactPointHeaderProps {
 }
 
 export const ContactPointHeader = ({ contactPoint, onDelete }: ContactPointHeaderProps) => {
-  const { name, id, provisioned, policies = [] } = contactPoint;
+  const { name, id, provenance, policies = [] } = contactPoint;
   const styles = useStyles2(getStyles);
   const [showPermissionsDrawer, setShowPermissionsDrawer] = useState(false);
   const { selectedAlertmanager } = useAlertmanager();
 
   const usingK8sApi = shouldUseK8sApi(selectedAlertmanager!);
 
+  const isProvisioned = isProvisionedResource(provenance);
+
   const [exportSupported, exportAllowed] = useAlertmanagerAbility(AlertmanagerAction.ExportContactPoint);
   const [editSupported, editAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
   const [deleteSupported, deleteAllowed] = useAlertmanagerAbility(AlertmanagerAction.UpdateContactPoint);
@@ -70,14 +73,14 @@ export const ContactPointHeader = ({ contactPoint, onDelete }: ContactPointHeade
   /** Does the current user have permissions to edit the contact point? */
   const hasAbilityToEdit = usingK8sApi ? canEditEntity(contactPoint) : editAllowed;
   /** Can the contact point actually be edited via the UI? */
-  const contactPointIsEditable = !provisioned;
+  const contactPointIsEditable = !isProvisioned;
   /** Given the alertmanager, the user's permissions, and the state of the contact point - can it actually be edited? */
   const canEdit = editSupported && hasAbilityToEdit && contactPointIsEditable;
 
   /** Does the current user have permissions to delete the contact point? */
   const hasAbilityToDelete = usingK8sApi ? canDeleteEntity(contactPoint) : deleteAllowed;
   /** Can the contact point actually be deleted, regardless of permissions? i.e. ensuring it isn't provisioned and isn't referenced elsewhere */
-  const contactPointIsDeleteable = !provisioned && !numberOfPoliciesPreventingDeletion && !numberOfRules;
+  const contactPointIsDeleteable = !isProvisioned && !numberOfPoliciesPreventingDeletion && !numberOfRules;
   /** Given the alertmanager, the user's permissions, and the state of the contact point - can it actually be deleted? */
   const canBeDeleted = deleteSupported && hasAbilityToDelete && contactPointIsDeleteable;
 
@@ -130,7 +133,7 @@ export const ContactPointHeader = ({ contactPoint, onDelete }: ContactPointHeade
 
     const reasonsDeleteIsDisabled = [
       !hasAbilityToDelete ? cannotDeleteNoPermissions : '',
-      provisioned ? cannotDeleteProvisioned : '',
+      isProvisioned ? cannotDeleteProvisioned : '',
       numberOfPoliciesPreventingDeletion > 0 ? cannotDeletePolicies : '',
       numberOfRules ? cannotDeleteRules : '',
     ].filter(Boolean);
@@ -209,15 +212,13 @@ export const ContactPointHeader = ({ contactPoint, onDelete }: ContactPointHeade
             {referencedByRulesText}
           </TextLink>
         )}
-        {provisioned && (
-          <ProvisioningBadge tooltip provenance={getAnnotation(contactPoint, K8sAnnotations.Provenance)} />
-        )}
+        {isProvisioned && <ProvisioningBadge tooltip provenance={provenance} />}
         {!isReferencedByAnything && <UnusedContactPointBadge />}
         <Spacer />
         <LinkButton
           tooltipPlacement="top"
           tooltip={
-            provisioned
+            isProvisioned
               ? t(
                   'alerting.contact-point-header.tooltip-provisioned-contact-points',
                   'Provisioned contact points cannot be edited in the UI'

public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx

@@ -13,6 +13,7 @@ import { setupMswServer } from '../../mockApi';
 import { grantUserPermissions, mockDataSource } from '../../mocks';
 import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
 import { setupDataSources } from '../../testSetup/datasources';
+import { KnownProvenance } from '../../types/knownProvenance';
 import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
 import { ContactPoint } from './ContactPoint';
@@ -305,7 +306,9 @@ describe('contact points', () => {
     });
 
     it('should disable buttons when provisioned', async () => {
-      const { user } = renderWithProvider(<ContactPoint contactPoint={{ ...basicContactPoint, provisioned: true }} />);
+      const { user } = renderWithProvider(
+        <ContactPoint contactPoint={{ ...basicContactPoint, provenance: KnownProvenance.File }} />
+      );
 
       expect(screen.getByText(/provisioned/i)).toBeInTheDocument();
 

public/app/features/alerting/unified/components/contact-points/__snapshots__/useContactPoints.test.tsx.snap

@@ -50,7 +50,7 @@ exports[`useContactPoints should return contact points with status 1`] = `
           },
         },
       ],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -93,7 +93,7 @@ exports[`useContactPoints should return contact points with status 1`] = `
       },
       "name": "lotsa-emails",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -129,7 +129,7 @@ exports[`useContactPoints should return contact points with status 1`] = `
       },
       "name": "OnCall Conctact point",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -178,7 +178,7 @@ exports[`useContactPoints should return contact points with status 1`] = `
           },
         },
       ],
-      "provisioned": true,
+      "provenance": "api",
     },
     {
       "grafana_managed_receiver_configs": [
@@ -243,7 +243,7 @@ exports[`useContactPoints should return contact points with status 1`] = `
       },
       "name": "Slack with multiple channels",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
   ],
   "error": undefined,
@@ -301,7 +301,7 @@ exports[`useContactPoints when having oncall plugin installed and no alert manag
           },
         },
       ],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -344,7 +344,7 @@ exports[`useContactPoints when having oncall plugin installed and no alert manag
       },
       "name": "lotsa-emails",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -383,7 +383,7 @@ exports[`useContactPoints when having oncall plugin installed and no alert manag
       },
       "name": "OnCall Conctact point",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
     {
       "grafana_managed_receiver_configs": [
@@ -432,7 +432,7 @@ exports[`useContactPoints when having oncall plugin installed and no alert manag
           },
         },
       ],
-      "provisioned": true,
+      "provenance": "api",
     },
     {
       "grafana_managed_receiver_configs": [
@@ -497,7 +497,7 @@ exports[`useContactPoints when having oncall plugin installed and no alert manag
       },
       "name": "Slack with multiple channels",
       "policies": [],
-      "provisioned": false,
+      "provenance": undefined,
     },
   ],
   "error": undefined,

public/app/features/alerting/unified/components/contact-points/useContactPoints.test.tsx

@@ -6,10 +6,13 @@ import { disablePlugin } from 'app/features/alerting/unified/mocks/server/config
 import { setOnCallIntegrations } from 'app/features/alerting/unified/mocks/server/handlers/plugins/configure-plugins';
 import { SupportedPlugin } from 'app/features/alerting/unified/types/pluginBridges';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
+import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types/accessControl';
 
 import { setupMswServer } from '../../mockApi';
 import { grantUserPermissions } from '../../mocks';
+import { setAlertmanagerConfig } from '../../mocks/server/entities/alertmanagers';
+import { KnownProvenance } from '../../types/knownProvenance';
 
 import { useContactPointsWithStatus } from './useContactPoints';
 
@@ -69,4 +72,235 @@ describe('useContactPoints', () => {
       expect(snapshot).toMatchSnapshot();
     });
   });
+
+  describe('Provenance handling', () => {
+    it('should extract provenance when provenance is "api"', async () => {
+      // Set up alertmanager config with a receiver that has API provenance
+      const config: AlertManagerCortexConfig = {
+        template_files: {},
+        alertmanager_config: {
+          receivers: [
+            {
+              name: 'api-provenance-contact-point',
+              grafana_managed_receiver_configs: [
+                {
+                  uid: 'test-uid-1',
+                  name: 'api-provenance-contact-point',
+                  type: 'email',
+                  disableResolveMessage: false,
+                  settings: {
+                    addresses: 'test@example.com',
+                  },
+                  secureFields: {},
+                  provenance: 'api', // This will be used by the K8s mock handler
+                },
+              ],
+            },
+          ],
+        },
+      };
+      setAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, config);
+
+      const { result } = renderHook(
+        () =>
+          useContactPointsWithStatus({
+            alertmanager: GRAFANA_RULES_SOURCE_NAME,
+            fetchPolicies: false,
+            fetchStatuses: false,
+          }),
+        { wrapper }
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      const contactPoint = result.current.contactPoints?.find((cp) => cp.name === 'api-provenance-contact-point');
+      expect(contactPoint).toBeDefined();
+      expect(contactPoint?.provenance).toBe(KnownProvenance.API);
+    });
+
+    it('should extract provenance when provenance is "file"', async () => {
+      const config: AlertManagerCortexConfig = {
+        template_files: {},
+        alertmanager_config: {
+          receivers: [
+            {
+              name: 'file-provenance-contact-point',
+              grafana_managed_receiver_configs: [
+                {
+                  uid: 'test-uid-2',
+                  name: 'file-provenance-contact-point',
+                  type: 'email',
+                  disableResolveMessage: false,
+                  settings: {
+                    addresses: 'test@example.com',
+                  },
+                  secureFields: {},
+                  provenance: 'file',
+                },
+              ],
+            },
+          ],
+        },
+      };
+      setAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, config);
+
+      const { result } = renderHook(
+        () =>
+          useContactPointsWithStatus({
+            alertmanager: GRAFANA_RULES_SOURCE_NAME,
+            fetchPolicies: false,
+            fetchStatuses: false,
+          }),
+        { wrapper }
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      const contactPoint = result.current.contactPoints?.find((cp) => cp.name === 'file-provenance-contact-point');
+      expect(contactPoint).toBeDefined();
+      expect(contactPoint?.provenance).toBe(KnownProvenance.File);
+    });
+
+    it('should extract provenance when provenance is "converted_prometheus"', async () => {
+      const config: AlertManagerCortexConfig = {
+        template_files: {},
+        alertmanager_config: {
+          receivers: [
+            {
+              name: 'mimir-provenance-contact-point',
+              grafana_managed_receiver_configs: [
+                {
+                  uid: 'test-uid-3',
+                  name: 'mimir-provenance-contact-point',
+                  type: 'email',
+                  disableResolveMessage: false,
+                  settings: {
+                    addresses: 'test@example.com',
+                  },
+                  secureFields: {},
+                  provenance: 'converted_prometheus',
+                },
+              ],
+            },
+          ],
+        },
+      };
+      setAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, config);
+
+      const { result } = renderHook(
+        () =>
+          useContactPointsWithStatus({
+            alertmanager: GRAFANA_RULES_SOURCE_NAME,
+            fetchPolicies: false,
+            fetchStatuses: false,
+          }),
+        { wrapper }
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      const contactPoint = result.current.contactPoints?.find((cp) => cp.name === 'mimir-provenance-contact-point');
+      expect(contactPoint).toBeDefined();
+      expect(contactPoint?.provenance).toBe(KnownProvenance.ConvertedPrometheus);
+    });
+
+    it('should map "none" provenance annotation to undefined', async () => {
+      const config: AlertManagerCortexConfig = {
+        template_files: {},
+        alertmanager_config: {
+          receivers: [
+            {
+              name: 'none-provenance-contact-point',
+              grafana_managed_receiver_configs: [
+                {
+                  uid: 'test-uid-4',
+                  name: 'none-provenance-contact-point',
+                  type: 'email',
+                  disableResolveMessage: false,
+                  settings: {
+                    addresses: 'test@example.com',
+                  },
+                  secureFields: {},
+                  // No provenance field - will default to PROVENANCE_NONE in mock handler
+                },
+              ],
+            },
+          ],
+        },
+      };
+      setAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, config);
+
+      const { result } = renderHook(
+        () =>
+          useContactPointsWithStatus({
+            alertmanager: GRAFANA_RULES_SOURCE_NAME,
+            fetchPolicies: false,
+            fetchStatuses: false,
+          }),
+        { wrapper }
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      const contactPoint = result.current.contactPoints?.find((cp) => cp.name === 'none-provenance-contact-point');
+      expect(contactPoint).toBeDefined();
+      // The mock handler sets PROVENANCE_NONE ('none') when no provenance is found
+      // parseK8sReceiver converts 'none' to undefined
+      expect(contactPoint?.provenance).toBeUndefined();
+    });
+
+    it('should handle missing annotations gracefully', async () => {
+      // This test verifies that when annotations are undefined, provenance is handled correctly
+      const config: AlertManagerCortexConfig = {
+        template_files: {},
+        alertmanager_config: {
+          receivers: [
+            {
+              name: 'no-annotations-contact-point',
+              grafana_managed_receiver_configs: [
+                {
+                  uid: 'test-uid-5',
+                  name: 'no-annotations-contact-point',
+                  type: 'email',
+                  disableResolveMessage: false,
+                  settings: {
+                    addresses: 'test@example.com',
+                  },
+                  secureFields: {},
+                },
+              ],
+            },
+          ],
+        },
+      };
+      setAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME, config);
+
+      const { result } = renderHook(
+        () =>
+          useContactPointsWithStatus({
+            alertmanager: GRAFANA_RULES_SOURCE_NAME,
+            fetchPolicies: false,
+            fetchStatuses: false,
+          }),
+        { wrapper }
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+
+      const contactPoint = result.current.contactPoints?.find((cp) => cp.name === 'no-annotations-contact-point');
+      expect(contactPoint).toBeDefined();
+      // When annotations are missing, the mock handler should set provenance to undefined
+      expect(contactPoint?.provenance).toBeUndefined();
+    });
+  });
 });

public/app/features/alerting/unified/components/contact-points/useContactPoints.ts

@@ -11,7 +11,7 @@ import { ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Receiver } f
 import { BaseAlertmanagerArgs, Skippable } from 'app/features/alerting/unified/types/hooks';
 import { cloudNotifierTypes } from 'app/features/alerting/unified/utils/cloud-alertmanager-notifier-types';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { isK8sEntityProvisioned, shouldUseK8sApi } from 'app/features/alerting/unified/utils/k8s/utils';
+import { shouldUseK8sApi } from 'app/features/alerting/unified/utils/k8s/utils';
 import { GrafanaManagedContactPoint, Receiver } from 'app/plugins/datasource/alertmanager/types';
 
 import { getAPINamespace } from '../../../../../api/utils';
@@ -21,7 +21,9 @@ import { useAsync } from '../../hooks/useAsync';
 import { usePluginBridge } from '../../hooks/usePluginBridge';
 import { useProduceNewAlertmanagerConfiguration } from '../../hooks/useProduceNewAlertmanagerConfig';
 import { addReceiverAction, deleteReceiverAction, updateReceiverAction } from '../../reducers/alertmanager/receivers';
+import { KnownProvenance } from '../../types/knownProvenance';
 import { getIrmIfPresentOrOnCallPluginId } from '../../utils/config';
+import { K8sAnnotations } from '../../utils/k8s/constants';
 
 import { enhanceContactPointsWithMetadata } from './utils';
 
@@ -78,10 +80,13 @@ const useOnCallIntegrations = ({ skip }: Skippable = {}) => {
 type K8sReceiver = ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Receiver;
 
 const parseK8sReceiver = (item: K8sReceiver): GrafanaManagedContactPoint => {
+  const metadataProvenance = item.metadata.annotations?.[K8sAnnotations.Provenance];
+  const provenance = metadataProvenance === KnownProvenance.None ? undefined : metadataProvenance;
+
   return {
     id: item.metadata.name || item.metadata.uid || item.spec.title,
     name: item.spec.title,
-    provisioned: isK8sEntityProvisioned(item),
+    provenance: provenance,
     grafana_managed_receiver_configs: item.spec.integrations,
     metadata: item.metadata,
   };

public/app/features/alerting/unified/components/contact-points/useNotificationTemplates.ts

@@ -16,7 +16,8 @@ import {
   deleteNotificationTemplateAction,
   updateNotificationTemplateAction,
 } from '../../reducers/alertmanager/notificationTemplates';
-import { K8sAnnotations, PROVENANCE_NONE } from '../../utils/k8s/constants';
+import { KnownProvenance } from '../../types/knownProvenance';
+import { K8sAnnotations } from '../../utils/k8s/constants';
 import { getAnnotation, shouldUseK8sApi } from '../../utils/k8s/utils';
 import { ensureDefine } from '../../utils/templates';
 import { TemplateFormValues } from '../receivers/TemplateForm';
@@ -79,7 +80,7 @@ function templateGroupsToTemplates(
 function templateGroupToTemplate(
   templateGroup: ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1TemplateGroup
 ): NotificationTemplate {
-  const provenance = getAnnotation(templateGroup, K8sAnnotations.Provenance) ?? PROVENANCE_NONE;
+  const provenance = getAnnotation(templateGroup, K8sAnnotations.Provenance) ?? KnownProvenance.None;
   return {
     // K8s entities should always have a metadata.name property. The type is marked as optional because it's also used in other places
     uid: templateGroup.metadata.name ?? templateGroup.spec.title,
@@ -96,8 +97,8 @@ function amConfigToTemplates(config: AlertManagerCortexConfig): NotificationTemp
     uid: title,
     title,
     content,
-    // Undefined, null or empty string should be converted to PROVENANCE_NONE
-    provenance: (config.template_file_provenances ?? {})[title] || PROVENANCE_NONE,
+    // Undefined, null or empty string should be converted to KnownProvenance.None
+    provenance: (config.template_file_provenances ?? {})[title] || KnownProvenance.None,
     missing: !templates.includes(title),
   }));
 }
@@ -272,7 +273,7 @@ export function useValidateNotificationTemplate({
 }
 
 interface NotificationTemplateMetadata {
-  isProvisioned: boolean;
+  provenance?: string;
 }
 
 export function useNotificationTemplateMetadata(
@@ -280,11 +281,11 @@ export function useNotificationTemplateMetadata(
 ): NotificationTemplateMetadata {
   if (!template) {
     return {
-      isProvisioned: false,
+      provenance: KnownProvenance.None,
     };
   }
 
   return {
-    isProvisioned: Boolean(template.provenance) && template.provenance !== PROVENANCE_NONE,
+    provenance: template.provenance,
   };
 }

public/app/features/alerting/unified/components/contact-points/utils.test.ts

@@ -1,8 +1,12 @@
+import { GrafanaManagedContactPoint } from 'app/plugins/datasource/alertmanager/types';
+
+import { KnownProvenance } from '../../types/knownProvenance';
 import { ReceiverTypes } from '../receivers/grafanaAppReceivers/onCall/onCall';
 
 import { RECEIVER_META_KEY, RECEIVER_PLUGIN_META_KEY } from './constants';
 import {
   ReceiverConfigWithMetadata,
+  enhanceContactPointsWithMetadata,
   getReceiverDescription,
   isAutoGeneratedPolicy,
   summarizeEmailAddresses,
@@ -128,3 +132,110 @@ describe('summarizeEmailAddresses', () => {
     expect(summarizeEmailAddresses('foo@foo.com\n bar@bar.com  ')).toBe(output);
   });
 });
+
+describe('enhanceContactPointsWithMetadata', () => {
+  it('should extract provenance from receiver configs when contact point has no provenance', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'test-contact-point',
+      grafana_managed_receiver_configs: [
+        {
+          uid: 'test-uid',
+          name: 'test-contact-point',
+          type: 'email',
+          settings: { addresses: 'test@example.com' },
+          secureFields: {},
+          provenance: KnownProvenance.API,
+        },
+      ],
+    };
+
+    const enhanced = enhanceContactPointsWithMetadata({
+      contactPoints: [contactPoint],
+      notifiers: [],
+      status: [],
+    });
+
+    expect(enhanced[0].provenance).toBe(KnownProvenance.API);
+  });
+
+  it('should prefer contact point provenance over receiver config provenance', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'test-contact-point',
+      provenance: KnownProvenance.File, // Provenance on contact point (from K8s)
+      grafana_managed_receiver_configs: [
+        {
+          uid: 'test-uid',
+          name: 'test-contact-point',
+          type: 'email',
+          settings: { addresses: 'test@example.com' },
+          secureFields: {},
+          provenance: KnownProvenance.API, // Different provenance on receiver config
+        },
+      ],
+    };
+
+    const enhanced = enhanceContactPointsWithMetadata({
+      contactPoints: [contactPoint],
+      notifiers: [],
+      status: [],
+    });
+
+    expect(enhanced[0].provenance).toBe(KnownProvenance.File);
+  });
+
+  it('should extract provenance from first receiver config that has it', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'test-contact-point',
+      grafana_managed_receiver_configs: [
+        {
+          uid: 'test-uid-1',
+          name: 'test-contact-point',
+          type: 'email',
+          settings: { addresses: 'test@example.com' },
+          secureFields: {},
+          // No provenance on first receiver
+        },
+        {
+          uid: 'test-uid-2',
+          name: 'test-contact-point',
+          type: 'slack',
+          settings: { recipient: '#channel' },
+          secureFields: {},
+          provenance: KnownProvenance.ConvertedPrometheus, // Provenance on second receiver
+        },
+      ],
+    };
+
+    const enhanced = enhanceContactPointsWithMetadata({
+      contactPoints: [contactPoint],
+      notifiers: [],
+      status: [],
+    });
+
+    expect(enhanced[0].provenance).toBe(KnownProvenance.ConvertedPrometheus);
+  });
+
+  it('should have undefined provenance when neither contact point nor receiver configs have provenance', () => {
+    const contactPoint: GrafanaManagedContactPoint = {
+      name: 'test-contact-point',
+      grafana_managed_receiver_configs: [
+        {
+          uid: 'test-uid',
+          name: 'test-contact-point',
+          type: 'email',
+          settings: { addresses: 'test@example.com' },
+          secureFields: {},
+          // No provenance
+        },
+      ],
+    };
+
+    const enhanced = enhanceContactPointsWithMetadata({
+      contactPoints: [contactPoint],
+      notifiers: [],
+      status: [],
+    });
+
+    expect(enhanced[0].provenance).toBeUndefined();
+  });
+});

public/app/features/alerting/unified/components/contact-points/utils.ts

@@ -146,9 +146,16 @@ export function enhanceContactPointsWithMetadata({
 
     const id = getContactPointIdentifier(contactPoint);
 
+    // Extract provenance from contactPoint first; else, search in its receivers
+    const contactPointProvenance =
+      'provenance' in contactPoint && contactPoint.provenance !== undefined
+        ? contactPoint.provenance
+        : receivers.find((receiver) => Boolean(receiver.provenance))?.provenance;
+
     return {
       ...contactPoint,
       id,
+      provenance: contactPointProvenance,
       policies:
         alertmanagerConfiguration && usedContactPointsByName && (usedContactPointsByName[contactPoint.name] ?? []),
       grafana_managed_receiver_configs: receivers.map((receiver, index) => {

public/app/features/alerting/unified/components/mute-timings/useMuteTimings.tsx

@@ -9,7 +9,7 @@ import {
   IoK8SApimachineryPkgApisMetaV1ObjectMeta,
 } from 'app/features/alerting/unified/openapi/timeIntervalsApi.gen';
 import { BaseAlertmanagerArgs, Skippable } from 'app/features/alerting/unified/types/hooks';
-import { PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
 import {
   isK8sEntityProvisioned,
   shouldUseK8sApi,
@@ -62,7 +62,7 @@ const parseAmTimeInterval: (interval: MuteTimeInterval, provenance: string) => M
   return {
     ...interval,
     id: interval.name,
-    provisioned: Boolean(provenance && provenance !== PROVENANCE_NONE),
+    provisioned: Boolean(provenance && provenance !== KnownProvenance.None),
   };
 };
 

public/app/features/alerting/unified/components/notification-policies/NotificationPoliciesList.tsx

@@ -11,7 +11,7 @@ import { AlertmanagerAction, useAlertmanagerAbility } from 'app/features/alertin
 import { FormAmRoute } from 'app/features/alerting/unified/types/amroutes';
 import { addUniqueIdentifierToRoute } from 'app/features/alerting/unified/utils/amroutes';
 import { getErrorCode, stringifyErrorLike } from 'app/features/alerting/unified/utils/misc';
-import { ObjectMatcher, ROUTES_META_SYMBOL, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
+import { ObjectMatcher, RouteWithID } from 'app/plugins/datasource/alertmanager/types';
 
 import { anyOfRequestState, isError } from '../../hooks/useAsync';
 import { useAlertmanager } from '../../state/AlertmanagerContext';
@@ -27,6 +27,7 @@ import { useAddPolicyModal, useAlertGroupsModal, useDeletePolicyModal, useEditPo
 import { Policy } from './Policy';
 import { TIMING_OPTIONS_DEFAULTS } from './timingOptions';
 import {
+  isRouteProvisioned,
   useAddNotificationPolicy,
   useDeleteNotificationPolicy,
   useNotificationPolicyRoute,
@@ -99,6 +100,8 @@ export const NotificationPoliciesList = () => {
     }
     return;
   }, [defaultPolicy]);
+  const routeProvenance = defaultPolicy?.provenance;
+  const isRootRouteProvisioned = rootRoute ? isRouteProvisioned(rootRoute) : false;
 
   // useAsync could also work but it's hard to wait until it's done in the tests
   // Combining with useEffect gives more predictable results because the condition is in useEffect
@@ -244,7 +247,8 @@ export const NotificationPoliciesList = () => {
             currentRoute={defaults(rootRoute, TIMING_OPTIONS_DEFAULTS)}
             contactPointsState={contactPointsState.receivers}
             readOnly={!hasConfigurationAPI}
-            provisioned={rootRoute[ROUTES_META_SYMBOL]?.provisioned}
+            provisioned={isRootRouteProvisioned}
+            provenance={routeProvenance}
             alertManagerSourceName={selectedAlertmanager}
             onAddPolicy={openAddModal}
             onEditPolicy={openEditModal}

public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx

@@ -17,6 +17,7 @@ import {
 import { useAlertmanagerAbilities } from '../../hooks/useAbilities';
 import { mockReceiversState } from '../../mocks';
 import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+import { KnownProvenance } from '../../types/knownProvenance';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
 
 import {
@@ -331,6 +332,60 @@ describe('Policy', () => {
     const customPolicy = screen.getByTestId('am-route-container');
     expect(within(customPolicy).getByTestId('matches-all')).toBeInTheDocument();
   });
+
+  it('shows correct badge when policy has file provenance', () => {
+    const mockRoute: RouteWithID = {
+      id: 'test-route',
+      receiver: 'test-receiver',
+      routes: [],
+    };
+
+    renderPolicy(
+      <Policy
+        readOnly
+        isDefaultPolicy
+        currentRoute={mockRoute}
+        contactPointsState={mockReceiversState()}
+        alertManagerSourceName={GRAFANA_RULES_SOURCE_NAME}
+        onEditPolicy={noop}
+        onAddPolicy={noop}
+        onDeletePolicy={noop}
+        onShowAlertInstances={noop}
+        provisioned
+        provenance={KnownProvenance.File}
+      />
+    );
+
+    const badge = screen.getByText('Provisioned');
+    expect(badge).toBeInTheDocument();
+  });
+
+  it('shows correct badge when policy has converted_prometheus provenance', () => {
+    const mockRoute: RouteWithID = {
+      id: 'test-route',
+      receiver: 'test-receiver',
+      routes: [],
+    };
+
+    renderPolicy(
+      <Policy
+        readOnly
+        isDefaultPolicy
+        currentRoute={mockRoute}
+        contactPointsState={mockReceiversState()}
+        alertManagerSourceName={GRAFANA_RULES_SOURCE_NAME}
+        onEditPolicy={noop}
+        onAddPolicy={noop}
+        onDeletePolicy={noop}
+        onShowAlertInstances={noop}
+        provisioned
+        provenance={KnownProvenance.ConvertedPrometheus}
+      />
+    );
+
+    const badge = screen.getByText('Imported');
+    expect(badge).toBeInTheDocument();
+  });
 });
 
 // Doesn't matter which path the routes use, it just needs to match the initialEntries history entry to render the element

public/app/features/alerting/unified/components/notification-policies/Policy.tsx

@@ -61,6 +61,7 @@ interface PolicyComponentProps {
   contactPointsState?: ReceiversState;
   readOnly?: boolean;
   provisioned?: boolean;
+  provenance?: string;
   inheritedProperties?: InheritableProperties;
   routesMatchingFilters?: RoutesMatchingFilters;
 
@@ -89,6 +90,7 @@ const Policy = (props: PolicyComponentProps) => {
     contactPointsState,
     readOnly = false,
     provisioned = false,
+    provenance,
     alertManagerSourceName,
     currentRoute,
     inheritedProperties,
@@ -255,7 +257,7 @@ const Policy = (props: PolicyComponentProps) => {
                 <Spacer />
                 {/* TODO maybe we should move errors to the gutter instead? */}
                 {errors.length > 0 && <Errors errors={errors} />}
-                {provisioned && <ProvisioningBadge />}
+                {provisioned && <ProvisioningBadge tooltip provenance={provenance} />}
                 <Stack direction="row" gap={0.5}>
                   {!isAutoGenerated && !readOnly && (
                     <Authorize actions={[AlertmanagerAction.CreateNotificationPolicy]}>

public/app/features/alerting/unified/components/notification-policies/useNotificationPolicyRoute.test.tsx

@@ -1,9 +1,15 @@
 import { MatcherOperator, ROUTES_META_SYMBOL, Route } from 'app/plugins/datasource/alertmanager/types';
 
 import { ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Route } from '../../openapi/routesApi.gen';
+import { KnownProvenance } from '../../types/knownProvenance';
 import { ROOT_ROUTE_NAME } from '../../utils/k8s/constants';
 
-import { createKubernetesRoutingTreeSpec, k8sSubRouteToRoute, routeToK8sSubRoute } from './useNotificationPolicyRoute';
+import {
+  createKubernetesRoutingTreeSpec,
+  isRouteProvisioned,
+  k8sSubRouteToRoute,
+  routeToK8sSubRoute,
+} from './useNotificationPolicyRoute';
 
 test('k8sSubRouteToRoute', () => {
   const input: ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Route = {
@@ -115,3 +121,86 @@ test('createKubernetesRoutingTreeSpec', () => {
   expect(tree.metadata.name).toBe(ROOT_ROUTE_NAME);
   expect(tree).toMatchSnapshot();
 });
+
+describe('isRouteProvisioned', () => {
+  it('returns false when route has no provenance', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+    };
+
+    expect(isRouteProvisioned(route)).toBeFalsy();
+  });
+
+  it('returns false when route has KnownProvenance.None in metadata', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      [ROUTES_META_SYMBOL]: {
+        provenance: KnownProvenance.None,
+      },
+    };
+
+    expect(isRouteProvisioned(route)).toBeFalsy();
+  });
+
+  it('returns false when route has KnownProvenance.None at top level', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      provenance: KnownProvenance.None,
+    };
+    expect(isRouteProvisioned(route)).toBeFalsy();
+  });
+
+  it('returns true when route has file provenance in metadata', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      [ROUTES_META_SYMBOL]: {
+        provenance: KnownProvenance.File,
+      },
+    };
+
+    expect(isRouteProvisioned(route)).toBeTruthy();
+  });
+
+  it('returns true when route has api provenance in metadata', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      [ROUTES_META_SYMBOL]: {
+        provenance: KnownProvenance.API,
+      },
+    };
+
+    expect(isRouteProvisioned(route)).toBeTruthy();
+  });
+
+  it('returns true when route has converted_prometheus provenance in metadata', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      [ROUTES_META_SYMBOL]: {
+        provenance: KnownProvenance.ConvertedPrometheus,
+      },
+    };
+
+    expect(isRouteProvisioned(route)).toBeTruthy();
+  });
+
+  it('returns true when route has file provenance at top level', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      provenance: KnownProvenance.File,
+    };
+
+    expect(isRouteProvisioned(route)).toBeTruthy();
+  });
+
+  it('falls back to top-level provenance when metadata provenance is missing', () => {
+    const route: Route = {
+      receiver: 'test-receiver',
+      provenance: KnownProvenance.File,
+      [ROUTES_META_SYMBOL]: {
+        provenance: undefined,
+      },
+    };
+
+    expect(isRouteProvisioned(route)).toBeTruthy();
+  });
+});

public/app/features/alerting/unified/components/notification-policies/useNotificationPolicyRoute.ts

@@ -22,8 +22,8 @@ import {
 } from '../../reducers/alertmanager/notificationPolicyRoutes';
 import { FormAmRoute } from '../../types/amroutes';
 import { addUniqueIdentifierToRoute } from '../../utils/amroutes';
-import { PROVENANCE_NONE, ROOT_ROUTE_NAME } from '../../utils/k8s/constants';
-import { isK8sEntityProvisioned, shouldUseK8sApi } from '../../utils/k8s/utils';
+import { K8sAnnotations, ROOT_ROUTE_NAME } from '../../utils/k8s/constants';
+import { getAnnotation, isProvisionedResource, shouldUseK8sApi } from '../../utils/k8s/utils';
 import { routeAdapter } from '../../utils/routeAdapter';
 import {
   InsertPosition,
@@ -33,6 +33,11 @@ import {
   omitRouteFromRouteTree,
 } from '../../utils/routeTree';
 
+export function isRouteProvisioned(route: Route): boolean {
+  const provenance = route[ROUTES_META_SYMBOL]?.provenance ?? route.provenance;
+  return isProvisionedResource(provenance);
+}
+
 const k8sRoutesToRoutesMemoized = memoize(k8sRoutesToRoutes, { maxSize: 1 });
 
 const {
@@ -82,7 +87,7 @@ const parseAmConfigRoute = memoize((route: Route): Route => {
   return {
     ...route,
     [ROUTES_META_SYMBOL]: {
-      provisioned: Boolean(route.provenance && route.provenance !== PROVENANCE_NONE),
+      provenance: route.provenance,
     },
   };
 });
@@ -232,10 +237,11 @@ function k8sRoutesToRoutes(routes: ComGithubGrafanaGrafanaPkgApisAlertingNotific
       ...route.spec.defaults,
       routes: route.spec.routes?.map(k8sSubRouteToRoute),
       [ROUTES_META_SYMBOL]: {
-        provisioned: isK8sEntityProvisioned(route),
+        provenance: getAnnotation(route, K8sAnnotations.Provenance),
         resourceVersion: route.metadata.resourceVersion,
         name: route.metadata.name,
       },
+      provenance: getAnnotation(route, K8sAnnotations.Provenance),
     };
   });
 }

public/app/features/alerting/unified/components/receivers/TemplateForm.tsx

@@ -33,6 +33,7 @@ import { AccessControlAction } from 'app/types/accessControl';
 
 import { AITemplateButtonComponent } from '../../enterprise-components/AI/AIGenTemplateButton/addAITemplateButton';
 import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+import { isProvisionedResource } from '../../utils/k8s/utils';
 import { makeAMLink, stringifyErrorLike } from '../../utils/misc';
 import { EditorColumnHeader } from '../EditorColumnHeader';
 import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
@@ -122,7 +123,8 @@ export const TemplateForm = ({ originalTemplate, prefill, alertmanager }: Props)
   // AI feedback state
   const [aiGeneratedTemplate, setAiGeneratedTemplate] = useState(false);
 
-  const { isProvisioned } = useNotificationTemplateMetadata(originalTemplate);
+  const { provenance } = useNotificationTemplateMetadata(originalTemplate);
+  const isProvisioned = isProvisionedResource(provenance);
   const originalTemplatePrefill: TemplateFormValues | undefined = originalTemplate
     ? { title: originalTemplate.title, content: originalTemplate.content }
     : undefined;

public/app/features/alerting/unified/components/receivers/TemplatesTable.test.tsx

@@ -0,0 +1,98 @@
+import { render, screen, within } from 'test/test-utils';
+
+import { AppNotificationList } from 'app/core/components/AppNotifications/AppNotificationList';
+import { AccessControlAction } from 'app/types/accessControl';
+
+import { setupMswServer } from '../../mockApi';
+import { grantUserPermissions } from '../../mocks';
+import { AlertmanagerProvider } from '../../state/AlertmanagerContext';
+import { KnownProvenance } from '../../types/knownProvenance';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+import { NotificationTemplate } from '../contact-points/useNotificationTemplates';
+
+import { TemplatesTable } from './TemplatesTable';
+
+const mockTemplates: Array<Partial<NotificationTemplate>> = [
+  {
+    uid: 'mimir-template',
+    title: 'mimir-template',
+    content: '{{ define "mimir-template" }}Template from Mimir{{ end }}',
+    provenance: KnownProvenance.ConvertedPrometheus,
+  },
+  {
+    uid: 'file-template',
+    title: 'file-template',
+    content: '{{ define "file-template" }}File provisioned template{{ end }}',
+    provenance: KnownProvenance.File,
+  },
+  {
+    uid: 'api-template',
+    title: 'api-template',
+    content: '{{ define "api-template" }}API provisioned template{{ end }}',
+    provenance: KnownProvenance.API,
+  },
+  {
+    uid: 'no-provenance-template',
+    title: 'no-provenance-template',
+    content: '{{ define "no-provenance-template" }}No provenance template{{ end }}',
+    provenance: KnownProvenance.None,
+  },
+  {
+    uid: 'undefined-provenance-template',
+    title: 'undefined-provenance-template',
+    content: '{{ define "undefined-provenance-template" }}Undefined provenance template{{ end }}',
+    provenance: undefined,
+  },
+];
+
+const renderWithProvider = (templates: Array<Partial<NotificationTemplate>>) => {
+  return render(
+    <AlertmanagerProvider accessType={'notification'}>
+      <TemplatesTable alertManagerName={GRAFANA_RULES_SOURCE_NAME} templates={templates as NotificationTemplate[]} />
+      <AppNotificationList />
+    </AlertmanagerProvider>
+  );
+};
+
+setupMswServer();
+
+describe('TemplatesTable', () => {
+  beforeEach(() => {
+    grantUserPermissions([
+      AccessControlAction.AlertingNotificationsRead,
+      AccessControlAction.AlertingNotificationsWrite,
+      AccessControlAction.AlertingNotificationsExternalRead,
+      AccessControlAction.AlertingNotificationsExternalWrite,
+    ]);
+  });
+
+  it('shows "Imported" badge for templates with converted_prometheus provenance', () => {
+    const templates = [mockTemplates[0]]; // mimir-template
+    renderWithProvider(templates);
+
+    const templateRow = screen.getByRole('row', { name: /mimir-template/i });
+    const badge = within(templateRow).getByText('Imported');
+    expect(badge).toBeInTheDocument();
+  });
+
+  it('shows "Provisioned" badge for templates with other provenance', () => {
+    // api and file templates
+    [mockTemplates[1], mockTemplates[2]].forEach((template) => {
+      renderWithProvider([template]);
+
+      const templateRow = screen.getByRole('row', { name: new RegExp(template.title ?? '', 'i') });
+      const badge = within(templateRow).getByText('Provisioned');
+      expect(badge).toBeInTheDocument();
+    });
+  });
+
+  it('does not show badge for templates with KnownProvenance.None or empty string provenance', () => {
+    // no-provenance-template and undefined-provenance-template
+    [mockTemplates[3], mockTemplates[4]].forEach((template) => {
+      renderWithProvider([template]);
+
+      const templateRow = screen.getByRole('row', { name: new RegExp(template.title ?? '', 'i') });
+      expect(within(templateRow).queryByText('Provisioned')).not.toBeInTheDocument();
+    });
+  });
+});

public/app/features/alerting/unified/components/receivers/TemplatesTable.tsx

@@ -10,6 +10,7 @@ import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/d
 import { Authorize } from '../../components/Authorize';
 import { AlertmanagerAction } from '../../hooks/useAbilities';
 import { getAlertTableStyles } from '../../styles/table';
+import { isProvisionedResource } from '../../utils/k8s/utils';
 import { makeAMLink, stringifyErrorLike } from '../../utils/misc';
 import { CollapseToggle } from '../CollapseToggle';
 import { DetailsField } from '../DetailsField';
@@ -128,7 +129,8 @@ function TemplateRow({ notificationTemplate, idx, alertManagerName, onDeleteClic
   const isGrafanaAlertmanager = alertManagerName === GRAFANA_RULES_SOURCE_NAME;
 
   const [isExpanded, setIsExpanded] = useState(false);
-  const { isProvisioned } = useNotificationTemplateMetadata(notificationTemplate);
+  const { provenance } = useNotificationTemplateMetadata(notificationTemplate);
+  const isProvisioned = isProvisionedResource(provenance);
 
   const { uid, title: name, content: template, missing } = notificationTemplate;
   const misconfiguredBadgeText = t('alerting.templates.misconfigured-badge-text', 'Misconfigured');
@@ -139,7 +141,7 @@ function TemplateRow({ notificationTemplate, idx, alertManagerName, onDeleteClic
           <CollapseToggle isCollapsed={!isExpanded} onToggle={() => setIsExpanded(!isExpanded)} />
         </td>
         <td>
-          {name} {isProvisioned && <ProvisioningBadge />}{' '}
+          {name} {isProvisioned && <ProvisioningBadge tooltip provenance={provenance} />}{' '}
           {missing && !isGrafanaAlertmanager && (
             <Tooltip
               content={

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

@@ -9,7 +9,11 @@ import {
 } from 'app/features/alerting/unified/components/contact-points/useContactPoints';
 import { showManageContactPointPermissions } from 'app/features/alerting/unified/components/contact-points/utils';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { canEditEntity, canModifyProtectedEntity } from 'app/features/alerting/unified/utils/k8s/utils';
+import {
+  canEditEntity,
+  canModifyProtectedEntity,
+  isProvisionedResource,
+} from 'app/features/alerting/unified/utils/k8s/utils';
 import {
   GrafanaManagedContactPoint,
   GrafanaManagedReceiverConfig,
@@ -127,7 +131,8 @@ export const GrafanaReceiverForm = ({ contactPoint, readOnly = false, editMode }
   // If there is no contact point it means we're creating a new one, so scoped permissions doesn't exist yet
   const hasScopedEditPermissions = contactPoint ? canEditEntity(contactPoint) : true;
   const hasScopedEditProtectedPermissions = contactPoint ? canModifyProtectedEntity(contactPoint) : true;
-  const isEditable = !readOnly && hasScopedEditPermissions && !contactPoint?.provisioned;
+  const isProvisioned = isProvisionedResource(contactPoint?.provenance);
+  const isEditable = !readOnly && hasScopedEditPermissions && !isProvisioned;
   const isTestable = !readOnly;
   const canEditProtectedFields = editMode ? hasScopedEditProtectedPermissions : true;
 
@@ -170,10 +175,8 @@ export const GrafanaReceiverForm = ({ contactPoint, readOnly = false, editMode }
         </Alert>
       )}
 
-      {contactPoint?.provisioned && hasLegacyIntegrations(contactPoint, grafanaNotifiers) && (
-        <ImportedContactPointAlert />
-      )}
-      {contactPoint?.provisioned && !hasLegacyIntegrations(contactPoint, grafanaNotifiers) && (
+      {isProvisioned && hasLegacyIntegrations(contactPoint, grafanaNotifiers) && <ImportedContactPointAlert />}
+      {isProvisioned && !hasLegacyIntegrations(contactPoint, grafanaNotifiers) && (
         <ProvisioningAlert resource={ProvisionedResource.ContactPoint} />
       )}
 

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

@@ -7,8 +7,8 @@ import { grantUserPermissions } from 'app/features/alerting/unified/mocks';
 import { getAlertmanagerConfig } from 'app/features/alerting/unified/mocks/server/entities/alertmanagers';
 import { AlertmanagerProvider } from 'app/features/alerting/unified/state/AlertmanagerContext';
 import { NotificationChannelOption } from 'app/features/alerting/unified/types/alerting';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
 import { DEFAULT_TEMPLATES } from 'app/features/alerting/unified/utils/template-constants';
 import { AccessControlAction } from 'app/types/accessControl';
 
@@ -68,7 +68,7 @@ describe('getTemplateOptions function', () => {
         uid: title,
         title,
         content,
-        provenance: PROVENANCE_NONE,
+        provenance: KnownProvenance.None,
       };
     });
     const defaultTemplates = parseTemplates(DEFAULT_TEMPLATES);

public/app/features/alerting/unified/mocks/server/entities/k8s/routingtrees.ts

@@ -4,7 +4,8 @@ import {
   ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Route,
   ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1RoutingTree,
 } from 'app/features/alerting/unified/openapi/routesApi.gen';
-import { K8sAnnotations, PROVENANCE_NONE, ROOT_ROUTE_NAME } from 'app/features/alerting/unified/utils/k8s/constants';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
+import { K8sAnnotations, ROOT_ROUTE_NAME } from 'app/features/alerting/unified/utils/k8s/constants';
 import { AlertManagerCortexConfig, MatcherOperator, Route } from 'app/plugins/datasource/alertmanager/types';
 
 /**
@@ -66,7 +67,7 @@ export const getUserDefinedRoutingTree: (
       name: ROOT_ROUTE_NAME,
       namespace: 'default',
       annotations: {
-        [K8sAnnotations.Provenance]: PROVENANCE_NONE,
+        [K8sAnnotations.Provenance]: KnownProvenance.None,
       },
       // Resource versions are much shorter than this in reality, but this is an easy way
       // for us to mock the concurrency logic and check if the policies have updated since the last fetch

public/app/features/alerting/unified/mocks/server/handlers/k8s/receivers.k8s.ts

@@ -6,8 +6,9 @@ import {
 } from 'app/features/alerting/unified/mocks/server/entities/alertmanagers';
 import { ALERTING_API_SERVER_BASE_URL, getK8sResponse } from 'app/features/alerting/unified/mocks/server/utils';
 import { ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1Receiver } from 'app/features/alerting/unified/openapi/receiversApi.gen';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { K8sAnnotations, PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
+import { K8sAnnotations } from 'app/features/alerting/unified/utils/k8s/constants';
 
 const usedByPolicies = ['grafana-default-email'];
 const usedByRules = ['grafana-default-email'];
@@ -23,7 +24,7 @@ const getReceiversList = () => {
       const provenance =
         contactPoint.grafana_managed_receiver_configs?.find((integration) => {
           return integration.provenance;
-        })?.provenance || PROVENANCE_NONE;
+        })?.provenance || KnownProvenance.None;
       return {
         metadata: {
           // This isn't exactly accurate, but its the cleanest way to use the same data for AM config and K8S responses

public/app/features/alerting/unified/mocks/server/handlers/k8s/templates.k8s.ts

@@ -3,8 +3,9 @@ import { HttpResponse, http } from 'msw';
 import { getAlertmanagerConfig } from 'app/features/alerting/unified/mocks/server/entities/alertmanagers';
 import { ALERTING_API_SERVER_BASE_URL, getK8sResponse } from 'app/features/alerting/unified/mocks/server/utils';
 import { ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1TemplateGroup } from 'app/features/alerting/unified/openapi/templatesApi.gen';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { PROVENANCE_ANNOTATION, PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
+import { PROVENANCE_ANNOTATION } from 'app/features/alerting/unified/utils/k8s/constants';
 
 const config = getAlertmanagerConfig(GRAFANA_RULES_SOURCE_NAME);
 
@@ -14,7 +15,7 @@ const mappedTemplates = Object.entries(
 ).map<ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1TemplateGroup>(([title, template]) => ({
   metadata: {
     name: titleToK8sResourceName(title), // K8s uses unique identifiers for resources
-    annotations: { [PROVENANCE_ANNOTATION]: config.template_file_provenances?.[title] || PROVENANCE_NONE },
+    annotations: { [PROVENANCE_ANNOTATION]: config.template_file_provenances?.[title] || KnownProvenance.None },
   },
   spec: {
     title: title,

public/app/features/alerting/unified/mocks/server/handlers/k8s/timeIntervals.k8s.ts

@@ -4,7 +4,8 @@ import { base64UrlEncode } from '@grafana/alerting';
 import { filterBySelector } from 'app/features/alerting/unified/mocks/server/handlers/k8s/utils';
 import { ALERTING_API_SERVER_BASE_URL, getK8sResponse } from 'app/features/alerting/unified/mocks/server/utils';
 import { ComGithubGrafanaGrafanaPkgApisAlertingNotificationsV0Alpha1TimeInterval } from 'app/features/alerting/unified/openapi/timeIntervalsApi.gen';
-import { K8sAnnotations, PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
+import { KnownProvenance } from 'app/features/alerting/unified/types/knownProvenance';
+import { K8sAnnotations } from 'app/features/alerting/unified/utils/k8s/constants';
 
 /** UID of a time interval that we expect to follow all happy paths within tests/mocks */
 export const TIME_INTERVAL_UID_HAPPY_PATH = 'f4eae7a4895fa786';
@@ -21,7 +22,7 @@ const allTimeIntervals = getK8sResponse<ComGithubGrafanaGrafanaPkgApisAlertingNo
     {
       metadata: {
         annotations: {
-          [K8sAnnotations.Provenance]: PROVENANCE_NONE,
+          [K8sAnnotations.Provenance]: KnownProvenance.None,
         },
         name: base64UrlEncode(TIME_INTERVAL_NAME_HAPPY_PATH),
         uid: TIME_INTERVAL_UID_HAPPY_PATH,

public/app/features/alerting/unified/rule-list/filter/SavedSearchItem.tsx

@@ -121,11 +121,10 @@ export function SavedSearchItem({
         {/* Apply button (magnifying glass) */}
         <IconButton
           name="search"
-          aria-label={t('alerting.saved-searches.apply-aria-label', 'Apply search "{{name}}"', {
+          tooltip={t('alerting.saved-searches.apply-tooltip', 'Apply search "{{name}}"', {
             name: search.name,
           })}
           onClick={onApply}
-          tooltip={t('alerting.saved-searches.apply-tooltip', 'Apply this search')}
           size="md"
           variant="secondary"
           disabled={isDisabled}

public/app/features/alerting/unified/rule-list/filter/SavedSearches.test.tsx

@@ -19,7 +19,7 @@ const ui = {
   saveInput: byPlaceholderText(/enter a name/i),
   // Action buttons
   cancelButton: byRole('button', { name: /cancel/i }),
-  applyButtons: byRole('button', { name: /apply this search/i }),
+  applyButtons: byRole('button', { name: /apply search/i }),
   actionMenuButtons: byRole('button', { name: /actions/i }),
   deleteButton: byRole('button', { name: /delete/i }),
   // Menu items (using byRole for proper accessibility testing)

public/app/features/alerting/unified/types/knownProvenance.ts

@@ -0,0 +1,6 @@
+export enum KnownProvenance {
+  None = 'none' /** Provenance value given for entities that were not provisioned */,
+  API = 'api',
+  File = 'file',
+  ConvertedPrometheus = 'converted_prometheus',
+}

public/app/features/alerting/unified/utils/k8s/constants.ts

@@ -4,9 +4,6 @@
  * */
 export const PROVENANCE_ANNOTATION = 'grafana.com/provenance';
 
-/** Value of {@link PROVENANCE_ANNOTATION} given for entities that were not provisioned */
-export const PROVENANCE_NONE = 'none';
-
 export enum K8sAnnotations {
   Provenance = 'grafana.com/provenance',
 

public/app/features/alerting/unified/utils/k8s/utils.test.ts

@@ -1,4 +1,6 @@
-import { encodeFieldSelector } from './utils';
+import { KnownProvenance } from '../../types/knownProvenance';
+
+import { encodeFieldSelector, isProvisionedResource } from './utils';
 
 describe('encodeFieldSelector', () => {
   it('should escape backslashes', () => {
@@ -25,3 +27,29 @@ describe('encodeFieldSelector', () => {
     expect(encodeFieldSelector('foo=bar,bar=baz,qux\\foo')).toBe('foo\\=bar\\,bar\\=baz\\,qux\\\\foo');
   });
 });
+
+describe('isProvisionedResource', () => {
+  it('should return true when provenance is API', () => {
+    expect(isProvisionedResource(KnownProvenance.API)).toBe(true);
+  });
+
+  it('should return true when provenance is File', () => {
+    expect(isProvisionedResource(KnownProvenance.File)).toBe(true);
+  });
+
+  it('should return true when provenance is ConvertedPrometheus', () => {
+    expect(isProvisionedResource(KnownProvenance.ConvertedPrometheus)).toBe(true);
+  });
+
+  it('should return false when provenance is none', () => {
+    expect(isProvisionedResource(KnownProvenance.None)).toBe(false);
+  });
+
+  it('should return false when provenance is undefined', () => {
+    expect(isProvisionedResource(undefined)).toBe(false);
+  });
+
+  it('should return true for any other non-empty string', () => {
+    expect(isProvisionedResource('custom-provenance')).toBe(true);
+  });
+});

public/app/features/alerting/unified/utils/k8s/utils.ts

@@ -1,6 +1,8 @@
 import { IoK8SApimachineryPkgApisMetaV1ObjectMeta } from 'app/features/alerting/unified/openapi/receiversApi.gen';
 import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
-import { K8sAnnotations, PROVENANCE_NONE } from 'app/features/alerting/unified/utils/k8s/constants';
+import { K8sAnnotations } from 'app/features/alerting/unified/utils/k8s/constants';
+
+import { KnownProvenance } from '../../types/knownProvenance';
 
 /**
  * Should we call the kubernetes-style API for managing alertmanager entities?
@@ -22,7 +24,7 @@ type EntityToCheck = {
  */
 export const isK8sEntityProvisioned = (k8sEntity: EntityToCheck) => {
   const provenance = getAnnotation(k8sEntity, K8sAnnotations.Provenance);
-  return Boolean(provenance && provenance !== PROVENANCE_NONE);
+  return isProvisionedResource(provenance);
 };
 
 export const ANNOTATION_PREFIX_ACCESS = 'grafana.com/access/';
@@ -59,3 +61,7 @@ export const stringifyFieldSelector = (fieldSelectors: FieldSelector[]): string
     .map(([key, value, operator = '=']) => `${key}${operator}${encodeFieldSelector(value)}`)
     .join(',');
 };
+
+export function isProvisionedResource(provenance?: string): boolean {
+  return Boolean(provenance && provenance !== KnownProvenance.None);
+}

public/app/features/dashboard-scene/scene/layout-tabs/TabItemEditor.tsx

@@ -134,7 +134,7 @@ function TabRepeatSelect({ tab, id }: { tab: TabItem; id?: string }) {
           <TextLink
             external
             href={
-              'https://grafana.com/docs/grafana/latest/visualizations/dashboards/build-dashboards/create-dynamic-dashboard/#repeating-rows-and-tabs-and-the-dashboard-special-data-source'
+              'https://grafana.com/docs/grafana/next/visualizations/dashboards/build-dashboards/create-dashboard/#repeating-rows-and-tabs-and-the-dashboard-special-data-source'
             }
           >
             <Trans i18nKey="dashboard.tabs-layout.tab.repeat.learn-more">Learn more</Trans>

public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts

@@ -781,6 +781,10 @@ export function tabItemToSaveModel(
     panels: [],
   };
 
+  if (tab.state.repeatByVariable) {
+    rowPanel.repeat = tab.state.repeatByVariable;
+  }
+
   panelsArray.push(rowPanel);
 
   // The base Y position for panels in this tab (after the row panel)
@@ -912,6 +916,15 @@ function autoGridLayoutToPanels(layout: AutoGridLayoutManager, isSnapshot = fals
         },
         isSnapshot
       );
+
+      // Handle repeat properties for AutoGridItem
+      // AutoGrid always uses horizontal direction, and maxPerRow is derived from maxColumnCount
+      if (item.state.variableName) {
+        panel.repeat = item.state.variableName;
+        panel.repeatDirection = 'h';
+        panel.maxPerRow = maxColumnCount;
+      }
+
       panels.push(panel);
 
       // Move to next position

public/app/features/dashboard-scene/solo/SoloPanelPageLogo.test.tsx

@@ -33,7 +33,7 @@ global.ResizeObserver = jest.fn().mockImplementation((callback) => {
 });
 
 // Helper function to assign a mock div to a ref
-function assignMockDivToRef(ref: React.RefObject<HTMLDivElement>, mockDiv: HTMLDivElement) {
+function assignMockDivToRef(ref: React.RefObject<HTMLDivElement | null>, mockDiv: HTMLDivElement) {
   // Use type assertion to bypass readonly restriction in tests
   (ref as { current: HTMLDivElement | null }).current = mockDiv;
 }

public/app/features/dashboard-scene/solo/SoloPanelPageLogo.tsx

@@ -8,7 +8,7 @@ import grafanaTextLogoDarkSvg from 'img/grafana_text_logo_dark.svg';
 import grafanaTextLogoLightSvg from 'img/grafana_text_logo_light.svg';
 
 interface SoloPanelPageLogoProps {
-  containerRef: React.RefObject<HTMLDivElement>;
+  containerRef: React.RefObject<HTMLDivElement | null>;
   isHovered: boolean;
   hideLogo?: UrlQueryValue;
 }

public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx

@@ -61,7 +61,7 @@ interface State {
 
 class UnThemedTransformationsEditor extends React.PureComponent<TransformationsEditorProps, State> {
   subscription?: Unsubscribable;
-  ref: RefObject<HTMLDivElement>;
+  ref: RefObject<HTMLDivElement | null>;
 
   constructor(props: TransformationsEditorProps) {
     super(props);

public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx

@@ -43,7 +43,7 @@ export const LibraryPanelsView = ({
     }
   );
   const asyncDispatch = useMemo(() => asyncDispatcher(dispatch), [dispatch]);
-  const abortControllerRef = useRef<AbortController>();
+  const abortControllerRef = useRef<AbortController | null>(null);
 
   useDebounce(
     () => {

public/app/features/live/LiveConnectionWarning.tsx

@@ -12,7 +12,7 @@ export interface Props {}
 
 export const LiveConnectionWarning = memo(function LiveConnectionWarning() {
   const [show, setShow] = useState<boolean | undefined>(undefined);
-  const subscriptionRef = useRef<Unsubscribable>();
+  const subscriptionRef = useRef<Unsubscribable | null>(null);
   const styles = useStyles2(getStyle);
 
   useEffect(() => {

public/app/features/search/hooks/useSearchKeyboardSelection.ts

@@ -38,7 +38,7 @@ export function useSearchKeyboardNavigation(
 ): ItemSelection {
   const highlightIndexRef = useRef<ItemSelection>({ x: 0, y: -1 });
   const [highlightIndex, setHighlightIndex] = useState<ItemSelection>({ x: 0, y: -1 });
-  const urlsRef = useRef<Field>();
+  const urlsRef = useRef<Field | null>(null);
 
   // Clear selection when the search results change
   useEffect(() => {

public/app/features/search/service/unified.ts

@@ -1,6 +1,9 @@
 import { isEmpty } from 'lodash';
 
-import { BASE_URL as v0alphaBaseURL } from '@grafana/api-clients/rtkq/dashboard/v0alpha1';
+import {
+  API_GROUP as DASHBOARD_API_GROUP,
+  BASE_URL as v0alphaBaseURL,
+} from '@grafana/api-clients/rtkq/dashboard/v0alpha1';
 import { generatedAPI as legacyUserAPI } from '@grafana/api-clients/rtkq/legacy/user';
 import { DataFrame, DataFrameView, getDisplayProcessor, SelectableValue, toDataFrame } from '@grafana/data';
 import { t } from '@grafana/i18n';
@@ -85,10 +88,11 @@ export class UnifiedSearcher implements GrafanaSearcher {
           fieldSelector: `metadata.name=${name}`,
         })
       );
-      starsIds =
-        result.data.items?.[0].spec.resource.find(
-          (info) => info.group === 'dashboard.grafana.app' && info.kind === 'Dashboard'
-        )?.names || [];
+      const items = result.data.items;
+      starsIds = items?.length
+        ? items[0].spec.resource.find(({ group, kind }) => group === DASHBOARD_API_GROUP && kind === 'Dashboard')
+            ?.names || []
+        : [];
     } else {
       starsIds = await dispatch(legacyUserAPI.endpoints.getStars.initiate()).unwrap();
     }
@@ -331,7 +335,7 @@ export class UnifiedSearcher implements GrafanaSearcher {
     }
 
     if (query.deleted) {
-      uri = `${getAPIBaseURL('dashboard.grafana.app', 'v1beta1')}/dashboards/?labelSelector=grafana.app/get-trash=true`;
+      uri = `${getAPIBaseURL(DASHBOARD_API_GROUP, 'v1beta1')}/dashboards/?labelSelector=grafana.app/get-trash=true`;
     }
     return uri;
   }

public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx

@@ -77,7 +77,7 @@ export const SuggestionsInput = ({
   const theme = useTheme2();
   const styles = getStyles(theme, inputHeight);
 
-  const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement>();
+  const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement | null>(null);
 
   useEffect(() => {
     scrollRef.current?.scrollTo(0, scrollTop);

public/app/features/variables/pickers/shared/VariableOptions.tsx

@@ -11,7 +11,7 @@ import checkboxWhitePng from 'img/checkbox_white.png';
 
 import { ALL_VARIABLE_VALUE } from '../../constants';
 
-export interface Props extends React.HTMLProps<HTMLUListElement>, Themeable2 {
+export interface Props extends Omit<React.HTMLProps<HTMLUListElement>, 'onToggle'>, Themeable2 {
   multi: boolean;
   values: VariableOption[];
   selectedValues: VariableOption[];

public/app/plugins/datasource/alertmanager/types.ts

@@ -108,7 +108,7 @@ export interface GrafanaManagedContactPoint {
   /** If parsed from k8s API, we'll have an ID property */
   id?: string;
   metadata?: IoK8SApimachineryPkgApisMetaV1ObjectMeta;
-  provisioned?: boolean;
+  provenance?: string;
   grafana_managed_receiver_configs?: GrafanaManagedReceiverConfig[];
 }
 
@@ -148,7 +148,7 @@ export type Route = {
   provenance?: string;
   /** this is used to add additional metadata to the routes without interfering with original route definition (symbols aren't iterable)  */
   [ROUTES_META_SYMBOL]?: {
-    provisioned?: boolean;
+    provenance?: string;
     resourceVersion?: string;
     name?: string;
   };

public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.test.tsx

@@ -0,0 +1,247 @@
+import { render, screen, waitFor, cleanup } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { CoreApp, LoadingState, PanelData } from '@grafana/data';
+import { config, reportInteraction } from '@grafana/runtime';
+
+import { AzureQueryType, LogsEditorMode } from '../../dataquery.gen';
+import { selectors } from '../../e2e/selectors';
+import createMockQuery from '../../mocks/query';
+import { AzureMonitorQuery } from '../../types/query';
+import { selectOptionInTest } from '../../utils/testUtils';
+
+import { QueryHeader } from './QueryHeader';
+
+jest.mock('@grafana/runtime', () => ({
+  ...jest.requireActual('@grafana/runtime'),
+  reportInteraction: jest.fn(),
+}));
+
+describe('Azure Monitor QueryHeader', () => {
+  const setAzureLogsCheatSheetModalOpen = jest.fn();
+  const onRunQuery = jest.fn();
+
+  const renderComponent = (query: AzureMonitorQuery, props?: Partial<React.ComponentProps<typeof QueryHeader>>) => {
+    return render(
+      <QueryHeader
+        query={query}
+        onQueryChange={props?.onQueryChange ?? jest.fn()}
+        setAzureLogsCheatSheetModalOpen={setAzureLogsCheatSheetModalOpen}
+        data={props?.data}
+        onRunQuery={onRunQuery}
+        app={props?.app}
+      />
+    );
+  };
+
+  beforeEach(() => {
+    config.featureToggles = {};
+  });
+
+  afterEach(() => {
+    cleanup();
+    jest.clearAllMocks();
+  });
+
+  it('renders the service selector', async () => {
+    const query = createMockQuery();
+
+    renderComponent(query);
+
+    expect(screen.getByTestId(selectors.components.queryEditor.header.select)).toBeInTheDocument();
+    expect(screen.getByLabelText(/Service/i)).toBeInTheDocument();
+  });
+
+  it('changes query type when a new service is selected', async () => {
+    const query = createMockQuery();
+    const onQueryChange = jest.fn();
+
+    renderComponent(query, { onQueryChange });
+
+    const serviceSelect = await screen.findByLabelText(/Service/i);
+
+    await selectOptionInTest(serviceSelect, 'Logs');
+
+    await waitFor(() => {
+      expect(onQueryChange).toHaveBeenCalled();
+    });
+
+    const lastCall = onQueryChange.mock.calls[onQueryChange.mock.calls.length - 1][0];
+
+    expect(lastCall).toEqual(
+      expect.objectContaining({
+        queryType: AzureQueryType.LogAnalytics,
+      })
+    );
+  });
+
+  it('initializes logs editor mode to Raw when a raw query exists and builder is enabled', async () => {
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        query: 'SecurityEvent | take 10',
+      },
+    };
+
+    const onQueryChange = jest.fn();
+
+    renderComponent(query, { onQueryChange });
+
+    await waitFor(() =>
+      expect(onQueryChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          azureLogAnalytics: expect.objectContaining({
+            mode: LogsEditorMode.Raw,
+          }),
+        })
+      )
+    );
+  });
+
+  it('renders the logs editor mode radio buttons when builder is enabled', async () => {
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Builder,
+      },
+    };
+
+    renderComponent(query);
+
+    expect(screen.getByRole('radiogroup')).toBeInTheDocument();
+
+    expect(screen.getByLabelText('Builder')).toBeInTheDocument();
+    expect(screen.getByLabelText('KQL')).toBeInTheDocument();
+  });
+
+  it('shows the kick start button when in Logs + Raw mode', async () => {
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Raw,
+      },
+    };
+
+    renderComponent(query);
+
+    expect(screen.getByRole('button', { name: /Kick start your query/i })).toBeInTheDocument();
+  });
+
+  it('opens the logs cheat sheet modal and reports interaction when kick start button is clicked', async () => {
+    const user = userEvent.setup();
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Raw,
+      },
+    };
+
+    renderComponent(query);
+
+    await user.click(screen.getByRole('button', { name: /Kick start your query/i }));
+
+    expect(setAzureLogsCheatSheetModalOpen).toHaveBeenCalled();
+    expect(reportInteraction).toHaveBeenCalledWith(
+      'grafana_azure_logs_query_patterns_opened',
+      expect.objectContaining({
+        version: 'v2',
+      })
+    );
+  });
+
+  it('shows confirmation modal when switching from Raw to Builder with existing KQL', async () => {
+    const user = userEvent.setup();
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Raw,
+        query: 'SecurityEvent | take 10',
+      },
+    };
+
+    renderComponent(query);
+
+    await user.click(screen.getByLabelText('Builder'));
+
+    expect(screen.getByText(/Switch editor mode\?/i)).toBeInTheDocument();
+  });
+
+  it('applies mode change when confirming the switch modal', async () => {
+    const user = userEvent.setup();
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Raw,
+        query: 'SecurityEvent | take 10',
+      },
+    };
+
+    const onQueryChange = jest.fn();
+
+    renderComponent(query, { onQueryChange });
+
+    await user.click(screen.getByLabelText('Builder'));
+    await user.click(screen.getByText(/Switch to Builder/i));
+
+    await waitFor(() =>
+      expect(onQueryChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          azureLogAnalytics: expect.objectContaining({
+            mode: LogsEditorMode.Builder,
+            query: undefined,
+          }),
+        })
+      )
+    );
+  });
+
+  it('renders the Run query button in Builder mode when not in Explore', async () => {
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Builder,
+      },
+    };
+
+    renderComponent(query, { app: CoreApp.Dashboard });
+
+    expect(screen.getByTestId(selectors.components.queryEditor.logsQueryEditor.runQuery.button)).toBeInTheDocument();
+  });
+
+  it('disables the Run query button spinner while loading', async () => {
+    config.featureToggles.azureMonitorLogsBuilderEditor = true;
+
+    const query: AzureMonitorQuery = {
+      ...createMockQuery(),
+      queryType: AzureQueryType.LogAnalytics,
+      azureLogAnalytics: {
+        mode: LogsEditorMode.Builder,
+      },
+    };
+
+    renderComponent(query, {
+      app: CoreApp.Dashboard,
+      data: { state: LoadingState.Loading } as PanelData,
+    });
+
+    expect(screen.getByTestId(selectors.components.queryEditor.logsQueryEditor.runQuery.button)).toBeInTheDocument();
+  });
+});

public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryHeader.tsx

@@ -84,12 +84,9 @@ export const QueryHeader = ({
     }
 
     const goingToBuilder = newMode === LogsEditorMode.Builder;
-    const goingToRaw = newMode === LogsEditorMode.Raw;
-
     const hasRawKql = !!query.azureLogAnalytics?.query;
-    const hasBuilderQuery = !!query.azureLogAnalytics?.builderQuery;
 
-    if ((goingToBuilder && hasRawKql) || (goingToRaw && hasBuilderQuery)) {
+    if (goingToBuilder && hasRawKql) {
       setPendingModeChange(newMode);
       setShowModeSwitchWarning(true);
     } else {
@@ -103,7 +100,7 @@ export const QueryHeader = ({
       azureLogAnalytics: {
         ...query.azureLogAnalytics,
         mode,
-        query: '',
+        query: mode === LogsEditorMode.Builder ? undefined : query.azureLogAnalytics?.query,
         builderQuery: mode === LogsEditorMode.Raw ? undefined : query.azureLogAnalytics?.builderQuery,
         dashboardTime: mode === LogsEditorMode.Builder ? true : undefined,
       },
@@ -123,10 +120,7 @@ export const QueryHeader = ({
                   'components.query-header.body-switching-to-builder',
                   'Switching to Builder will discard your current KQL query and clear the KQL editor. Are you sure?'
                 )
-              : t(
-                  'components.query-header.body-switching-to-kql',
-                  'Switching to KQL will discard your current builder settings. Are you sure?'
-                )
+              : null
           }
           confirmText={t('components.query-header.confirmText-switch-to', 'Switch to {{newMode}}', {
             newMode: pendingModeChange === LogsEditorMode.Builder ? 'Builder' : 'KQL',

public/app/plugins/datasource/azuremonitor/locales/en-US/grafana-azure-monitor-datasource.json

@@ -204,7 +204,6 @@
     "query-header": {
       "aria-label-kick-start": "Azure logs kick start your query button",
       "body-switching-to-builder": "Switching to Builder will discard your current KQL query and clear the KQL editor. Are you sure?",
-      "body-switching-to-kql": "Switching to KQL will discard your current builder settings. Are you sure?",
       "button-kick-start-your-query": "Kick start your query",
       "button-run-query": "Run query",
       "confirmText-switch-to": "Switch to {{newMode}}",

public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/LogsQLCodeEditor.tsx

@@ -20,8 +20,8 @@ interface CodeEditorProps {
 export const LogsQLCodeEditor = (props: CodeEditorProps) => {
   const { query, datasource, onChange } = props;
 
-  const monacoRef = useRef<Monaco>();
-  const disposalRef = useRef<monacoType.IDisposable>();
+  const monacoRef = useRef<Monaco | null>(null);
+  const disposalRef = useRef<monacoType.IDisposable | undefined>(undefined);
 
   const onFocus = useCallback(async () => {
     disposalRef.current = await reRegisterCompletionProvider(

public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx

@@ -42,8 +42,8 @@ interface LogsCodeEditorProps {
 export const PPLQueryEditor = (props: LogsCodeEditorProps) => {
   const { query, datasource, onChange } = props;
 
-  const monacoRef = useRef<Monaco>();
-  const disposalRef = useRef<monacoType.IDisposable>();
+  const monacoRef = useRef<Monaco | null>(null);
+  const disposalRef = useRef<monacoType.IDisposable | undefined>(undefined);
 
   const onFocus = useCallback(async () => {
     disposalRef.current = await reRegisterCompletionProvider(

public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/SQLCodeEditor.tsx

@@ -20,8 +20,8 @@ interface SQLCodeEditorProps {
 export const SQLQueryEditor = (props: SQLCodeEditorProps) => {
   const { query, datasource, onChange } = props;
 
-  const monacoRef = useRef<Monaco>();
-  const disposalRef = useRef<monacoType.IDisposable>();
+  const monacoRef = useRef<Monaco | null>(null);
+  const disposalRef = useRef<monacoType.IDisposable | undefined>(undefined);
 
   const onFocus = useCallback(async () => {
     disposalRef.current = await reRegisterCompletionProvider(

public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx

@@ -94,7 +94,7 @@ const EDITOR_HEIGHT_OFFSET = 2;
  * Hook that returns function that will set up monaco autocomplete for the label selector
  */
 function useAutocomplete(getLabelValues: (label: string) => Promise<string[]>, labels?: string[]) {
-  const providerRef = useRef<CompletionProvider>();
+  const providerRef = useRef<CompletionProvider | null>(null);
   if (providerRef.current === undefined) {
     providerRef.current = new CompletionProvider();
   }

public/app/plugins/datasource/loki/components/LokiContextUi.tsx

@@ -126,7 +126,7 @@ export function LokiContextUi(props: LokiContextUiProps) {
     window.localStorage.getItem(SHOULD_INCLUDE_PIPELINE_OPERATIONS) === 'true'
   );
 
-  const timerHandle = useRef<number>();
+  const timerHandle = useRef<number | null>(null);
   const previousInitialized = useRef<boolean>(false);
   const previousContextFilters = useRef<ContextFilter[]>([]);
 
@@ -191,14 +191,18 @@ export function LokiContextUi(props: LokiContextUiProps) {
     }, 1500);
 
     return () => {
-      clearTimeout(timerHandle.current);
+      if (timerHandle.current) {
+        clearTimeout(timerHandle.current);
+      }
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [contextFilters, initialized]);
 
   useEffect(() => {
     return () => {
-      clearTimeout(timerHandle.current);
+      if (timerHandle.current) {
+        clearTimeout(timerHandle.current);
+      }
       onClose();
     };
   }, [onClose]);

public/app/plugins/datasource/tempo/traceql/TraceQLEditor.tsx

@@ -52,7 +52,7 @@ export function TraceQLEditor(props: Props) {
   const onRunQueryRef = useRef(onRunQuery);
   onRunQueryRef.current = onRunQuery;
 
-  const errorTimeoutId = useRef<number>();
+  const errorTimeoutId = useRef<number | null>(null);
 
   return (
     <>
@@ -103,7 +103,9 @@ export function TraceQLEditor(props: Props) {
             }
 
             // Remove previous callback if existing, to prevent squiggles from been shown while the user is still typing
-            window.clearTimeout(errorTimeoutId.current);
+            if (errorTimeoutId.current) {
+              window.clearTimeout(errorTimeoutId.current);
+            }
 
             const errorNodes = getErrorNodes(model.getValue());
             const cursorPosition = changeEvent.changes[0].rangeOffset;

public/app/plugins/panel/heatmap/renderHistogram.tsx

@@ -1,5 +1,5 @@
 export function renderHistogram(
-  can: React.RefObject<HTMLCanvasElement>,
+  can: React.RefObject<HTMLCanvasElement | null>,
   histCanWidth: number,
   histCanHeight: number,
   xVals: number[],