Alerting: Clean up dangling references when queries are removed

When a data query or expression is deleted, other expressions that
reference it would contain invalid/dangling references, potentially
causing errors or unexpected behavior.

This change introduces automatic cleanup of dangling references across
all expression types:

- Math expressions: Removes variable references ($A, ${A}) from the
  expression string
- Reduce/Resample/Threshold: Clears the expression field if it
  references the removed query
- Classic conditions: Filters out removed refIds from params array
- Handles cascading removals when expressions reference other
  expressions

The cleanup is triggered in two scenarios:
1. When explicitly removing an expression via removeExpression action
2. When updating data queries via setDataQueries (e.g., user deletes
   a query in the query editor)

Also migrates the Reduce component from Select to Combobox for better
UX consistency, with improved layout spacing.

.github/actions/change-detection/action.yml

@@ -95,7 +95,6 @@ runs:
             - 'nx.json'
             - 'tsconfig.json'
             - '.yarn/**'
-            - 'apps/dashboard/pkg/migration/**'
             - '${{ inputs.self }}'
           e2e:
             - 'e2e/**'

.github/workflows/cleanup-branches.yml

@@ -14,5 +14,5 @@ jobs:
       - uses: actions/checkout@v5
       - uses: grafana/shared-workflows/actions/cleanup-branches@cleanup-branches/v0.2.1
         with:
-          dry-run: true
+          dry-run: false
           max-date: "1 month ago"

apps/dashboard/pkg/migration/conversion/testdata/input/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.json

@@ -300,9 +300,15 @@
         "y": 0
       },
       "id": 6,
-      "options": {},
-      "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

apps/dashboard/pkg/migration/conversion/testdata/input/v1beta1.panel-target-missing-refid.json

@@ -1,156 +0,0 @@
-{
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "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": 288,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "gdev-testdata"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "barWidthFactor": 0.6,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "showValues": false,
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "hideZeros": false,
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "pluginVersion": "12.4.0-pre",
-        "targets": [
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          },
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          }
-        ],
-        "title": "New panel",
-        "type": "timeseries"
-      }
-    ],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "Panel ds inheritance ",
-    "uid": "ad5vfcn",
-    "version": 2
-  },
-  "status": {}
-}

apps/dashboard/pkg/migration/conversion/testdata/input/v2beta1.value-mapping-and-overrides.json

@@ -1,864 +0,0 @@
-{
-    "kind": "DashboardWithAccessInfo",
-    "apiVersion": "dashboard.grafana.app/v2beta1",
-    "metadata": {
-      "name": "value-mapping-test",
-      "namespace": "default",
-      "uid": "value-mapping-test",
-      "resourceVersion": "1765384157199094",
-      "generation": 2,
-      "creationTimestamp": "2025-11-19T20:09:28Z",
-      "labels": {
-        "grafana.app/deprecatedInternalID": "646372978987008"
-      }
-    },
-    "spec": {
-      "annotations": [
-        {
-          "kind": "AnnotationQuery",
-          "spec": {
-            "query": {
-              "kind": "DataQuery",
-              "group": "grafana",
-              "version": "v0",
-              "datasource": {
-                "name": "-- Grafana --"
-              },
-              "spec": {}
-            },
-            "enable": true,
-            "hide": true,
-            "iconColor": "rgba(0, 211, 255, 1)",
-            "name": "Annotations \u0026 Alerts",
-            "builtIn": true,
-            "legacyOptions": {
-              "type": "dashboard"
-            }
-          }
-        }
-      ],
-      "cursorSync": "Off",
-      "description": "Test dashboard for all value mapping types and override matcher types",
-      "editable": true,
-      "elements": {
-        "panel-1": {
-          "kind": "Panel",
-          "spec": {
-            "id": 1,
-            "title": "ValueMap Example",
-            "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "up"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "stat",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {
-                    "mappings": [
-                      {
-                        "type": "value",
-                        "options": {
-                          "critical": {
-                            "text": "Critical!",
-                            "color": "red",
-                            "index": 0
-                          },
-                          "ok": {
-                            "text": "OK",
-                            "color": "green",
-                            "index": 2
-                          },
-                          "warning": {
-                            "text": "Warning",
-                            "color": "orange",
-                            "index": 1
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byName",
-                        "options": "status"
-                      },
-                      "properties": [
-                        {
-                          "id": "custom.width",
-                          "value": 100
-                        },
-                        {
-                          "id": "custom.align",
-                          "value": "center"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        },
-        "panel-2": {
-          "kind": "Panel",
-          "spec": {
-            "id": 2,
-            "title": "RangeMap Example",
-            "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "cpu_usage_percent"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "gauge",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {
-                    "mappings": [
-                      {
-                        "type": "range",
-                        "options": {
-                          "from": 0,
-                          "to": 50,
-                          "result": {
-                            "text": "Low",
-                            "color": "green",
-                            "index": 0
-                          }
-                        }
-                      },
-                      {
-                        "type": "range",
-                        "options": {
-                          "from": 50,
-                          "to": 80,
-                          "result": {
-                            "text": "Medium",
-                            "color": "orange",
-                            "index": 1
-                          }
-                        }
-                      },
-                      {
-                        "type": "range",
-                        "options": {
-                          "from": 80,
-                          "to": 100,
-                          "result": {
-                            "text": "High",
-                            "color": "red",
-                            "index": 2
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byRegexp",
-                        "options": "/^cpu_/"
-                      },
-                      "properties": [
-                        {
-                          "id": "unit",
-                          "value": "percent"
-                        },
-                        {
-                          "id": "decimals",
-                          "value": 2
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        },
-        "panel-3": {
-          "kind": "Panel",
-          "spec": {
-            "id": 3,
-            "title": "RegexMap Example",
-            "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "log_level"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "stat",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {
-                    "mappings": [
-                      {
-                        "type": "regex",
-                        "options": {
-                          "pattern": "/^error.*/",
-                          "result": {
-                            "text": "Error",
-                            "color": "red",
-                            "index": 0
-                          }
-                        }
-                      },
-                      {
-                        "type": "regex",
-                        "options": {
-                          "pattern": "/^warn.*/",
-                          "result": {
-                            "text": "Warning",
-                            "color": "orange",
-                            "index": 1
-                          }
-                        }
-                      },
-                      {
-                        "type": "regex",
-                        "options": {
-                          "pattern": "/^info.*/",
-                          "result": {
-                            "text": "Info",
-                            "color": "blue",
-                            "index": 2
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byType",
-                        "options": "string"
-                      },
-                      "properties": [
-                        {
-                          "id": "custom.cellOptions",
-                          "value": {
-                            "type": "color-text"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        },
-        "panel-4": {
-          "kind": "Panel",
-          "spec": {
-            "id": 4,
-            "title": "SpecialValueMap Example",
-            "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "some_metric"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "stat",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {
-                    "mappings": [
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "null",
-                          "result": {
-                            "text": "No Data",
-                            "color": "gray",
-                            "index": 0
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "nan",
-                          "result": {
-                            "text": "Not a Number",
-                            "color": "gray",
-                            "index": 1
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "null+nan",
-                          "result": {
-                            "text": "N/A",
-                            "color": "gray",
-                            "index": 2
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "true",
-                          "result": {
-                            "text": "Yes",
-                            "color": "green",
-                            "index": 3
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "false",
-                          "result": {
-                            "text": "No",
-                            "color": "red",
-                            "index": 4
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "empty",
-                          "result": {
-                            "text": "Empty",
-                            "color": "gray",
-                            "index": 5
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byFrameRefID",
-                        "options": "A"
-                      },
-                      "properties": [
-                        {
-                          "id": "color",
-                          "value": {
-                            "fixedColor": "blue",
-                            "mode": "fixed"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        },
-        "panel-6": {
-          "kind": "Panel",
-          "spec": {
-            "id": 6,
-            "title": "Empty Properties Override Example",
-            "description": "Panel with override that has empty properties array - tests conversion of overrides without any property modifications",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "empty_override_metric"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "stat",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {},
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byName",
-                        "options": "field_with_empty_override"
-                      },
-                      "properties": []
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        },
-        "panel-5": {
-          "kind": "Panel",
-          "spec": {
-            "id": 5,
-            "title": "Combined Mappings and Overrides Example",
-            "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
-            "links": [],
-            "data": {
-              "kind": "QueryGroup",
-              "spec": {
-                "queries": [
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "combined_metric"
-                        }
-                      },
-                      "refId": "A",
-                      "hidden": false
-                    }
-                  },
-                  {
-                    "kind": "PanelQuery",
-                    "spec": {
-                      "query": {
-                        "kind": "DataQuery",
-                        "group": "prometheus",
-                        "version": "v0",
-                        "datasource": {
-                          "name": "prometheus-uid"
-                        },
-                        "spec": {
-                          "expr": "secondary_metric"
-                        }
-                      },
-                      "refId": "B",
-                      "hidden": false
-                    }
-                  }
-                ],
-                "transformations": [],
-                "queryOptions": {}
-              }
-            },
-            "vizConfig": {
-              "kind": "VizConfig",
-              "group": "table",
-              "version": "",
-              "spec": {
-                "options": {},
-                "fieldConfig": {
-                  "defaults": {
-                    "mappings": [
-                      {
-                        "type": "value",
-                        "options": {
-                          "failure": {
-                            "text": "Failure",
-                            "color": "red",
-                            "index": 1
-                          },
-                          "success": {
-                            "text": "Success",
-                            "color": "green",
-                            "index": 0
-                          }
-                        }
-                      },
-                      {
-                        "type": "range",
-                        "options": {
-                          "from": 0,
-                          "to": 100,
-                          "result": {
-                            "text": "In Range",
-                            "color": "blue",
-                            "index": 2
-                          }
-                        }
-                      },
-                      {
-                        "type": "regex",
-                        "options": {
-                          "pattern": "/^[A-Z]{3}-\\d+$/",
-                          "result": {
-                            "text": "ID Format",
-                            "color": "purple",
-                            "index": 3
-                          }
-                        }
-                      },
-                      {
-                        "type": "special",
-                        "options": {
-                          "match": "null",
-                          "result": {
-                            "text": "Missing",
-                            "color": "gray",
-                            "index": 4
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "overrides": [
-                    {
-                      "matcher": {
-                        "id": "byName",
-                        "options": "status"
-                      },
-                      "properties": [
-                        {
-                          "id": "custom.width",
-                          "value": 120
-                        },
-                        {
-                          "id": "custom.cellOptions",
-                          "value": {
-                            "type": "color-background"
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "matcher": {
-                        "id": "byRegexp",
-                        "options": "/^value_/"
-                      },
-                      "properties": [
-                        {
-                          "id": "unit",
-                          "value": "short"
-                        },
-                        {
-                          "id": "min",
-                          "value": 0
-                        },
-                        {
-                          "id": "max",
-                          "value": 100
-                        }
-                      ]
-                    },
-                    {
-                      "matcher": {
-                        "id": "byType",
-                        "options": "number"
-                      },
-                      "properties": [
-                        {
-                          "id": "decimals",
-                          "value": 2
-                        },
-                        {
-                          "id": "thresholds",
-                          "value": {
-                            "mode": "absolute",
-                            "steps": [
-                              {
-                                "color": "green",
-                                "value": null
-                              },
-                              {
-                                "color": "yellow",
-                                "value": 50
-                              },
-                              {
-                                "color": "red",
-                                "value": 80
-                              }
-                            ]
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "matcher": {
-                        "id": "byFrameRefID",
-                        "options": "B"
-                      },
-                      "properties": [
-                        {
-                          "id": "displayName",
-                          "value": "Secondary Query"
-                        }
-                      ]
-                    },
-                    {
-                      "matcher": {
-                        "id": "byValue",
-                        "options": {
-                          "op": "gte",
-                          "reducer": "allIsNull",
-                          "value": 0
-                        }
-                      },
-                      "properties": [
-                        {
-                          "id": "custom.hidden",
-                          "value": true
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        }
-      },
-      "layout": {
-        "kind": "GridLayout",
-        "spec": {
-          "items": [
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 0,
-                "y": 0,
-                "width": 12,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-1"
-                }
-              }
-            },
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 12,
-                "y": 0,
-                "width": 12,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-2"
-                }
-              }
-            },
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 0,
-                "y": 8,
-                "width": 12,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-3"
-                }
-              }
-            },
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 12,
-                "y": 8,
-                "width": 12,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-4"
-                }
-              }
-            },
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 0,
-                "y": 16,
-                "width": 24,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-5"
-                }
-              }
-            },
-            {
-              "kind": "GridLayoutItem",
-              "spec": {
-                "x": 0,
-                "y": 24,
-                "width": 12,
-                "height": 8,
-                "element": {
-                  "kind": "ElementReference",
-                  "name": "panel-6"
-                }
-              }
-            }
-          ]
-        }
-      },
-      "links": [],
-      "liveNow": false,
-      "preload": false,
-      "tags": [
-        "value-mapping",
-        "overrides",
-        "test"
-      ],
-      "timeSettings": {
-        "timezone": "browser",
-        "from": "now-6h",
-        "to": "now",
-        "autoRefresh": "",
-        "autoRefreshIntervals": [
-          "5s",
-          "10s",
-          "30s",
-          "1m",
-          "5m",
-          "15m",
-          "30m",
-          "1h",
-          "2h",
-          "1d"
-        ],
-        "hideTimepicker": false,
-        "fiscalYearStartMonth": 0
-      },
-      "title": "Value Mapping and Overrides Test",
-      "variables": []
-    },
-    "status": {
-      "conversion": {
-        "failed": false,
-        "storedVersion": "v1beta1"
-      }
-    }
-  }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v0alpha1.json

@@ -743,9 +743,7 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": {
-            "uid": "$datasource"
-          },
+          "datasource": "$datasource",
           "hide": 0,
           "includeAll": true,
           "label": "cluster",
@@ -766,9 +764,7 @@
             "text": "prod",
             "value": "prod"
           },
-          "datasource": {
-            "uid": "$datasource"
-          },
+          "datasource": "$datasource",
           "hide": 0,
           "includeAll": false,
           "label": "namespace",

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2alpha1.json

@@ -961,12 +961,8 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
-          "datasource": {
-            "type": "",
-            "uid": "$datasource"
-          },
           "query": {
-            "kind": "",
+            "kind": "prometheus",
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -992,12 +988,8 @@
           "hide": "dontHide",
           "refresh": "onDashboardLoad",
           "skipUrlSync": false,
-          "datasource": {
-            "type": "",
-            "uid": "$datasource"
-          },
           "query": {
-            "kind": "",
+            "kind": "prometheus",
             "spec": {
               "__legacyStringValue": "label_values(up{job=~\"$cluster\"}, instance)"
             }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2beta1.json

@@ -978,11 +978,8 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "",
+            "group": "prometheus",
             "version": "v0",
-            "datasource": {
-              "name": "$datasource"
-            },
             "spec": {
               "__legacyStringValue": "label_values(up, job)"
             }
@@ -1010,11 +1007,8 @@
           "skipUrlSync": false,
           "query": {
             "kind": "DataQuery",
-            "group": "",
+            "group": "prometheus",
             "version": "v0",
-            "datasource": {
-              "name": "$datasource"
-            },
             "spec": {
               "__legacyStringValue": "label_values(up{job=~\"$cluster\"}, instance)"
             }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json

@@ -115,14 +115,7 @@
             "kind": "logs",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "logs",
-                  "originalOptions": {
-                    "height": 100
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json

@@ -120,14 +120,7 @@
             "group": "logs",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "logs",
-                  "originalOptions": {
-                    "height": 100
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json

@@ -182,20 +182,7 @@
             "kind": "table",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "bytes",
-                    "y_format": "short"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json

@@ -189,20 +189,7 @@
             "group": "table",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "grid": {
-                      "max": 100,
-                      "min": 0
-                    },
-                    "legend": true,
-                    "y2_format": "bytes",
-                    "y_format": "short"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json

@@ -435,29 +435,7 @@
             "kind": "table",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20"
-                        ],
-                        "unit": "short"
-                      }
-                    ],
-                    "table": "table2"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json

@@ -449,29 +449,7 @@
             "group": "table",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "table",
-                  "originalOptions": {
-                    "styles": [
-                      {
-                        "colors": [
-                          "red",
-                          "yellow",
-                          "green"
-                        ],
-                        "pattern": "/.*/",
-                        "thresholds": [
-                          "10",
-                          "20"
-                        ],
-                        "unit": "short"
-                      }
-                    ],
-                    "table": "table2"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2alpha1.json

@@ -110,15 +110,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Angular Text Panel\n# $constant\n\nFor markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)\n\n## $text\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2beta1.json

@@ -115,15 +115,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Angular Text Panel\n# $constant\n\nFor markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)\n\n## $text\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-datalinks.v42.v2alpha1.json

@@ -361,15 +361,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$seriesName\u003c/span\u003e\n2. **label.datacenter:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenter\u003c/span\u003e\n3. **label.datacenter.region:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenterRegion\u003c/span\u003e\n\n#### Field variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$fieldName\u003c/span\u003e\n\n#### Value variables\n1. **Time:** \u003cspan style=\"color: orange;\"\u003e$valueTime\u003c/span\u003e\n2. **Numeric:** \u003cspan style=\"color: orange;\"\u003e$valueNumeric\u003c/span\u003e\n3. **Text:** \u003cspan style=\"color: orange;\"\u003e$valueText\u003c/span\u003e\n4. **Calc:** \u003cspan style=\"color: orange;\"\u003e$valueCalc\u003c/span\u003e\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-datalinks.v42.v2beta1.json

@@ -372,15 +372,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$seriesName\u003c/span\u003e\n2. **label.datacenter:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenter\u003c/span\u003e\n3. **label.datacenter.region:** \u003cspan style=\"color: orange;\"\u003e$labelDatacenterRegion\u003c/span\u003e\n\n#### Field variables\n1. **Name:** \u003cspan style=\"color: orange;\"\u003e$fieldName\u003c/span\u003e\n\n#### Value variables\n1. **Time:** \u003cspan style=\"color: orange;\"\u003e$valueTime\u003c/span\u003e\n2. **Numeric:** \u003cspan style=\"color: orange;\"\u003e$valueNumeric\u003c/span\u003e\n3. **Text:** \u003cspan style=\"color: orange;\"\u003e$valueText\u003c/span\u003e\n4. **Calc:** \u003cspan style=\"color: orange;\"\u003e$valueCalc\u003c/span\u003e\n\n",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables-drilldown.v42.v2alpha1.json

@@ -167,15 +167,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables-drilldown.v42.v2beta1.json

@@ -174,15 +174,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2alpha1.json

@@ -273,15 +273,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/feature-templating/v0alpha1.testdata-nested-variables.v42.v2beta1.json

@@ -282,15 +282,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v1beta1.json

@@ -296,7 +296,6 @@
         }
       },
       {
-        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
         "datasource": {
           "type": "grafana-testdata-datasource"
         },
@@ -307,7 +306,15 @@
           "y": 0
         },
         "id": 6,
-        "mode": "markdown",
+        "options": {
+          "code": {
+            "language": "plaintext",
+            "showLineNumbers": false,
+            "showMiniMap": false
+          },
+          "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+          "mode": "markdown"
+        },
         "pluginVersion": "11.0.0-pre",
         "targets": [
           {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v2alpha1.json

@@ -1256,13 +1256,13 @@
             "spec": {
               "pluginVersion": "11.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-                    "mode": "markdown"
-                  }
-                }
+                "code": {
+                  "language": "plaintext",
+                  "showLineNumbers": false,
+                  "showMiniMap": false
+                },
+                "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+                "mode": "markdown"
               },
               "fieldConfig": {
                 "defaults": {},

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/migrations/v0alpha1.migrations.v42.v2beta1.json

@@ -1301,13 +1301,13 @@
             "version": "11.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-                    "mode": "markdown"
-                  }
-                }
+                "code": {
+                  "language": "plaintext",
+                  "showLineNumbers": false,
+                  "showMiniMap": false
+                },
+                "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+                "mode": "markdown"
               },
               "fieldConfig": {
                 "defaults": {},

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests.v42.v2alpha1.json

@@ -62,12 +62,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -157,12 +151,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -253,12 +241,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -338,12 +320,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -425,12 +401,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -510,12 +480,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -595,12 +559,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -681,12 +639,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -778,12 +730,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -981,12 +927,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1066,12 +1006,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1151,12 +1085,6 @@
             "spec": {
               "pluginVersion": "7.4.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-gauge/v0alpha1.gauge_tests.v42.v2beta1.json

@@ -67,12 +67,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -165,12 +159,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -264,12 +252,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -352,12 +334,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -442,12 +418,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -530,12 +500,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -618,12 +582,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -707,12 +665,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -807,12 +759,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1015,12 +961,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1103,12 +1043,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [
@@ -1191,12 +1125,6 @@
             "version": "7.4.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "gauge",
-                  "originalOptions": {
-                    "nullPointMode": "null"
-                  }
-                },
                 "baseColor": "#299c46",
                 "reduceOptions": {
                   "calcs": [

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-graph/v0alpha1.graph_tests.v42.v2alpha1.json

@@ -412,17 +412,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Should be a long line connecting the null region in the `connected`  mode, and in zero it should just be a line with zero value at the null points. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -466,17 +456,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking values on top of nulls, should treat the null values as zero. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -520,17 +500,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking when all values are null should leave a gap in the graph",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1711,17 +1681,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2101,17 +2061,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Just verify that the tooltip time has millisecond resolution ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2155,17 +2105,7 @@
             "kind": "text",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Verify that axis labels look ok",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-graph/v0alpha1.graph_tests.v42.v2beta1.json

@@ -429,17 +429,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Should be a long line connecting the null region in the `connected`  mode, and in zero it should just be a line with zero value at the null points. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -485,17 +475,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking values on top of nulls, should treat the null values as zero. ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -541,17 +521,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Stacking when all values are null should leave a gap in the graph",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -1809,17 +1779,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2212,17 +2172,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Just verify that the tooltip time has millisecond resolution ",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -2268,17 +2218,7 @@
             "group": "text",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "text",
-                  "originalOptions": {
-                    "content": "Verify that axis labels look ok",
-                    "editable": true,
-                    "error": false,
-                    "mode": "markdown"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-heatmap/v0alpha1.heatmap-legacy.v42.v2alpha1.json

@@ -74,44 +74,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -153,46 +116,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {
-                      "cardRound": 50
-                    },
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -234,44 +158,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": true,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -317,46 +204,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "max": "50",
-                      "min": "20",
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -398,44 +246,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 2,
-                      "show": true,
-                      "splitFactor": 2
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -477,44 +288,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 10,
-                      "show": true,
-                      "splitFactor": 5
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-heatmap/v0alpha1.heatmap-legacy.v42.v2beta1.json

@@ -78,44 +78,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -160,46 +123,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {
-                      "cardRound": 50
-                    },
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -244,44 +168,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#1F60C4",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "opacity"
-                    },
-                    "dataFormat": "tsbuckets",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": true,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 1,
-                      "format": "kwatt",
-                      "logBase": 1,
-                      "show": true,
-                      "width": "100"
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -329,46 +216,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateViridis",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "tooltipDecimals": 4,
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "decimals": 2,
-                      "format": "areaM2",
-                      "logBase": 1,
-                      "max": "50",
-                      "min": "20",
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -413,44 +261,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 2,
-                      "show": true,
-                      "splitFactor": 2
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []
@@ -495,44 +306,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateBuGn",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": true,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": true
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": true
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "xBucketNumber": 10,
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 10,
-                      "show": true,
-                      "splitFactor": 5
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.all-panels.v42.v2alpha1.json

@@ -665,42 +665,7 @@
             "kind": "heatmap",
             "spec": {
               "pluginVersion": "",
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": false
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.all-panels.v42.v2beta1.json

@@ -691,42 +691,7 @@
             "group": "heatmap",
             "version": "",
             "spec": {
-              "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "heatmap",
-                  "originalOptions": {
-                    "cards": {},
-                    "color": {
-                      "cardColor": "#b4ff00",
-                      "colorScale": "sqrt",
-                      "colorScheme": "interpolateOranges",
-                      "exponent": 0.5,
-                      "mode": "spectrum"
-                    },
-                    "dataFormat": "timeseries",
-                    "heatmap": {},
-                    "hideZeroBuckets": false,
-                    "highlightCards": true,
-                    "legend": {
-                      "show": false
-                    },
-                    "reverseYBuckets": false,
-                    "tooltip": {
-                      "show": true,
-                      "showHistogram": false
-                    },
-                    "xAxis": {
-                      "show": true
-                    },
-                    "yAxis": {
-                      "format": "short",
-                      "logBase": 1,
-                      "show": true
-                    },
-                    "yBucketBound": "auto"
-                  }
-                }
-              },
+              "options": {},
               "fieldConfig": {
                 "defaults": {},
                 "overrides": []

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.home.v42.v2alpha1.json

@@ -56,14 +56,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "panel-tests"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -102,15 +94,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -150,15 +133,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "templating",
-                      "gdev"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -198,15 +172,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "datasource-test"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -246,12 +211,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": []
-                  }
-                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -288,15 +247,6 @@
             "spec": {
               "pluginVersion": "9.0.0-pre",
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/v0alpha1.v1beta1.v1beta1.home.v42.v2beta1.json

@@ -58,14 +58,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "panel-tests"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -105,15 +97,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -154,15 +137,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "templating",
-                      "gdev"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -203,15 +177,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "datasource-test"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,
@@ -252,12 +217,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": []
-                  }
-                },
                 "maxItems": 100,
                 "query": "",
                 "showHeadings": true,
@@ -295,15 +254,6 @@
             "version": "9.0.0-pre",
             "spec": {
               "options": {
-                "__angularMigration": {
-                  "autoMigrateFrom": "dashlist",
-                  "originalOptions": {
-                    "tags": [
-                      "gdev",
-                      "demo"
-                    ]
-                  }
-                },
                 "maxItems": 1000,
                 "query": "",
                 "showHeadings": false,

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v0alpha1.json

@@ -1,161 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 288,
-    "links": [],
-    "panels": [
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "gdev-testdata"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisBorderShow": false,
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "barWidthFactor": 0.6,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "showValues": false,
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "hideZeros": false,
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "pluginVersion": "12.4.0-pre",
-        "targets": [
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          },
-          {
-            "datasource": {},
-            "queryType": "randomWalk"
-          }
-        ],
-        "title": "New panel",
-        "type": "timeseries"
-      }
-    ],
-    "preload": false,
-    "schemaVersion": 42,
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "browser",
-    "title": "Panel ds inheritance ",
-    "uid": "ad5vfcn",
-    "version": 2
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v2alpha1.json

@@ -1,227 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "query": {
-            "kind": "grafana",
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "New panel",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "testdata",
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "datasource": {
-                      "type": "testdata",
-                      "uid": "gdev-testdata"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                },
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "testdata",
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "datasource": {
-                      "type": "testdata",
-                      "uid": "gdev-testdata"
-                    },
-                    "refId": "B",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "timeseries",
-            "spec": {
-              "pluginVersion": "12.4.0-pre",
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "Panel ds inheritance ",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v1beta1.panel-target-missing-refid.v2beta1.json

@@ -1,231 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "metadata": {
-    "name": "ad5vfcn",
-    "namespace": "default",
-    "uid": "dlMZZl6GndU8gJLUQSmgZxXBPCNXyXhNBeQJhHXl0r4X",
-    "resourceVersion": "2",
-    "generation": 2,
-    "creationTimestamp": "2025-11-28T10:14:21Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "288"
-    },
-    "annotations": {
-      "grafana.app/createdBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedBy": "user:eex2ofwuj0agwd",
-      "grafana.app/updatedTimestamp": "2025-11-28T10:15:06Z"
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "query": {
-            "kind": "DataQuery",
-            "group": "grafana",
-            "version": "v0",
-            "datasource": {
-              "name": "-- Grafana --"
-            },
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "New panel",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "testdata",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "gdev-testdata"
-                      },
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                },
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "testdata",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "gdev-testdata"
-                      },
-                      "spec": {
-                        "queryType": "randomWalk"
-                      }
-                    },
-                    "refId": "B",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "12.4.0-pre",
-            "spec": {
-              "options": {
-                "legend": {
-                  "calcs": [],
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                },
-                "tooltip": {
-                  "hideZeros": false,
-                  "mode": "single",
-                  "sort": "none"
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": 0,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  },
-                  "color": {
-                    "mode": "palette-classic"
-                  },
-                  "custom": {
-                    "axisBorderShow": false,
-                    "axisCenteredZero": false,
-                    "axisColorMode": "text",
-                    "axisLabel": "",
-                    "axisPlacement": "auto",
-                    "barAlignment": 0,
-                    "barWidthFactor": 0.6,
-                    "drawStyle": "line",
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "hideFrom": {
-                      "legend": false,
-                      "tooltip": false,
-                      "viz": false
-                    },
-                    "insertNulls": false,
-                    "lineInterpolation": "linear",
-                    "lineWidth": 1,
-                    "pointSize": 5,
-                    "scaleDistribution": {
-                      "type": "linear"
-                    },
-                    "showPoints": "auto",
-                    "showValues": false,
-                    "spanNulls": false,
-                    "stacking": {
-                      "group": "A",
-                      "mode": "none"
-                    },
-                    "thresholdsStyle": {
-                      "mode": "off"
-                    }
-                  }
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "Panel ds inheritance ",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.value-mapping-and-overrides.v0alpha1.json

@@ -1,640 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "value-mapping-test",
-    "namespace": "default",
-    "uid": "value-mapping-test",
-    "resourceVersion": "1765384157199094",
-    "generation": 2,
-    "creationTimestamp": "2025-11-19T20:09:28Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "646372978987008"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Test dashboard for all value mapping types and override matcher types",
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "liveNow": false,
-    "panels": [
-      {
-        "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "critical": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Critical!"
-                  },
-                  "ok": {
-                    "color": "green",
-                    "index": 2,
-                    "text": "OK"
-                  },
-                  "warning": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  }
-                },
-                "type": "value"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 100
-                },
-                {
-                  "id": "custom.align",
-                  "value": "center"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "up",
-            "refId": "A"
-          }
-        ],
-        "title": "ValueMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "from": 0,
-                  "result": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Low"
-                  },
-                  "to": 50
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 50,
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Medium"
-                  },
-                  "to": 80
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 80,
-                  "result": {
-                    "color": "red",
-                    "index": 2,
-                    "text": "High"
-                  },
-                  "to": 100
-                },
-                "type": "range"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^cpu_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "percent"
-                },
-                {
-                  "id": "decimals",
-                  "value": 2
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "cpu_usage_percent",
-            "refId": "A"
-          }
-        ],
-        "title": "RangeMap Example",
-        "type": "gauge"
-      },
-      {
-        "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "pattern": "/^error.*/",
-                  "result": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Error"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^warn.*/",
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^info.*/",
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "Info"
-                  }
-                },
-                "type": "regex"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "string"
-              },
-              "properties": [
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-text"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 8
-        },
-        "id": 3,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "log_level",
-            "refId": "A"
-          }
-        ],
-        "title": "RegexMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 0,
-                    "text": "No Data"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 1,
-                    "text": "Not a Number"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "null+nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 2,
-                    "text": "N/A"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "true",
-                  "result": {
-                    "color": "green",
-                    "index": 3,
-                    "text": "Yes"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "false",
-                  "result": {
-                    "color": "red",
-                    "index": 4,
-                    "text": "No"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "empty",
-                  "result": {
-                    "color": "gray",
-                    "index": 5,
-                    "text": "Empty"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "A"
-              },
-              "properties": [
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "blue",
-                    "mode": "fixed"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 8
-        },
-        "id": 4,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "some_metric",
-            "refId": "A"
-          }
-        ],
-        "title": "SpecialValueMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "failure": {
-                    "color": "red",
-                    "index": 1,
-                    "text": "Failure"
-                  },
-                  "success": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Success"
-                  }
-                },
-                "type": "value"
-              },
-              {
-                "options": {
-                  "from": 0,
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "In Range"
-                  },
-                  "to": 100
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "pattern": "/^[A-Z]{3}-\\d+$/",
-                  "result": {
-                    "color": "purple",
-                    "index": 3,
-                    "text": "ID Format"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 4,
-                    "text": "Missing"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 120
-                },
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-background"
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^value_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "short"
-                },
-                {
-                  "id": "min",
-                  "value": 0
-                },
-                {
-                  "id": "max",
-                  "value": 100
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "number"
-              },
-              "properties": [
-                {
-                  "id": "decimals",
-                  "value": 2
-                },
-                {
-                  "id": "thresholds",
-                  "value": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": null
-                      },
-                      {
-                        "color": "yellow",
-                        "value": 50
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "B"
-              },
-              "properties": [
-                {
-                  "id": "displayName",
-                  "value": "Secondary Query"
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byValue",
-                "options": {
-                  "op": "gte",
-                  "reducer": "allIsNull",
-                  "value": 0
-                }
-              },
-              "properties": [
-                {
-                  "id": "custom.hidden",
-                  "value": true
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 24,
-          "x": 0,
-          "y": 16
-        },
-        "id": 5,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "combined_metric",
-            "refId": "A"
-          },
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "secondary_metric",
-            "refId": "B"
-          }
-        ],
-        "title": "Combined Mappings and Overrides Example",
-        "type": "table"
-      },
-      {
-        "description": "Panel with override that has empty properties array - tests conversion of overrides without any property modifications",
-        "fieldConfig": {
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "field_with_empty_override"
-              },
-              "properties": []
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 24
-        },
-        "id": 6,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "empty_override_metric",
-            "refId": "A"
-          }
-        ],
-        "title": "Empty Properties Override Example",
-        "type": "stat"
-      }
-    ],
-    "preload": false,
-    "refresh": "",
-    "schemaVersion": 42,
-    "tags": [
-      "value-mapping",
-      "overrides",
-      "test"
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ]
-    },
-    "timezone": "browser",
-    "title": "Value Mapping and Overrides Test"
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v2beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.value-mapping-and-overrides.v1beta1.json

@@ -1,640 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "metadata": {
-    "name": "value-mapping-test",
-    "namespace": "default",
-    "uid": "value-mapping-test",
-    "resourceVersion": "1765384157199094",
-    "generation": 2,
-    "creationTimestamp": "2025-11-19T20:09:28Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "646372978987008"
-    }
-  },
-  "spec": {
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Test dashboard for all value mapping types and override matcher types",
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "liveNow": false,
-    "panels": [
-      {
-        "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "critical": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Critical!"
-                  },
-                  "ok": {
-                    "color": "green",
-                    "index": 2,
-                    "text": "OK"
-                  },
-                  "warning": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  }
-                },
-                "type": "value"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 100
-                },
-                {
-                  "id": "custom.align",
-                  "value": "center"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "up",
-            "refId": "A"
-          }
-        ],
-        "title": "ValueMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "from": 0,
-                  "result": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Low"
-                  },
-                  "to": 50
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 50,
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Medium"
-                  },
-                  "to": 80
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "from": 80,
-                  "result": {
-                    "color": "red",
-                    "index": 2,
-                    "text": "High"
-                  },
-                  "to": 100
-                },
-                "type": "range"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^cpu_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "percent"
-                },
-                {
-                  "id": "decimals",
-                  "value": 2
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "cpu_usage_percent",
-            "refId": "A"
-          }
-        ],
-        "title": "RangeMap Example",
-        "type": "gauge"
-      },
-      {
-        "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "pattern": "/^error.*/",
-                  "result": {
-                    "color": "red",
-                    "index": 0,
-                    "text": "Error"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^warn.*/",
-                  "result": {
-                    "color": "orange",
-                    "index": 1,
-                    "text": "Warning"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "pattern": "/^info.*/",
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "Info"
-                  }
-                },
-                "type": "regex"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "string"
-              },
-              "properties": [
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-text"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 8
-        },
-        "id": 3,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "log_level",
-            "refId": "A"
-          }
-        ],
-        "title": "RegexMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 0,
-                    "text": "No Data"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 1,
-                    "text": "Not a Number"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "null+nan",
-                  "result": {
-                    "color": "gray",
-                    "index": 2,
-                    "text": "N/A"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "true",
-                  "result": {
-                    "color": "green",
-                    "index": 3,
-                    "text": "Yes"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "false",
-                  "result": {
-                    "color": "red",
-                    "index": 4,
-                    "text": "No"
-                  }
-                },
-                "type": "special"
-              },
-              {
-                "options": {
-                  "match": "empty",
-                  "result": {
-                    "color": "gray",
-                    "index": 5,
-                    "text": "Empty"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "A"
-              },
-              "properties": [
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "blue",
-                    "mode": "fixed"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 8
-        },
-        "id": 4,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "some_metric",
-            "refId": "A"
-          }
-        ],
-        "title": "SpecialValueMap Example",
-        "type": "stat"
-      },
-      {
-        "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
-        "fieldConfig": {
-          "defaults": {
-            "mappings": [
-              {
-                "options": {
-                  "failure": {
-                    "color": "red",
-                    "index": 1,
-                    "text": "Failure"
-                  },
-                  "success": {
-                    "color": "green",
-                    "index": 0,
-                    "text": "Success"
-                  }
-                },
-                "type": "value"
-              },
-              {
-                "options": {
-                  "from": 0,
-                  "result": {
-                    "color": "blue",
-                    "index": 2,
-                    "text": "In Range"
-                  },
-                  "to": 100
-                },
-                "type": "range"
-              },
-              {
-                "options": {
-                  "pattern": "/^[A-Z]{3}-\\d+$/",
-                  "result": {
-                    "color": "purple",
-                    "index": 3,
-                    "text": "ID Format"
-                  }
-                },
-                "type": "regex"
-              },
-              {
-                "options": {
-                  "match": "null",
-                  "result": {
-                    "color": "gray",
-                    "index": 4,
-                    "text": "Missing"
-                  }
-                },
-                "type": "special"
-              }
-            ]
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "status"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 120
-                },
-                {
-                  "id": "custom.cellOptions",
-                  "value": {
-                    "type": "color-background"
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byRegexp",
-                "options": "/^value_/"
-              },
-              "properties": [
-                {
-                  "id": "unit",
-                  "value": "short"
-                },
-                {
-                  "id": "min",
-                  "value": 0
-                },
-                {
-                  "id": "max",
-                  "value": 100
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byType",
-                "options": "number"
-              },
-              "properties": [
-                {
-                  "id": "decimals",
-                  "value": 2
-                },
-                {
-                  "id": "thresholds",
-                  "value": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "color": "green",
-                        "value": null
-                      },
-                      {
-                        "color": "yellow",
-                        "value": 50
-                      },
-                      {
-                        "color": "red",
-                        "value": 80
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byFrameRefID",
-                "options": "B"
-              },
-              "properties": [
-                {
-                  "id": "displayName",
-                  "value": "Secondary Query"
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byValue",
-                "options": {
-                  "op": "gte",
-                  "reducer": "allIsNull",
-                  "value": 0
-                }
-              },
-              "properties": [
-                {
-                  "id": "custom.hidden",
-                  "value": true
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 24,
-          "x": 0,
-          "y": 16
-        },
-        "id": 5,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "combined_metric",
-            "refId": "A"
-          },
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "secondary_metric",
-            "refId": "B"
-          }
-        ],
-        "title": "Combined Mappings and Overrides Example",
-        "type": "table"
-      },
-      {
-        "description": "Panel with override that has empty properties array - tests conversion of overrides without any property modifications",
-        "fieldConfig": {
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "field_with_empty_override"
-              },
-              "properties": []
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 24
-        },
-        "id": 6,
-        "options": {},
-        "pluginVersion": "",
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus-uid"
-            },
-            "expr": "empty_override_metric",
-            "refId": "A"
-          }
-        ],
-        "title": "Empty Properties Override Example",
-        "type": "stat"
-      }
-    ],
-    "preload": false,
-    "refresh": "",
-    "schemaVersion": 42,
-    "tags": [
-      "value-mapping",
-      "overrides",
-      "test"
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ]
-    },
-    "timezone": "browser",
-    "title": "Value Mapping and Overrides Test"
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v2beta1"
-    }
-  }
-}

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.value-mapping-and-overrides.v2alpha1.json

@@ -1,850 +0,0 @@
-{
-  "kind": "DashboardWithAccessInfo",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "value-mapping-test",
-    "namespace": "default",
-    "uid": "value-mapping-test",
-    "resourceVersion": "1765384157199094",
-    "generation": 2,
-    "creationTimestamp": "2025-11-19T20:09:28Z",
-    "labels": {
-      "grafana.app/deprecatedInternalID": "646372978987008"
-    }
-  },
-  "spec": {
-    "annotations": [
-      {
-        "kind": "AnnotationQuery",
-        "spec": {
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "query": {
-            "kind": "grafana",
-            "spec": {}
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations \u0026 Alerts",
-          "builtIn": true,
-          "legacyOptions": {
-            "type": "dashboard"
-          }
-        }
-      }
-    ],
-    "cursorSync": "Off",
-    "description": "Test dashboard for all value mapping types and override matcher types",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "ValueMap Example",
-          "description": "Panel with ValueMap mapping type - maps specific text values to colors and display text",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "up"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "stat",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "mappings": [
-                    {
-                      "type": "value",
-                      "options": {
-                        "critical": {
-                          "text": "Critical!",
-                          "color": "red",
-                          "index": 0
-                        },
-                        "ok": {
-                          "text": "OK",
-                          "color": "green",
-                          "index": 2
-                        },
-                        "warning": {
-                          "text": "Warning",
-                          "color": "orange",
-                          "index": 1
-                        }
-                      }
-                    }
-                  ]
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "status"
-                    },
-                    "properties": [
-                      {
-                        "id": "custom.width",
-                        "value": 100
-                      },
-                      {
-                        "id": "custom.align",
-                        "value": "center"
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "RangeMap Example",
-          "description": "Panel with RangeMap mapping type - maps numerical ranges to colors and display text",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "cpu_usage_percent"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "gauge",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "mappings": [
-                    {
-                      "type": "range",
-                      "options": {
-                        "from": 0,
-                        "to": 50,
-                        "result": {
-                          "text": "Low",
-                          "color": "green",
-                          "index": 0
-                        }
-                      }
-                    },
-                    {
-                      "type": "range",
-                      "options": {
-                        "from": 50,
-                        "to": 80,
-                        "result": {
-                          "text": "Medium",
-                          "color": "orange",
-                          "index": 1
-                        }
-                      }
-                    },
-                    {
-                      "type": "range",
-                      "options": {
-                        "from": 80,
-                        "to": 100,
-                        "result": {
-                          "text": "High",
-                          "color": "red",
-                          "index": 2
-                        }
-                      }
-                    }
-                  ]
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byRegexp",
-                      "options": "/^cpu_/"
-                    },
-                    "properties": [
-                      {
-                        "id": "unit",
-                        "value": "percent"
-                      },
-                      {
-                        "id": "decimals",
-                        "value": 2
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-3": {
-        "kind": "Panel",
-        "spec": {
-          "id": 3,
-          "title": "RegexMap Example",
-          "description": "Panel with RegexMap mapping type - maps values matching regex patterns to colors",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "log_level"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "stat",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "mappings": [
-                    {
-                      "type": "regex",
-                      "options": {
-                        "pattern": "/^error.*/",
-                        "result": {
-                          "text": "Error",
-                          "color": "red",
-                          "index": 0
-                        }
-                      }
-                    },
-                    {
-                      "type": "regex",
-                      "options": {
-                        "pattern": "/^warn.*/",
-                        "result": {
-                          "text": "Warning",
-                          "color": "orange",
-                          "index": 1
-                        }
-                      }
-                    },
-                    {
-                      "type": "regex",
-                      "options": {
-                        "pattern": "/^info.*/",
-                        "result": {
-                          "text": "Info",
-                          "color": "blue",
-                          "index": 2
-                        }
-                      }
-                    }
-                  ]
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byType",
-                      "options": "string"
-                    },
-                    "properties": [
-                      {
-                        "id": "custom.cellOptions",
-                        "value": {
-                          "type": "color-text"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-4": {
-        "kind": "Panel",
-        "spec": {
-          "id": 4,
-          "title": "SpecialValueMap Example",
-          "description": "Panel with SpecialValueMap mapping type - maps special values like null, NaN, true, false to display text",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "some_metric"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "stat",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "mappings": [
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "null",
-                        "result": {
-                          "text": "No Data",
-                          "color": "gray",
-                          "index": 0
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "nan",
-                        "result": {
-                          "text": "Not a Number",
-                          "color": "gray",
-                          "index": 1
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "null+nan",
-                        "result": {
-                          "text": "N/A",
-                          "color": "gray",
-                          "index": 2
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "true",
-                        "result": {
-                          "text": "Yes",
-                          "color": "green",
-                          "index": 3
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "false",
-                        "result": {
-                          "text": "No",
-                          "color": "red",
-                          "index": 4
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "empty",
-                        "result": {
-                          "text": "Empty",
-                          "color": "gray",
-                          "index": 5
-                        }
-                      }
-                    }
-                  ]
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byFrameRefID",
-                      "options": "A"
-                    },
-                    "properties": [
-                      {
-                        "id": "color",
-                        "value": {
-                          "fixedColor": "blue",
-                          "mode": "fixed"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-5": {
-        "kind": "Panel",
-        "spec": {
-          "id": 5,
-          "title": "Combined Mappings and Overrides Example",
-          "description": "Panel with all mapping types combined - demonstrates mixing different mapping types and multiple override matchers",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "combined_metric"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                },
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "secondary_metric"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "B",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "table",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "mappings": [
-                    {
-                      "type": "value",
-                      "options": {
-                        "failure": {
-                          "text": "Failure",
-                          "color": "red",
-                          "index": 1
-                        },
-                        "success": {
-                          "text": "Success",
-                          "color": "green",
-                          "index": 0
-                        }
-                      }
-                    },
-                    {
-                      "type": "range",
-                      "options": {
-                        "from": 0,
-                        "to": 100,
-                        "result": {
-                          "text": "In Range",
-                          "color": "blue",
-                          "index": 2
-                        }
-                      }
-                    },
-                    {
-                      "type": "regex",
-                      "options": {
-                        "pattern": "/^[A-Z]{3}-\\d+$/",
-                        "result": {
-                          "text": "ID Format",
-                          "color": "purple",
-                          "index": 3
-                        }
-                      }
-                    },
-                    {
-                      "type": "special",
-                      "options": {
-                        "match": "null",
-                        "result": {
-                          "text": "Missing",
-                          "color": "gray",
-                          "index": 4
-                        }
-                      }
-                    }
-                  ]
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "status"
-                    },
-                    "properties": [
-                      {
-                        "id": "custom.width",
-                        "value": 120
-                      },
-                      {
-                        "id": "custom.cellOptions",
-                        "value": {
-                          "type": "color-background"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "matcher": {
-                      "id": "byRegexp",
-                      "options": "/^value_/"
-                    },
-                    "properties": [
-                      {
-                        "id": "unit",
-                        "value": "short"
-                      },
-                      {
-                        "id": "min",
-                        "value": 0
-                      },
-                      {
-                        "id": "max",
-                        "value": 100
-                      }
-                    ]
-                  },
-                  {
-                    "matcher": {
-                      "id": "byType",
-                      "options": "number"
-                    },
-                    "properties": [
-                      {
-                        "id": "decimals",
-                        "value": 2
-                      },
-                      {
-                        "id": "thresholds",
-                        "value": {
-                          "mode": "absolute",
-                          "steps": [
-                            {
-                              "color": "green",
-                              "value": null
-                            },
-                            {
-                              "color": "yellow",
-                              "value": 50
-                            },
-                            {
-                              "color": "red",
-                              "value": 80
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "matcher": {
-                      "id": "byFrameRefID",
-                      "options": "B"
-                    },
-                    "properties": [
-                      {
-                        "id": "displayName",
-                        "value": "Secondary Query"
-                      }
-                    ]
-                  },
-                  {
-                    "matcher": {
-                      "id": "byValue",
-                      "options": {
-                        "op": "gte",
-                        "reducer": "allIsNull",
-                        "value": 0
-                      }
-                    },
-                    "properties": [
-                      {
-                        "id": "custom.hidden",
-                        "value": true
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-6": {
-        "kind": "Panel",
-        "spec": {
-          "id": 6,
-          "title": "Empty Properties Override Example",
-          "description": "Panel with override that has empty properties array - tests conversion of overrides without any property modifications",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {
-                        "expr": "empty_override_metric"
-                      }
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "prometheus-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "stat",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {},
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "field_with_empty_override"
-                    },
-                    "properties": []
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "layout": {
-      "kind": "GridLayout",
-      "spec": {
-        "items": [
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-1"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 0,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-2"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 8,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-3"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 12,
-              "y": 8,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-4"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 16,
-              "width": 24,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-5"
-              }
-            }
-          },
-          {
-            "kind": "GridLayoutItem",
-            "spec": {
-              "x": 0,
-              "y": 24,
-              "width": 12,
-              "height": 8,
-              "element": {
-                "kind": "ElementReference",
-                "name": "panel-6"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [],
-    "liveNow": false,
-    "preload": false,
-    "tags": [
-      "value-mapping",
-      "overrides",
-      "test"
-    ],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "Value Mapping and Overrides Test",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v2beta1"
-    }
-  }
-}

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

@@ -2,7 +2,6 @@ package conversion
 
 import (
 	"context"
-	"strings"
 
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apiserver/pkg/endpoints/request"
@@ -80,57 +79,5 @@ func ConvertDashboard_V0_to_V1beta1(in *dashv0.Dashboard, out *dashv1.Dashboard,
 		return schemaversion.NewMigrationError(err.Error(), schemaversion.GetSchemaVersion(in.Spec.Object), schemaversion.LATEST_VERSION, "Convert_V0_to_V1")
 	}
 
-	// Normalize template variable datasources from string to object format
-	// This handles legacy dashboards where query variables have datasource: "$datasource" (string)
-	// instead of datasource: { uid: "$datasource" } (object)
-	// our migration pipeline in v36 doesn't address because this was not addressed historically
-	// in DashboardMigrator - see public/app/features/dashboard/state/DashboardMigrator.ts#L607
-	// Which means that we have schemaVersion: 42 dashboards where datasource variable references are still strings
-	normalizeTemplateVariableDatasources(out.Spec.Object)
-
 	return nil
 }
-
-// normalizeTemplateVariableDatasources converts template variable string datasources to object format.
-// Legacy dashboards may have query variables with datasource: "$datasource" (string).
-// This normalizes them to datasource: { uid: "$datasource" } for consistent V1→V2 conversion.
-func normalizeTemplateVariableDatasources(dashboard map[string]interface{}) {
-	templating, ok := dashboard["templating"].(map[string]interface{})
-	if !ok {
-		return
-	}
-
-	list, ok := templating["list"].([]interface{})
-	if !ok {
-		return
-	}
-
-	for _, variable := range list {
-		varMap, ok := variable.(map[string]interface{})
-		if !ok {
-			continue
-		}
-
-		varType, _ := varMap["type"].(string)
-		if varType != "query" {
-			continue
-		}
-
-		ds := varMap["datasource"]
-		if dsStr, ok := ds.(string); ok && isTemplateVariableRef(dsStr) {
-			// Convert string template variable reference to object format
-			varMap["datasource"] = map[string]interface{}{
-				"uid": dsStr,
-			}
-		}
-	}
-}
-
-// isTemplateVariableRef checks if a string is a Grafana template variable reference.
-// Template variables can be in the form: $varname or ${varname}
-func isTemplateVariableRef(s string) bool {
-	if s == "" {
-		return false
-	}
-	return strings.HasPrefix(s, "$") || strings.HasPrefix(s, "${")
-}

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

@@ -1185,10 +1185,6 @@ func buildQueryVariable(ctx context.Context, varMap map[string]interface{}, comm
 			// If no UID and no type, use default
 			datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 		}
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -1536,10 +1532,6 @@ func buildAdhocVariable(ctx context.Context, varMap map[string]interface{}, comm
 			// If no UID and no type, use default
 			datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 		}
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -1717,10 +1709,6 @@ func buildGroupByVariable(ctx context.Context, varMap map[string]interface{}, co
 
 		// Resolve Grafana datasource UID when type is "datasource" and UID is empty
 		datasourceUID = resolveGrafanaDatasourceUID(datasourceType, datasourceUID)
-	} else if dsStr, ok := datasource.(string); ok && isTemplateVariable(dsStr) {
-		// Handle datasource variable reference (e.g., "$datasource")
-		// Only process template variables - other string values are not supported in V2 format
-		datasourceUID = dsStr
 	} else {
 		datasourceType = getDefaultDatasourceType(ctx, dsIndexProvider)
 	}
@@ -2018,28 +2006,6 @@ func transformPanelQueries(ctx context.Context, panelMap map[string]interface{},
 		}
 	}
 
-	// Ensure each target has a non-empty refId. We only fill missing refIds;
-	existingRefIds := make(map[string]bool)
-	for _, target := range targets {
-		if targetMap, ok := target.(map[string]interface{}); ok {
-			if refId := schemaversion.GetStringValue(targetMap, "refId"); refId != "" {
-				existingRefIds[refId] = true
-			}
-		}
-	}
-	for _, target := range targets {
-		targetMap, ok := target.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		refId := schemaversion.GetStringValue(targetMap, "refId")
-		if refId == "" {
-			refId = nextAvailableRefId(existingRefIds)
-			targetMap["refId"] = refId
-			existingRefIds[refId] = true
-		}
-	}
-
 	queries := make([]dashv2alpha1.DashboardPanelQueryKind, 0, len(targets))
 
 	for _, target := range targets {
@@ -2052,27 +2018,6 @@ func transformPanelQueries(ctx context.Context, panelMap map[string]interface{},
 	return queries
 }
 
-// nextAvailableRefId returns the next unused refId using the same sequence as the
-// frontend helper (A, B, ..., Z, AA, AB, ...).
-func nextAvailableRefId(existing map[string]bool) string {
-	const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-	var refIdFromIndex func(num int) string
-	refIdFromIndex = func(num int) string {
-		if num < len(letters) {
-			return string(letters[num])
-		}
-		return refIdFromIndex(num/len(letters)-1) + string(letters[num%len(letters)])
-	}
-
-	for i := 0; ; i++ {
-		refId := refIdFromIndex(i)
-		if !existing[refId] {
-			return refId
-		}
-	}
-}
-
 func transformSingleQuery(ctx context.Context, targetMap map[string]interface{}, panelDatasource *dashv2alpha1.DashboardDataSourceRef, dsIndexProvider schemaversion.DataSourceIndexProvider) dashv2alpha1.DashboardPanelQueryKind {
 	refId := schemaversion.GetStringValue(targetMap, "refId", "A")
 	if refId == "" {
@@ -2308,24 +2253,20 @@ func buildVizConfig(panelMap map[string]interface{}) dashv2alpha1.DashboardVizCo
 	// We check two cases:
 	// 1. Panel already has autoMigrateFrom set (from v0→v1 migration) - panel type already converted
 	// 2. Panel type is a known Angular panel - need to convert type AND set autoMigrateFrom
-	// 3. Panel has original options - need to set autoMigrateFrom and originalOptions
 	autoMigrateFrom, hasAutoMigrateFrom := panelMap["autoMigrateFrom"].(string)
-	originalOptions := extractAngularOptions(panelMap)
 
 	if !hasAutoMigrateFrom || autoMigrateFrom == "" {
 		// Check if panel type is an Angular type that needs migration
 		if newType := getAngularPanelMigration(panelType, panelMap); newType != "" {
 			autoMigrateFrom = panelType // Original Angular type
 			panelType = newType         // New modern type
-		} else if len(originalOptions) > 0 {
-			autoMigrateFrom = panelType
 		}
 	}
 
 	if autoMigrateFrom != "" {
 		options["__angularMigration"] = map[string]interface{}{
 			"autoMigrateFrom": autoMigrateFrom,
-			"originalOptions": originalOptions,
+			"originalOptions": extractAngularOptions(panelMap),
 		}
 	}
 

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

@@ -210,48 +210,6 @@ func TestV1beta1ToV2alpha1(t *testing.T) {
 				assert.Equal(t, "", query.Spec.Query.Kind, "Query kind should be empty when datasource is empty object {}")
 			},
 		},
-		{
-			name: "missing refIds are assigned while existing refIds are preserved",
-			createV1beta1: func() *dashv1.Dashboard {
-				return &dashv1.Dashboard{
-					Spec: dashv1.DashboardSpec{
-						Object: map[string]interface{}{
-							"title": "Test Dashboard",
-							"panels": []interface{}{
-								map[string]interface{}{
-									"id":   1,
-									"type": "bargauge",
-									"targets": []interface{}{
-										map[string]interface{}{
-											"refId":      "",
-											"scenarioId": "random_walk",
-										},
-										map[string]interface{}{
-											"refId":      "A",
-											"scenarioId": "random_walk",
-										},
-										map[string]interface{}{
-											"refId":      "",
-											"scenarioId": "random_walk",
-										},
-									},
-								},
-							},
-						},
-					},
-				}
-			},
-			validateV2alpha1: func(t *testing.T, v2alpha1 *dashv2alpha1.Dashboard) {
-				require.NotNil(t, v2alpha1.Spec.Elements["panel-1"])
-				panel := v2alpha1.Spec.Elements["panel-1"].PanelKind
-				require.NotNil(t, panel)
-
-				require.Len(t, panel.Spec.Data.Spec.Queries, 3)
-				assert.Equal(t, "B", panel.Spec.Data.Spec.Queries[0].Spec.RefId)
-				assert.Equal(t, "A", panel.Spec.Data.Spec.Queries[1].Spec.RefId)
-				assert.Equal(t, "C", panel.Spec.Data.Spec.Queries[2].Spec.RefId)
-			},
-		},
 	}
 
 	for _, tt := range testCases {

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

@@ -1973,16 +1973,16 @@ func convertFieldConfigOverridesToV1(overrides []dashv2alpha1.DashboardV2alpha1F
 			"options": override.Matcher.Options,
 		}
 
-		properties := make([]map[string]interface{}, 0, len(override.Properties))
 		if len(override.Properties) > 0 {
+			properties := make([]map[string]interface{}, 0, len(override.Properties))
 			for _, prop := range override.Properties {
 				properties = append(properties, map[string]interface{}{
 					"id":    prop.Id,
 					"value": prop.Value,
 				})
 			}
+			overrideMap["properties"] = properties
 		}
-		overrideMap["properties"] = properties
 
 		result = append(result, overrideMap)
 	}
@@ -2074,9 +2074,11 @@ func convertRegexMapToV1(regexMap *dashv2alpha1.DashboardRegexMap) map[string]in
 		return nil
 	}
 
-	options := map[string]interface{}{
-		"pattern": regexMap.Options.Pattern,
-		"result":  convertValueMappingResultToV1(regexMap.Options.Result),
+	options := []map[string]interface{}{
+		{
+			"pattern": regexMap.Options.Pattern,
+			"result":  convertValueMappingResultToV1(regexMap.Options.Result),
+		},
 	}
 
 	return map[string]interface{}{

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/migrations/migrations.v42.json

@@ -290,7 +290,6 @@
       }
     },
     {
-      "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
       "datasource": {
         "type": "grafana-testdata-datasource"
       },
@@ -301,7 +300,15 @@
         "y": 0
       },
       "id": 6,
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel \u003e\u003e Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

apps/dashboard/pkg/migration/testdata/input/v15.mimir_rollout_debugging.json

@@ -654,9 +654,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -679,9 +677,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

apps/dashboard/pkg/migration/testdata/output/latest_version/v15.mimir_rollout_debugging.v42.json

@@ -737,9 +737,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -760,9 +758,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

apps/dashboard/pkg/migration/testdata/output/single_version/v15.mimir_rollout_debugging.v15.json

@@ -717,9 +717,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": true,
         "label": "cluster",
@@ -741,9 +739,7 @@
           "text": "prod",
           "value": "prod"
         },
-        "datasource": {
-          "uid": "$datasource"
-        },
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "namespace",

conf/defaults.ini

@@ -335,9 +335,6 @@ rudderstack_data_plane_url =
 # Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
 rudderstack_sdk_url =
 
-# Rudderstack v3 SDK, optional, defaults to false. If set, Rudderstack v3 SDK will be used instead of v1
-rudderstack_v3_sdk_url = 
-
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 rudderstack_config_url =
 

conf/sample.ini

@@ -322,9 +322,6 @@
 # Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
 ;rudderstack_sdk_url =
 
-# Rudderstack v3 SDK, optional, defaults to false. If set, Rudderstack v3 SDK will be used instead of v1
-;rudderstack_v3_sdk_url = 
-
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 ;rudderstack_config_url =
 

devenv/dev-dashboards/migrations/migrations.json

@@ -299,9 +299,15 @@
         "y": 0
       },
       "id": 6,
-      "options": {},
-      "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-      "mode": "markdown",
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
+        "mode": "markdown"
+      },
       "pluginVersion": "11.0.0-pre",
       "targets": [
         {

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

@@ -642,12 +642,6 @@ You must also provide the `rudderstack_write_key` to enable this feature.
 Optional.
 If tracking with RudderStack is enabled, you can provide a custom URL to load the RudderStack SDK.
 
-#### `rudderstack_v3_sdk_url`
-
-Optional.
-This is mirroring the old configuration option, which will be deprecated.
-If `rudderstack_sdk_url` and `rudderstack_v3_sdk_url` are both set, the feature toggle `rudderstackUpgrade` will control which one is loaded.
-
 #### `rudderstack_config_url`
 
 Optional.

eslint-suppressions.json

@@ -763,11 +763,6 @@
       "count": 1
     }
   },
-  "packages/grafana-ui/src/components/Select/resetSelectStyles.ts": {
-    "@typescript-eslint/no-explicit-any": {
-      "count": 1
-    }
-  },
   "packages/grafana-ui/src/components/Select/types.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 6
@@ -1893,6 +1888,11 @@
       "count": 1
     }
   },
+  "public/app/features/dashboard-scene/serialization/angularMigration.test.ts": {
+    "@typescript-eslint/no-explicit-any": {
+      "count": 1
+    }
+  },
   "public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts": {
     "@typescript-eslint/consistent-type-assertions": {
       "count": 1

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

@@ -289,7 +289,6 @@ export interface GrafanaConfig {
   rudderstackWriteKey: string;
   rudderstackDataPlaneUrl: string;
   rudderstackSdkUrl: string;
-  rudderstackV3SdkUrl: string;
   rudderstackConfigUrl: string;
   rudderstackIntegrationsUrl: string;
   applicationInsightsConnectionString: string;

packages/grafana-flamegraph/src/FlameGraph/FlameGraph.test.tsx

@@ -1,5 +1,5 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import * as React from 'react';
+import { type ComponentProps, useRef } from 'react';
 
 import { createDataFrame } from '@grafana/data';
 
@@ -16,14 +16,14 @@ jest.mock('react-use', () => {
   return {
     ...reactUse,
     useMeasure: () => {
-      const ref = React.useRef();
+      const ref = useRef(null);
       return [ref, { width: 1600 }];
     },
   };
 });
 
 describe('FlameGraph', () => {
-  function setup(props?: Partial<React.ComponentProps<typeof FlameGraph>>) {
+  function setup(props?: Partial<ComponentProps<typeof FlameGraph>>) {
     const flameGraphData = createDataFrame(data);
     const container = new FlameGraphDataContainer(flameGraphData, { collapsing: true });
 

packages/grafana-flamegraph/src/FlameGraphContainer.test.tsx

@@ -21,7 +21,7 @@ jest.mock('@grafana/assistant', () => ({
 jest.mock('react-use', () => ({
   ...jest.requireActual('react-use'),
   useMeasure: () => {
-    const ref = useRef();
+    const ref = useRef(null);
     return [ref, { width: 1600 }];
   },
 }));

packages/grafana-runtime/src/config.ts

@@ -224,7 +224,6 @@ export class GrafanaBootConfig {
   rudderstackWriteKey?: string;
   rudderstackDataPlaneUrl?: string;
   rudderstackSdkUrl?: string;
-  rudderstackV3SdkUrl?: string;
   rudderstackConfigUrl?: string;
   rudderstackIntegrationsUrl?: string;
   analyticsConsoleReporting = false;

packages/grafana-runtime/src/services/pluginExtensions/utils.test.tsx

@@ -262,24 +262,18 @@ function createComponent<Props extends JSX.IntrinsicAttributes>(
   pluginId?: string,
   id?: string
 ): ComponentTypeWithExtensionMeta<Props> {
-  function ComponentWithMeta(props: Props) {
-    if (Implementation) {
-      return <Implementation {...props} />;
+  const ComponentWithMeta: ComponentTypeWithExtensionMeta<Props> = Object.assign(
+    Implementation || (() => <div>Test</div>),
+    {
+      meta: {
+        id: id ?? '',
+        pluginId: pluginId ?? '',
+        title: '',
+        description: '',
+        type: PluginExtensionTypes.component,
+      } satisfies PluginExtensionComponentMeta,
     }
-
-    return <div>Test</div>;
-  }
-
-  ComponentWithMeta.displayName = '';
-  ComponentWithMeta.propTypes = {};
-  ComponentWithMeta.contextTypes = {};
-  ComponentWithMeta.meta = {
-    id: id ?? '',
-    pluginId: pluginId ?? '',
-    title: '',
-    description: '',
-    type: PluginExtensionTypes.component,
-  } satisfies PluginExtensionComponentMeta;
+  );
 
   return ComponentWithMeta;
 }

packages/grafana-ui/src/components/Select/resetSelectStyles.ts

@@ -1,9 +1,9 @@
 import { useMemo } from 'react';
-import { CSSObjectWithLabel } from 'react-select';
+import { StylesConfig } from 'react-select';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-export default function resetSelectStyles(theme: GrafanaTheme2) {
+export default function resetSelectStyles(theme: GrafanaTheme2): Partial<StylesConfig> {
   return {
     clearIndicator: () => ({}),
     container: () => ({}),
@@ -13,7 +13,7 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
     groupHeading: () => ({}),
     indicatorsContainer: () => ({}),
     indicatorSeparator: () => ({}),
-    input: function (originalStyles: CSSObjectWithLabel) {
+    input: function (originalStyles) {
       return {
         ...originalStyles,
         color: 'inherit',
@@ -27,7 +27,7 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
     loadingIndicator: () => ({}),
     loadingMessage: () => ({}),
     menu: () => ({}),
-    menuList: ({ maxHeight }: { maxHeight: number }) => ({
+    menuList: ({ maxHeight }) => ({
       maxHeight,
     }),
     multiValue: () => ({}),
@@ -38,7 +38,7 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
     multiValueRemove: () => ({}),
     noOptionsMessage: () => ({}),
     option: () => ({}),
-    placeholder: (originalStyles: CSSObjectWithLabel) => ({
+    placeholder: (originalStyles) => ({
       ...originalStyles,
       color: theme.colors.text.secondary,
     }),
@@ -47,11 +47,11 @@ export default function resetSelectStyles(theme: GrafanaTheme2) {
   };
 }
 
-export function useCustomSelectStyles(theme: GrafanaTheme2, width: number | string | undefined) {
+export function useCustomSelectStyles(theme: GrafanaTheme2, width: number | string | undefined): Partial<StylesConfig> {
   return useMemo(() => {
     return {
       ...resetSelectStyles(theme),
-      menuPortal: (base: CSSObjectWithLabel) => {
+      menuPortal: (base) => {
         // Would like to correct top position when menu is placed bottom, but have props are not sent to this style function.
         // Only state is. https://github.com/JedWatson/react-select/blob/master/packages/react-select/src/components/Menu.tsx#L605
         return {
@@ -60,7 +60,7 @@ export function useCustomSelectStyles(theme: GrafanaTheme2, width: number | stri
         };
       },
       //These are required for the menu positioning to function
-      menu: ({ top, bottom, position }: CSSObjectWithLabel) => {
+      menu: ({ top, bottom, position }) => {
         return {
           top,
           bottom,
@@ -73,7 +73,7 @@ export function useCustomSelectStyles(theme: GrafanaTheme2, width: number | stri
         width: width ? theme.spacing(width) : '100%',
         display: width === 'auto' ? 'inline-flex' : 'flex',
       }),
-      option: (provided: CSSObjectWithLabel, state: any) => ({
+      option: (provided, state) => ({
         ...provided,
         opacity: state.isDisabled ? 0.5 : 1,
       }),

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

@@ -263,7 +263,16 @@ export const Footer: StoryFn<typeof Table> = (args) => {
   );
 };
 
-export const Pagination: StoryFn<typeof Table> = (args) => <Basic {...args} />;
+export const Pagination: StoryFn<typeof Table> = (args) => {
+  const theme = useTheme2();
+  const data = buildData(theme, {});
+
+  return (
+    <DashboardStoryCanvas>
+      <Table {...args} data={data} />
+    </DashboardStoryCanvas>
+  );
+};
 Pagination.args = {
   enablePagination: true,
 };

pkg/api/dtos/frontend_settings.go

@@ -200,7 +200,6 @@ type FrontendSettingsDTO struct {
 	RudderstackWriteKey        string `json:"rudderstackWriteKey"`
 	RudderstackDataPlaneUrl    string `json:"rudderstackDataPlaneUrl"`
 	RudderstackSdkUrl          string `json:"rudderstackSdkUrl"`
-	RudderstackV3SdkUrl        string `json:"rudderstackV3SdkUrl"`
 	RudderstackConfigUrl       string `json:"rudderstackConfigUrl"`
 	RudderstackIntegrationsUrl string `json:"rudderstackIntegrationsUrl"`
 

pkg/api/frontendsettings.go

@@ -229,7 +229,6 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		RudderstackWriteKey:                  hs.Cfg.RudderstackWriteKey,
 		RudderstackDataPlaneUrl:              hs.Cfg.RudderstackDataPlaneURL,
 		RudderstackSdkUrl:                    hs.Cfg.RudderstackSDKURL,
-		RudderstackV3SdkUrl:                  hs.Cfg.RudderstackV3SDKURL,
 		RudderstackConfigUrl:                 hs.Cfg.RudderstackConfigURL,
 		RudderstackIntegrationsUrl:           hs.Cfg.RudderstackIntegrationsURL,
 		AnalyticsConsoleReporting:            hs.Cfg.FrontendAnalyticsConsoleReporting,

pkg/infra/metrics/metrics.go

@@ -224,7 +224,7 @@ var (
 	MStatTotalRepositories prometheus.Gauge
 
 	// MUnifiedStorageMigrationStatus indicates the migration status for unified storage in this instance.
-	// Possible values: 0 (default/undefined), 1 (migration disabled), 2 (migration would run).
+	// Possible values: 0 (default/undefined), 1 (migration disabled), 2 (migration would run), 3 (migration will run).
 	MUnifiedStorageMigrationStatus prometheus.Gauge
 )
 

pkg/login/social/connectors/google_oauth.go

@@ -81,7 +81,15 @@ func (s *SocialGoogle) Validate(ctx context.Context, newSettings ssoModels.SSOSe
 	return validation.Validate(info, requester,
 		validation.MustBeEmptyValidator(info.AuthUrl, "Auth URL"),
 		validation.MustBeEmptyValidator(info.TokenUrl, "Token URL"),
-		validation.MustBeEmptyValidator(info.ApiUrl, "API URL"))
+		validation.MustBeEmptyValidator(info.ApiUrl, "API URL"),
+		loginPromptValidator)
+}
+
+func loginPromptValidator(info *social.OAuthInfo, requester identity.Requester) error {
+	if info.UseRefreshToken && !slices.Contains([]string{"", "consent"}, info.LoginPrompt) {
+		return ssosettings.ErrInvalidOAuthConfig("If provided, login_prompt must be set to consent when use_refresh_token is enabled.")
+	}
+	return nil
 }
 
 func (s *SocialGoogle) Reload(ctx context.Context, settings ssoModels.SSOSettings) error {

pkg/login/social/connectors/google_oauth_test.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"testing"
 	"time"
 
@@ -18,6 +19,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
+	"github.com/grafana/grafana/pkg/apimachinery/errutil"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -871,6 +873,39 @@ func TestSocialGoogle_Validate(t *testing.T) {
 			},
 			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
 		},
+		{
+			name: "fails if use_refresh_token is enabled and login prompt is neither empty or 'consent'",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":         "client-id",
+					"use_refresh_token": "true",
+					"login_prompt":      "login",
+				},
+			},
+			wantErr: ssosettings.ErrBaseInvalidOAuthConfig,
+		},
+		{
+			name: "succeeds if use_refresh_token is enabled and login prompt is empty",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":         "client-id",
+					"use_refresh_token": "true",
+					"login_prompt":      "",
+				},
+			},
+			wantErr: nil,
+		},
+		{
+			name: "succeeds if use_refresh_token is enabled and login prompt is consent",
+			settings: ssoModels.SSOSettings{
+				Settings: map[string]any{
+					"client_id":         "client-id",
+					"use_refresh_token": "true",
+					"login_prompt":      "consent",
+				},
+			},
+			wantErr: nil,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -886,7 +921,13 @@ func TestSocialGoogle_Validate(t *testing.T) {
 				require.ErrorIs(t, err, tc.wantErr)
 				return
 			}
-			require.NoError(t, err)
+
+			if err != nil {
+				var e errutil.Error
+				require.True(t, errors.As(err, &e))
+				require.NoError(t, e, "expected no error, got %v", e.PublicMessage)
+				return
+			}
 		})
 	}
 }
@@ -1024,3 +1065,102 @@ func TestIsHDAllowed(t *testing.T) {
 		})
 	}
 }
+
+func TestSocialGoogle_AuthCodeURL(t *testing.T) {
+	testCases := []struct {
+		name    string
+		info    *social.OAuthInfo
+		opts    []oauth2.AuthCodeOption
+		state   string
+		wantURL *url.URL
+	}{
+		{
+			name: "should return the correct auth code URL",
+			info: &social.OAuthInfo{
+				ClientId:     "client-id",
+				ClientSecret: "client-secret",
+				AuthUrl:      "https://example.com/auth",
+				LoginPrompt:  "login",
+				Scopes:       []string{"openid", "email", "profile"},
+			},
+			state: "test-state",
+			opts: []oauth2.AuthCodeOption{
+				oauth2.SetAuthURLParam("extra_param", "extra_value"),
+			},
+			wantURL: &url.URL{
+				Scheme: "https",
+				Host:   "example.com",
+				Path:   "/auth",
+				RawQuery: url.Values{
+					"state":         {"test-state"},
+					"prompt":        {"login"},
+					"response_type": {"code"},
+					"client_id":     {"client-id"},
+					"redirect_uri":  {"/login/google"},
+					"scope":         {"openid email profile"},
+					"extra_param":   {"extra_value"},
+				}.Encode(),
+			},
+		},
+		{
+			name: "should add access type offline and approval force if use refresh token is enabled",
+			info: &social.OAuthInfo{
+				ClientId:        "client-id",
+				ClientSecret:    "client-secret",
+				AuthUrl:         "https://example.com/auth",
+				Scopes:          []string{"openid", "email", "profile"},
+				UseRefreshToken: true,
+			},
+			state: "test-state",
+			wantURL: &url.URL{
+				Scheme: "https",
+				Host:   "example.com",
+				Path:   "/auth",
+				RawQuery: url.Values{
+					"state":         {"test-state"},
+					"prompt":        {"consent"},
+					"response_type": {"code"},
+					"client_id":     {"client-id"},
+					"redirect_uri":  {"/login/google"},
+					"scope":         {"openid email profile"},
+					"access_type":   {"offline"},
+				}.Encode(),
+			},
+		},
+		{
+			name: "should override configured login prompt if use refresh token is enabled",
+			info: &social.OAuthInfo{
+				ClientId:        "client-id",
+				ClientSecret:    "client-secret",
+				AuthUrl:         "https://example.com/auth",
+				Scopes:          []string{"openid", "email", "profile"},
+				UseRefreshToken: true,
+			},
+			state: "test-state",
+			wantURL: &url.URL{
+				Scheme: "https",
+				Host:   "example.com",
+				Path:   "/auth",
+				RawQuery: url.Values{
+					"state":         {"test-state"},
+					"prompt":        {"consent"},
+					"response_type": {"code"},
+					"client_id":     {"client-id"},
+					"redirect_uri":  {"/login/google"},
+					"scope":         {"openid email profile"},
+					"access_type":   {"offline"},
+				}.Encode(),
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := NewGoogleProvider(tc.info, &setting.Cfg{}, nil, ssosettingstests.NewFakeService(), featuremgmt.WithFeatures())
+			gotURL := s.AuthCodeURL(tc.state, tc.opts...)
+			parsedURL, err := url.Parse(gotURL)
+			require.NoError(t, err)
+			require.EqualValues(t, tc.wantURL, parsedURL)
+		})
+	}
+}

pkg/login/social/connectors/social_base.go

@@ -91,7 +91,11 @@ func (s *SocialBase) AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) st
 func (s *SocialBase) getAuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string {
 	if s.info.LoginPrompt != "" {
 		promptOpt := oauth2.SetAuthURLParam("prompt", s.info.LoginPrompt)
-		opts = append(opts, promptOpt)
+
+		// Prepend the prompt option to the opts slice to ensure it is applied last.
+		// This is necessary in case the caller provides an option that overrides the prompt,
+		// such as `oauth2.ApprovalForce`.
+		opts = append([]oauth2.AuthCodeOption{promptOpt}, opts...)
 	}
 
 	return s.Config.AuthCodeURL(state, opts...)

pkg/registry/apis/dashboard/dashboard_storage.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/grafana/grafana-app-sdk/logging"
+	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
@@ -33,8 +34,11 @@ func (d dashboardStorageWrapper) Update(ctx context.Context, name string, objInf
 
 	obj, created, err := d.Storage.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
 	if err == nil && ns.OrgID > 0 && d.live != nil {
-		if err := d.live.DashboardSaved(ns.OrgID, name); err != nil {
-			logging.FromContext(ctx).Info("live dashboard update failed", "err", err)
+		m, err := utils.MetaAccessor(obj)
+		if err == nil {
+			if err := d.live.DashboardSaved(ns.OrgID, name, m.GetResourceVersion()); err != nil {
+				logging.FromContext(ctx).Info("live dashboard update failed", "err", err)
+			}
 		}
 	}
 	return obj, created, err

pkg/registry/apis/dashboard/legacy/sql_dashboards.go

@@ -154,12 +154,6 @@ func (a *dashboardSqlAccess) executeQuery(ctx context.Context, helper *legacysql
 		return nil
 	})
 
-	// Use transaction from unified storage if available in the context.
-	// This allows us to run migrations in a transaction which is specifically required for SQLite.
-	if tx == nil {
-		tx = resource.TransactionFromContext(ctx)
-	}
-
 	if tx != nil {
 		return tx.QueryContext(ctx, query, args...)
 	}

pkg/registry/apis/provisioning/resources/dualwriter.go

@@ -277,6 +277,16 @@ func (r *DualReadWriter) createOrUpdate(ctx context.Context, create bool, opts D
 	// FIXME: to make sure if behaves in the same way as in sync, we should
 	// we should refactor the code to use the same function.
 	if r.shouldUpdateGrafanaDB(opts, parsed) {
+		// HACK: Get the has from repository -- this will avoid an additional RV increment
+		// we should change the signature of Create and Update to return FileInfo instead
+		info, _ = r.repo.Read(ctx, opts.Path, opts.Ref)
+		if info != nil {
+			parsed.Meta.SetSourceProperties(utils.SourceProperties{
+				Path:     opts.Path,
+				Checksum: info.Hash,
+			})
+		}
+
 		if _, err := r.folders.EnsureFolderPathExist(ctx, opts.Path); err != nil {
 			return nil, fmt.Errorf("ensure folder path exists: %w", err)
 		}

pkg/services/frontend/frontend_settings.go

@@ -32,7 +32,6 @@ type FSFrontendSettings struct {
 	RudderstackWriteKey        string `json:"rudderstackWriteKey,omitempty"`
 	RudderstackDataPlaneUrl    string `json:"rudderstackDataPlaneUrl,omitempty"`
 	RudderstackSdkUrl          string `json:"rudderstackSdkUrl,omitempty"`
-	RudderstackV3SdkUrl        string `json:"rudderstackV3SdkUrl,omitempty"`
 	RudderstackConfigUrl       string `json:"rudderstackConfigUrl,omitempty"`
 	RudderstackIntegrationsUrl string `json:"rudderstackIntegrationsUrl,omitempty"`
 

pkg/services/frontend/index.go

@@ -94,7 +94,6 @@ func NewIndexProvider(cfg *setting.Cfg, assetsManifest dtos.EntryPointAssets, li
 		RudderstackDataPlaneUrl:              cfg.RudderstackDataPlaneURL,
 		RudderstackIntegrationsUrl:           cfg.RudderstackIntegrationsURL,
 		RudderstackSdkUrl:                    cfg.RudderstackSDKURL,
-		RudderstackV3SdkUrl:                  cfg.RudderstackV3SDKURL,
 		RudderstackWriteKey:                  cfg.RudderstackWriteKey,
 		TrustedTypesDefaultPolicyEnabled:     (cfg.CSPEnabled && strings.Contains(cfg.CSPTemplate, "require-trusted-types-for")) || (cfg.CSPReportOnlyEnabled && strings.Contains(cfg.CSPReportOnlyTemplate, "require-trusted-types-for")),
 		VerifyEmailEnabled:                   cfg.VerifyEmailEnabled,

pkg/services/live/features/dashboard.go

@@ -26,9 +26,10 @@ const (
 
 // DashboardEvent events related to dashboards
 type dashboardEvent struct {
-	UID       string     `json:"uid"`
-	Action    actionType `json:"action"` // saved, editing, deleted
-	SessionID string     `json:"sessionId,omitempty"`
+	UID             string     `json:"uid"`
+	Action          actionType `json:"action"` // saved, editing, deleted
+	SessionID       string     `json:"sessionId,omitempty"`
+	ResourceVersion string     `json:"rv,omitempty"`
 }
 
 // DashboardHandler manages all the `grafana/dashboard/*` channels
@@ -105,10 +106,11 @@ func (h *DashboardHandler) publish(orgID int64, event dashboardEvent) error {
 }
 
 // DashboardSaved will broadcast to all connected dashboards
-func (h *DashboardHandler) DashboardSaved(orgID int64, uid string) error {
+func (h *DashboardHandler) DashboardSaved(orgID int64, uid string, rv string) error {
 	return h.publish(orgID, dashboardEvent{
-		UID:    uid,
-		Action: ActionSaved,
+		UID:             uid,
+		Action:          ActionSaved,
+		ResourceVersion: rv,
 	})
 }
 

pkg/services/live/live.go

@@ -482,7 +482,7 @@ type GrafanaLive struct {
 // DashboardActivityChannel is a service to advertise dashboard activity
 type DashboardActivityChannel interface {
 	// Called when a dashboard is saved
-	DashboardSaved(orgID int64, uid string) error
+	DashboardSaved(orgID int64, uid string, rv string) error
 
 	// Called when a dashboard is deleted
 	DashboardDeleted(orgID int64, uid string) error

pkg/setting/setting.go

@@ -414,7 +414,6 @@ type Cfg struct {
 	RudderstackDataPlaneURL             string
 	RudderstackWriteKey                 string
 	RudderstackSDKURL                   string
-	RudderstackV3SDKURL                 string
 	RudderstackConfigURL                string
 	RudderstackIntegrationsURL          string
 	IntercomSecret                      string
@@ -633,6 +632,9 @@ type UnifiedStorageConfig struct {
 	DataSyncerInterval time.Duration
 	// DataSyncerRecordsLimit defines how many records will be processed at max during a sync invocation.
 	DataSyncerRecordsLimit int
+	// EnableMigration indicates whether migration is enabled for the resource.
+	// If not set, will use the default from MigratedUnifiedResources.
+	EnableMigration bool
 }
 
 type InstallPlugin struct {
@@ -1279,7 +1281,6 @@ func (cfg *Cfg) parseINIFile(iniFile *ini.File) error {
 	cfg.RudderstackWriteKey = analytics.Key("rudderstack_write_key").String()
 	cfg.RudderstackDataPlaneURL = analytics.Key("rudderstack_data_plane_url").String()
 	cfg.RudderstackSDKURL = analytics.Key("rudderstack_sdk_url").String()
-	cfg.RudderstackV3SDKURL = analytics.Key("rudderstack_v3_sdk_url").String()
 	cfg.RudderstackConfigURL = analytics.Key("rudderstack_config_url").String()
 	cfg.RudderstackIntegrationsURL = analytics.Key("rudderstack_integrations_url").String()
 	cfg.IntercomSecret = analytics.Key("intercom_secret").String()

pkg/setting/setting_unified_storage.go

@@ -8,10 +8,17 @@ import (
 	"github.com/grafana/grafana/pkg/util/osutil"
 )
 
-var MigratedUnifiedResources = []string{
-	"playlists.playlist.grafana.app",
-	"folders.folder.grafana.app",
-	"dashboards.dashboard.grafana.app",
+const (
+	PlaylistResource  = "playlists.playlist.grafana.app"
+	FolderResource    = "folders.folder.grafana.app"
+	DashboardResource = "dashboards.dashboard.grafana.app"
+)
+
+// MigratedUnifiedResources maps resources to a boolean indicating if migration is enabled by default
+var MigratedUnifiedResources = map[string]bool{
+	PlaylistResource:  true, // enabled by default
+	FolderResource:    false,
+	DashboardResource: false,
 }
 
 // read storage configs from ini file. They look like:
@@ -46,12 +53,19 @@ func (cfg *Cfg) setUnifiedStorageConfig() {
 		// parse dataSyncerInterval from resource section
 		dataSyncerInterval := section.Key("dataSyncerInterval").MustDuration(time.Hour)
 
+		// parse EnableMigration from resource section
+		enableMigration := MigratedUnifiedResources[resourceName]
+		if section.HasKey("enableMigration") {
+			enableMigration = section.Key("enableMigration").MustBool(MigratedUnifiedResources[resourceName])
+		}
+
 		storageConfig[resourceName] = UnifiedStorageConfig{
 			DualWriterMode:                       rest.DualWriterMode(dualWriterMode),
 			DualWriterPeriodicDataSyncJobEnabled: dualWriterPeriodicDataSyncJobEnabled,
 			DualWriterMigrationDataSyncDisabled:  dualWriterMigrationDataSyncDisabled,
 			DataSyncerRecordsLimit:               dataSyncerRecordsLimit,
 			DataSyncerInterval:                   dataSyncerInterval,
+			EnableMigration:                      enableMigration,
 		}
 	}
 	cfg.UnifiedStorage = storageConfig
@@ -61,8 +75,8 @@ func (cfg *Cfg) setUnifiedStorageConfig() {
 	cfg.DisableDataMigrations = section.Key("disable_data_migrations").MustBool(false)
 	if !cfg.DisableDataMigrations && cfg.getUnifiedStorageType() == "unified" {
 		// Helper log to find instances running migrations in the future
-		cfg.Logger.Info("Unified migration configs not yet enforced")
-		// cfg.enforceMigrationToUnifiedConfigs() // TODO: uncomment when ready for release
+		cfg.Logger.Info("Unified migration configs enforced")
+		cfg.enforceMigrationToUnifiedConfigs()
 	} else {
 		// Helper log to find instances disabling migration
 		cfg.Logger.Info("Unified migration configs enforcement disabled", "storage_type", cfg.getUnifiedStorageType(), "disable_data_migrations", cfg.DisableDataMigrations)
@@ -107,7 +121,6 @@ func (cfg *Cfg) setUnifiedStorageConfig() {
 	cfg.MinFileIndexBuildVersion = section.Key("min_file_index_build_version").MustString("")
 }
 
-// nolint:unused
 // enforceMigrationToUnifiedConfigs enforces configurations required to run migrated resources in mode 5
 // All migrated resources in MigratedUnifiedResources are set to mode 5 and unified search is enabled
 func (cfg *Cfg) enforceMigrationToUnifiedConfigs() {
@@ -118,14 +131,22 @@ func (cfg *Cfg) enforceMigrationToUnifiedConfigs() {
 		section.Key("enable_search").SetValue("true")
 		cfg.EnableSearch = true
 	}
-	for _, resource := range MigratedUnifiedResources {
-		cfg.Logger.Info("Enforcing mode 5 for resource in unified storage", "resource", resource)
-		if oldCfg, ok := cfg.UnifiedStorage[resource]; ok {
-			cfg.Logger.Info("Overriding unified storage config for migrated resource", "resource", resource, "old_config", oldCfg)
+	for resource, enabledByDefault := range MigratedUnifiedResources {
+		resourceCfg, ok := cfg.UnifiedStorage[resource]
+		if ok {
+			if !resourceCfg.EnableMigration {
+				cfg.Logger.Info("Resource migration disabled", "resource", resource)
+				continue
+			}
+			cfg.Logger.Info("Overriding unified storage config for migrated resource", "resource", resource, "old_config", resourceCfg)
+		} else if !enabledByDefault {
+			continue
 		}
+		cfg.Logger.Info("Enforcing mode 5 for resource in unified storage", "resource", resource)
 		cfg.UnifiedStorage[resource] = UnifiedStorageConfig{
 			DualWriterMode:                      5,
 			DualWriterMigrationDataSyncDisabled: true,
+			EnableMigration:                     true,
 		}
 	}
 }

pkg/setting/setting_unified_storage_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/apiserver/rest"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -13,31 +14,56 @@ func TestCfg_setUnifiedStorageConfig(t *testing.T) {
 		err := cfg.Load(CommandLineArgs{HomePath: "../../", Config: "../../conf/defaults.ini"})
 		assert.NoError(t, err)
 
-		s, err := cfg.Raw.NewSection("unified_storage.playlists.playlist.grafana.app")
-		assert.NoError(t, err)
+		setSectionKey := func(sectionName, key, value string) {
+			section := cfg.Raw.Section(sectionName) // Gets existing or creates new
+			_, err := section.NewKey(key, value)
+			assert.NoError(t, err)
+		}
 
-		_, err = s.NewKey("dualWriterMode", "2")
-		assert.NoError(t, err)
+		setMigratedResourceKey := func(key, value string) {
+			for migratedResource := range MigratedUnifiedResources {
+				setSectionKey("unified_storage."+migratedResource, key, value)
+			}
+		}
 
-		_, err = s.NewKey("dualWriterPeriodicDataSyncJobEnabled", "true")
-		assert.NoError(t, err)
+		validateMigratedResources := func(optIn bool) {
+			for migratedResource, enabled := range MigratedUnifiedResources {
+				resourceCfg, exists := cfg.UnifiedStorage[migratedResource]
 
-		_, err = s.NewKey("dataSyncerRecordsLimit", "1001")
-		assert.NoError(t, err)
+				isEnabled := enabled
+				if optIn {
+					isEnabled = true
+				}
 
-		_, err = s.NewKey("dataSyncerInterval", "10m")
-		assert.NoError(t, err)
+				if !isEnabled {
+					if exists {
+						assert.Equal(t, rest.DualWriterMode(1), resourceCfg.DualWriterMode, migratedResource)
+					}
+					continue
+				}
+				assert.Equal(t, exists, true, migratedResource)
+
+				assert.Equal(t, UnifiedStorageConfig{
+					DualWriterMode:                      5,
+					DualWriterMigrationDataSyncDisabled: true,
+					EnableMigration:                     isEnabled,
+				}, resourceCfg, migratedResource)
+			}
+		}
+
+		setMigratedResourceKey("dualWriterMode", "1") // migrated resources enabled by default will change to 5 in setUnifiedStorageConfig
+
+		setSectionKey("unified_storage.resource.not_migrated.grafana.app", "dualWriterMode", "2")
+		setSectionKey("unified_storage.resource.not_migrated.grafana.app", "dualWriterPeriodicDataSyncJobEnabled", "true")
+		setSectionKey("unified_storage.resource.not_migrated.grafana.app", "dataSyncerRecordsLimit", "1001")
+		setSectionKey("unified_storage.resource.not_migrated.grafana.app", "dataSyncerInterval", "10m")
 
 		// Add unified_storage section for index settings
-		unifiedStorageSection, err := cfg.Raw.NewSection("unified_storage")
-		assert.NoError(t, err)
-
-		_, err = unifiedStorageSection.NewKey("index_min_count", "5")
-		assert.NoError(t, err)
+		setSectionKey("unified_storage", "index_min_count", "5")
 
 		cfg.setUnifiedStorageConfig()
 
-		value, exists := cfg.UnifiedStorage["playlists.playlist.grafana.app"]
+		value, exists := cfg.UnifiedStorage["resource.not_migrated.grafana.app"]
 
 		assert.Equal(t, exists, true)
 		assert.Equal(t, value, UnifiedStorageConfig{
@@ -47,6 +73,14 @@ func TestCfg_setUnifiedStorageConfig(t *testing.T) {
 			DataSyncerInterval:                   time.Minute * 10,
 		})
 
+		validateMigratedResources(false)
+
+		setMigratedResourceKey("enableMigration", "true") // will be changed to 5 in setUnifiedStorageConfig
+
+		cfg.setUnifiedStorageConfig()
+
+		validateMigratedResources(true)
+
 		// Test that index settings are correctly parsed
 		assert.Equal(t, 5, cfg.IndexMinCount)
 	})

pkg/storage/unified/apistore/prepare_test.go

@@ -2,6 +2,7 @@ package apistore
 
 import (
 	"context"
+	"encoding/json"
 	"math/rand/v2"
 	"strings"
 	"testing"
@@ -19,6 +20,7 @@ import (
 
 	authlib "github.com/grafana/authlib/types"
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
+	"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 )
@@ -195,6 +197,42 @@ func TestPrepareObjectForStorage(t *testing.T) {
 		require.Equal(t, int64(2), meta2.GetGeneration())
 	})
 
+	t.Run("Update should skip incrementing generation when content is unchanged", func(t *testing.T) {
+		dashboard := dashv1.Dashboard{
+			ObjectMeta: v1.ObjectMeta{
+				Name:       "test",
+				Generation: 123,
+				Annotations: map[string]string{
+					"A":                           "B",
+					utils.AnnoKeyUpdatedTimestamp: "2025-12-17T01:01:00Z",
+				},
+				UID: "XXX",
+			},
+			Spec: v0alpha1.Unstructured{
+				Object: map[string]any{
+					"hello": "world",
+				},
+			},
+		}
+		dashboard.Name = "test-name"
+		obj := dashboard.DeepCopyObject()
+		tmp, err := utils.MetaAccessor(obj)
+		tmp.SetGeneration(2)
+		tmp.SetUpdatedTimestampMillis(12345)
+		require.NoError(t, err)
+
+		v, err := s.prepareObjectForUpdate(ctx, obj, &dashboard)
+		require.NoError(t, err)
+		require.False(t, v.hasChanged, "no changes")
+
+		out := &unstructured.Unstructured{}
+		err = json.Unmarshal(v.raw.Bytes(), out)
+		require.NoError(t, err)
+
+		require.Equal(t, int64(123), tmp.GetGeneration())
+		require.Equal(t, "2025-12-17T01:01:00Z", tmp.GetAnnotation(utils.AnnoKeyUpdatedTimestamp))
+	})
+
 	s.opts.RequireDeprecatedInternalID = true
 	t.Run("Should generate internal id", func(t *testing.T) {
 		dashboard := dashv1.Dashboard{}

pkg/storage/unified/migrations/migrator_test.go

@@ -162,14 +162,49 @@ func runMigrationTestSuite(t *testing.T, testCases []resourceMigratorTestCase) {
 		}
 	})
 
-	t.Run("Step 3: verify data is migrated to unified storage", func(t *testing.T) {
-		// Migrations will run automatically at startup and mode 5 is enforced by the config
+	t.Run("Step 3: verify that opted-out resources are not migrated", func(t *testing.T) {
+		// Build unified storage config for Mode5
+		unifiedConfig := make(map[string]setting.UnifiedStorageConfig)
+		for _, tc := range testCases {
+			for _, gvr := range tc.resources() {
+				resourceKey := fmt.Sprintf("%s.%s", gvr.Resource, gvr.Group)
+				unifiedConfig[resourceKey] = setting.UnifiedStorageConfig{
+					DualWriterMode:  grafanarest.Mode5,
+					EnableMigration: false,
+				}
+			}
+		}
+
+		helper := apis.NewK8sTestHelperWithOpts(t, apis.K8sTestHelperOpts{
+			GrafanaOpts: testinfra.GrafanaOpts{
+				AppModeProduction:    true,
+				DisableAnonymous:     true,
+				DisableDBCleanup:     true,
+				APIServerStorageType: "unified",
+				UnifiedStorageConfig: unifiedConfig,
+			},
+			Org1Users: org1,
+			OrgBUsers: orgB,
+		})
+		t.Cleanup(helper.Shutdown)
+
+		for _, state := range testStates {
+			t.Run(state.tc.name(), func(t *testing.T) {
+				// Verify resources don't exist in unified storage yet
+				state.tc.verify(t, helper, false)
+			})
+		}
+		verifyRegisteredMigrations(t, helper, false, true)
+	})
+
+	t.Run("Step 4: verify data is migrated to unified storage", func(t *testing.T) {
+		// Migrations enabled by default will run automatically at startup and mode 5 is enforced by the config
 		helper := apis.NewK8sTestHelperWithOpts(t, apis.K8sTestHelperOpts{
 			GrafanaOpts: testinfra.GrafanaOpts{
-				// EnableLog:             true,
 				AppModeProduction:     true,
 				DisableAnonymous:      true,
 				DisableDataMigrations: false, // Run migrations at startup
+				DisableDBCleanup:      true,
 				APIServerStorageType:  "unified",
 			},
 			Org1Users: org1,
@@ -183,7 +218,89 @@ func runMigrationTestSuite(t *testing.T, testCases []resourceMigratorTestCase) {
 				state.tc.verify(t, helper, true)
 			})
 		}
+
+		t.Logf("Verifying migrations are correctly registered")
+		verifyRegisteredMigrations(t, helper, true, false)
 	})
+
+	t.Run("Step 5: verify data is migrated for all migrations", func(t *testing.T) {
+		// Trigger migrations that are not enabled by default
+		unifiedConfig := make(map[string]setting.UnifiedStorageConfig)
+		for _, tc := range testCases {
+			for _, gvr := range tc.resources() {
+				resourceKey := fmt.Sprintf("%s.%s", gvr.Resource, gvr.Group)
+				unifiedConfig[resourceKey] = setting.UnifiedStorageConfig{
+					EnableMigration: true,
+				}
+			}
+		}
+		helper := apis.NewK8sTestHelperWithOpts(t, apis.K8sTestHelperOpts{
+			GrafanaOpts: testinfra.GrafanaOpts{
+				// EnableLog:             true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				DisableDataMigrations: false,
+				APIServerStorageType:  "unified",
+				UnifiedStorageConfig:  unifiedConfig,
+			},
+			Org1Users: org1,
+			OrgBUsers: orgB,
+		})
+		t.Cleanup(helper.Shutdown)
+
+		for _, state := range testStates {
+			t.Run(state.tc.name(), func(t *testing.T) {
+				// Verify resources still exist in unified storage after restart
+				state.tc.verify(t, helper, true)
+			})
+		}
+
+		t.Logf("Verifying migrations are correctly registered")
+		verifyRegisteredMigrations(t, helper, false, false)
+	})
+}
+
+const (
+	migrationScope = "unifiedstorage"
+	migrationTable = migrationScope + "_migration_log"
+
+	playlistsID            = "playlists migration"
+	foldersAndDashboardsID = "folders and dashboards migration"
+)
+
+var migrationIDsToDefault = map[string]bool{
+	playlistsID:            true,
+	foldersAndDashboardsID: false,
+}
+
+func verifyRegisteredMigrations(t *testing.T, helper *apis.K8sTestHelper, onlyDefault bool, optOut bool) {
+	getMigrationsQuery := fmt.Sprintf("SELECT migration_id FROM %s", migrationTable)
+	createTableMigrationID := fmt.Sprintf("create %s table", migrationTable)
+	expectedMigrationIDs := []string{createTableMigrationID}
+	for id, enabled := range migrationIDsToDefault {
+		if onlyDefault && !enabled {
+			continue
+		}
+		if optOut {
+			continue
+		}
+		expectedMigrationIDs = append(expectedMigrationIDs, id)
+	}
+	rows, err := helper.GetEnv().SQLStore.GetEngine().DB().Query(getMigrationsQuery)
+	require.NoError(t, err)
+	defer func() {
+		require.NoError(t, rows.Close())
+	}()
+
+	migrationIDs := make(map[string]struct{})
+	for rows.Next() {
+		var migrationID string
+		require.NoError(t, rows.Scan(&migrationID))
+		require.Contains(t, expectedMigrationIDs, migrationID)
+		migrationIDs[migrationID] = struct{}{}
+	}
+	require.NoError(t, rows.Err())
+	require.Len(t, migrationIDs, len(expectedMigrationIDs))
 }
 
 // verifyResourceCount verifies that the expected number of resources exist in K8s storage

pkg/storage/unified/migrations/resources.go

@@ -7,7 +7,9 @@ import (
 	folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
 	playlists "github.com/grafana/grafana/apps/playlist/pkg/apis/playlist/v0alpha1"
 	"github.com/grafana/grafana/pkg/registry/apis/dashboard/legacy"
+	sqlstoremigrator "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -17,7 +19,13 @@ type ResourceDefinition struct {
 	MigratorFunc  string // Name of the method: "MigrateFolders", "MigrateDashboards", etc.
 }
 
-var registeredResources = []ResourceDefinition{
+type migrationDefinition struct {
+	name         string
+	resources    []string
+	registerFunc func(mg *sqlstoremigrator.Migrator, migrator UnifiedMigrator, client resource.ResourceClient)
+}
+
+var resourceRegistry = []ResourceDefinition{
 	{
 		GroupResource: schema.GroupResource{Group: folders.GROUP, Resource: folders.RESOURCE},
 		MigratorFunc:  "MigrateFolders",
@@ -36,9 +44,50 @@ var registeredResources = []ResourceDefinition{
 	},
 }
 
+var migrationRegistry = []migrationDefinition{
+	{
+		name:         "playlists",
+		resources:    []string{setting.PlaylistResource},
+		registerFunc: registerPlaylistMigration,
+	},
+	{
+		name:         "folders and dashboards",
+		resources:    []string{setting.FolderResource, setting.DashboardResource},
+		registerFunc: registerDashboardAndFolderMigration,
+	},
+}
+
+func registerMigrations(cfg *setting.Cfg, mg *sqlstoremigrator.Migrator, migrator UnifiedMigrator, client resource.ResourceClient) error {
+	for _, migration := range migrationRegistry {
+		var (
+			hasValue   bool
+			allEnabled bool
+		)
+
+		for _, res := range migration.resources {
+			enabled := cfg.UnifiedStorage[res].EnableMigration
+			if !hasValue {
+				allEnabled = enabled
+				hasValue = true
+				continue
+			}
+			if enabled != allEnabled {
+				return fmt.Errorf("cannot migrate resources separately: %v migration must be either all enabled or all disabled", migration.resources)
+			}
+		}
+
+		if !allEnabled {
+			logger.Info("Migration is disabled in config, skipping", "migration", migration.name)
+			continue
+		}
+		migration.registerFunc(mg, migrator, client)
+	}
+	return nil
+}
+
 func getResourceDefinition(group, resource string) *ResourceDefinition {
-	for i := range registeredResources {
-		r := &registeredResources[i]
+	for i := range resourceRegistry {
+		r := &resourceRegistry[i]
 		if r.GroupResource.Group == group && r.GroupResource.Resource == resource {
 			return r
 		}
@@ -80,13 +129,13 @@ func getMigratorFunc(accessor legacy.MigrationDashboardAccessor, group, resource
 
 func validateRegisteredResources() error {
 	registeredMap := make(map[string]bool)
-	for _, gr := range registeredResources {
+	for _, gr := range resourceRegistry {
 		key := fmt.Sprintf("%s.%s", gr.GroupResource.Resource, gr.GroupResource.Group)
 		registeredMap[key] = true
 	}
 
 	var missing []string
-	for _, expected := range setting.MigratedUnifiedResources {
+	for expected := range setting.MigratedUnifiedResources {
 		if !registeredMap[expected] {
 			missing = append(missing, expected)
 		}

pkg/storage/unified/migrations/resources_test.go

@@ -0,0 +1,92 @@
+package migrations
+
+import (
+	"testing"
+
+	sqlstoremigrator "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/storage/unified/resource"
+	"github.com/stretchr/testify/require"
+)
+
+// TestRegisterMigrations exercises registerMigrations with various EnableMigration configs using a table-driven test.
+func TestRegisterMigrations(t *testing.T) {
+	origRegistry := migrationRegistry
+	t.Cleanup(func() { migrationRegistry = origRegistry })
+
+	// helper to build a fake registry with custom register funcs that bump counters
+	makeFakeRegistry := func(migrationCalls map[string]int) []migrationDefinition {
+		return []migrationDefinition{
+			{
+				name:      "playlists",
+				resources: []string{setting.PlaylistResource},
+				registerFunc: func(mg *sqlstoremigrator.Migrator, migrator UnifiedMigrator, client resource.ResourceClient) {
+					migrationCalls["playlists"]++
+				},
+			},
+			{
+				name:      "folders and dashboards",
+				resources: []string{setting.FolderResource, setting.DashboardResource},
+				registerFunc: func(mg *sqlstoremigrator.Migrator, migrator UnifiedMigrator, client resource.ResourceClient) {
+					migrationCalls["folders and dashboards"]++
+				},
+			},
+		}
+	}
+
+	// Build a minimal cfg with UnifiedStorage entries used by registerMigrations
+	makeCfg := func(vals map[string]bool) *setting.Cfg {
+		cfg := &setting.Cfg{UnifiedStorage: make(map[string]setting.UnifiedStorageConfig)}
+		for k, v := range vals {
+			cfg.UnifiedStorage[k] = setting.UnifiedStorageConfig{EnableMigration: v}
+		}
+		return cfg
+	}
+
+	// Table of scenarios
+	tests := []struct {
+		name              string
+		enablePlaylist    bool
+		enableFolder      bool
+		enableDashboard   bool
+		wantPlaylistCalls int
+		wantFDCalls       int
+		wantErr           bool
+	}{
+		{name: "playlists enabled", enablePlaylist: true, wantPlaylistCalls: 1},
+		{name: "playlists disabled", enablePlaylist: false, wantPlaylistCalls: 0},
+		{name: "folders+dashboards both enabled", enableFolder: true, enableDashboard: true, wantFDCalls: 1},
+		{name: "folders enabled, dashboards disabled (mismatch)", enableFolder: true, enableDashboard: false, wantFDCalls: 0, wantErr: true},
+		{name: "folders disabled, dashboards enabled (mismatch)", enableFolder: false, enableDashboard: true, wantFDCalls: 0, wantErr: true},
+		{name: "folders+dashboards both disabled", enableFolder: false, enableDashboard: false, wantFDCalls: 0},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			migrationCalls := map[string]int{
+				"playlists":              0,
+				"folders and dashboards": 0,
+			}
+
+			migrationRegistry = makeFakeRegistry(migrationCalls)
+
+			cfg := makeCfg(map[string]bool{
+				setting.PlaylistResource:  tt.enablePlaylist,
+				setting.FolderResource:    tt.enableFolder,
+				setting.DashboardResource: tt.enableDashboard,
+			})
+
+			// We pass nils for migrator dependencies because our fake registerFuncs don't use them
+			err := registerMigrations(cfg, nil, nil, nil)
+
+			if tt.wantErr {
+				require.Error(t, err, "expected error for mismatched enablement")
+			} else {
+				require.NoError(t, err, "unexpected error")
+			}
+
+			require.Equal(t, tt.wantPlaylistCalls, migrationCalls["playlists"], "playlists register call count")
+			require.Equal(t, tt.wantFDCalls, migrationCalls["folders and dashboards"], "folders+dashboards register call count")
+		})
+	}
+}

pkg/storage/unified/migrations/service.go

@@ -3,7 +3,6 @@ package migrations
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
@@ -49,34 +48,25 @@ func ProvideUnifiedStorageMigrationService(
 }
 
 func (p *UnifiedStorageMigrationServiceImpl) Run(ctx context.Context) error {
-	// TODO: temporary skip migrations in test environments to prevent integration test timeouts.
-	if os.Getenv("GRAFANA_TEST_DB") != "" {
-		return nil
-	}
-
 	// skip migrations if disabled in config
 	if p.cfg.DisableDataMigrations {
 		metrics.MUnifiedStorageMigrationStatus.Set(1)
 		logger.Info("Data migrations are disabled, skipping")
 		return nil
-	} else {
-		metrics.MUnifiedStorageMigrationStatus.Set(2)
-		logger.Info("Data migrations not yet enforced, skipping")
 	}
-
-	// TODO: Re-enable once migrations are ready
-	// TODO: add guarantee that this only runs once
-	// return RegisterMigrations(p.migrator, p.cfg, p.sqlStore, p.client)
-	return nil
+	logger.Info("Running migrations for unified storage")
+	metrics.MUnifiedStorageMigrationStatus.Set(3)
+	return RegisterMigrations(ctx, p.migrator, p.cfg, p.sqlStore, p.client)
 }
 
 func RegisterMigrations(
+	ctx context.Context,
 	migrator UnifiedMigrator,
 	cfg *setting.Cfg,
 	sqlStore db.DB,
 	client resource.ResourceClient,
 ) error {
-	ctx, span := tracer.Start(context.Background(), "storage.unified.RegisterMigrations")
+	ctx, span := tracer.Start(ctx, "storage.unified.RegisterMigrations")
 	defer span.End()
 	mg := sqlstoremigrator.NewScopedMigrator(sqlStore.GetEngine(), cfg, "unifiedstorage")
 	mg.AddCreateMigration()
@@ -89,12 +79,19 @@ func RegisterMigrations(
 		return err
 	}
 
-	// Register resource migrations
-	registerDashboardAndFolderMigration(mg, migrator, client)
-	registerPlaylistMigration(mg, migrator, client)
+	if err := registerMigrations(cfg, mg, migrator, client); err != nil {
+		return err
+	}
 
 	// Run all registered migrations (blocking)
 	sec := cfg.Raw.Section("database")
+	db := mg.DBEngine.DB().DB
+	maxOpenConns := db.Stats().MaxOpenConnections
+	if maxOpenConns <= 2 {
+		// migrations require at least 3 connections due to extra GRPC connections
+		db.SetMaxOpenConns(3)
+		defer db.SetMaxOpenConns(maxOpenConns)
+	}
 	if err := mg.RunMigrations(ctx,
 		sec.Key("migration_locking").MustBool(true),
 		sec.Key("locking_attempt_timeout_sec").MustInt()); err != nil {

pkg/tests/api/alerting/api_convert_prometheus_test.go

@@ -1166,11 +1166,12 @@ func TestIntegrationConvertPrometheusEndpoints_Editor(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
 	dir, gpath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableLegacyAlerting: true,
-		EnableUnifiedAlerting: true,
-		DisableAnonymous:      true,
-		AppModeProduction:     true,
-		EnableRecordingRules:  true,
+		DisableAuthZClientCache: true,
+		DisableLegacyAlerting:   true,
+		EnableUnifiedAlerting:   true,
+		DisableAnonymous:        true,
+		AppModeProduction:       true,
+		EnableRecordingRules:    true,
 	})
 
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, gpath)

pkg/tests/api/alerting/api_provisioning_test.go

@@ -1192,10 +1192,11 @@ func TestIntegrationExportFileProvisionContactPoints(t *testing.T) {
 
 func TestIntegrationFullpath(t *testing.T) {
 	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableLegacyAlerting: true,
-		EnableUnifiedAlerting: true,
-		DisableAnonymous:      true,
-		AppModeProduction:     true,
+		DisableAuthZClientCache: true,
+		DisableLegacyAlerting:   true,
+		EnableUnifiedAlerting:   true,
+		DisableAnonymous:        true,
+		AppModeProduction:       true,
 	})
 
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, p)

pkg/tests/api/alerting/api_ruler_test.go

@@ -53,10 +53,11 @@ func TestIntegrationAlertRulePermissions(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
 	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableLegacyAlerting: true,
-		EnableUnifiedAlerting: true,
-		DisableAnonymous:      true,
-		AppModeProduction:     true,
+		DisableAuthZClientCache: true,
+		DisableLegacyAlerting:   true,
+		EnableUnifiedAlerting:   true,
+		DisableAnonymous:        true,
+		AppModeProduction:       true,
 	})
 
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, p)
@@ -360,10 +361,11 @@ func TestIntegrationAlertRuleNestedPermissions(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
 	dir, p := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableLegacyAlerting: true,
-		EnableUnifiedAlerting: true,
-		DisableAnonymous:      true,
-		AppModeProduction:     true,
+		DisableAuthZClientCache: true,
+		DisableLegacyAlerting:   true,
+		EnableUnifiedAlerting:   true,
+		DisableAnonymous:        true,
+		AppModeProduction:       true,
 	})
 
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, p)
@@ -1429,10 +1431,11 @@ func TestIntegrationRuleGroupSequence(t *testing.T) {
 	testinfra.SQLiteIntegrationTest(t)
 
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableLegacyAlerting: true,
-		EnableUnifiedAlerting: true,
-		DisableAnonymous:      true,
-		AppModeProduction:     true,
+		DisableAuthZClientCache: true,
+		DisableLegacyAlerting:   true,
+		EnableUnifiedAlerting:   true,
+		DisableAnonymous:        true,
+		AppModeProduction:       true,
 	})
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
 

pkg/tests/api/annotations/annotations_test.go

@@ -32,8 +32,9 @@ func TestIntegrationAnnotations(t *testing.T) {
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableAnonymous:     true,
-		EnableFeatureToggles: []string{featuremgmt.FlagAnnotationPermissionUpdate},
+		DisableAuthZClientCache: true,
+		DisableAnonymous:        true,
+		EnableFeatureToggles:    []string{featuremgmt.FlagAnnotationPermissionUpdate},
 	})
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
 	noneUserID := tests.CreateUser(t, env.SQLStore, env.Cfg, user.CreateUserCommand{

pkg/tests/api/dashboards/api_dashboards_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -38,8 +39,15 @@ func TestMain(m *testing.M) {
 func TestIntegrationDashboardServiceValidation(t *testing.T) {
 	testutil.SkipIntegrationTestInShortMode(t)
 
+	unifiedConfig := make(map[string]setting.UnifiedStorageConfig)
+	for _, resource := range []string{"folders.folder.grafana.app", "dashboards.dashboard.grafana.app"} {
+		unifiedConfig[resource] = setting.UnifiedStorageConfig{
+			EnableMigration: true,
+		}
+	}
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableAnonymous: true,
+		DisableAnonymous:     true,
+		UnifiedStorageConfig: unifiedConfig,
 	})
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
 
@@ -218,11 +226,12 @@ func TestIntegrationDashboardServiceValidation(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("When updating uid with id", func(t *testing.T) {
+	dashboardWithDuplicatedLegacyAnnotation := "new-uid"
+	t.Run("When saving a dashboard with an already used legacy ID", func(t *testing.T) {
 		resp, err := postDashboard(t, grafanaListedAddr, "admin", "admin", map[string]interface{}{
 			"dashboard": map[string]interface{}{
 				"id":    savedDashInFolder.ID, // nolint:staticcheck
-				"uid":   "new-uid",
+				"uid":   dashboardWithDuplicatedLegacyAnnotation,
 				"title": "Updated title",
 			},
 			"folderUid": savedDashInFolder.FolderUID,
@@ -234,7 +243,48 @@ func TestIntegrationDashboardServiceValidation(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("When updating uid with a dashboard already using that uid", func(t *testing.T) {
+	t.Run("When updating a dashboard with legacy ID in multiple dashboards", func(t *testing.T) {
+		resp, err := postDashboard(t, grafanaListedAddr, "admin", "admin", map[string]interface{}{
+			"dashboard": map[string]interface{}{
+				"id":    savedDashInFolder.ID, // nolint:staticcheck
+				"uid":   savedDashInGeneralFolder.UID,
+				"title": "Updated title",
+			},
+			"folderUid": savedDashInFolder.FolderUID,
+			"overwrite": true,
+		})
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusInternalServerError, resp.StatusCode)
+		err = resp.Body.Close()
+		require.NoError(t, err)
+		// Delete the dashboard with duplicated legacy ID annotation
+		u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/uid/%s", grafanaListedAddr, dashboardWithDuplicatedLegacyAnnotation)
+		req, err := http.NewRequest("DELETE", u, nil)
+		require.NoError(t, err)
+		resp, err = http.DefaultClient.Do(req)
+		require.NoError(t, err)
+		err = resp.Body.Close()
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+	})
+
+	t.Run("When updating a dashboard already using that uid", func(t *testing.T) {
+		resp, err := postDashboard(t, grafanaListedAddr, "admin", "admin", map[string]interface{}{
+			"dashboard": map[string]interface{}{
+				"id":    savedDashInFolder.ID,
+				"uid":   savedDashInFolder.UID,
+				"title": "Dashboard with existing UID",
+			},
+			"folderUid": savedDashInFolder.FolderUID,
+			"overwrite": true,
+		})
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		err = resp.Body.Close()
+		require.NoError(t, err)
+	})
+
+	t.Run("When updating id with a dashboard already using that uid", func(t *testing.T) {
 		resp, err := postDashboard(t, grafanaListedAddr, "admin", "admin", map[string]interface{}{
 			"dashboard": map[string]interface{}{
 				"id":    savedDashInFolder.ID, // nolint:staticcheck
@@ -268,8 +318,9 @@ func TestIntegrationDashboardServiceValidation(t *testing.T) {
 		require.NoError(t, err)
 	})
 
+	// Obs: in legacy, the dashboard request would fail
+	// After the dashboard is created, the user can see that there is an error with the library panel and can remove them manually
 	t.Run("When creating a dashboard that references a non-existent library panel", func(t *testing.T) {
-		originalCount := getDashboardCount(t, grafanaListedAddr, "admin", "admin")
 		resp, err := postDashboard(t, grafanaListedAddr, "admin", "admin", map[string]interface{}{
 			"dashboard": map[string]interface{}{
 				"title": "Bad dashboard",
@@ -285,15 +336,11 @@ func TestIntegrationDashboardServiceValidation(t *testing.T) {
 			},
 		})
 		require.NoError(t, err)
-		assert.Equal(t, http.StatusInternalServerError, resp.StatusCode)
-		body, err := io.ReadAll(resp.Body)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		_, err = io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		require.Contains(t, string(body), "library element could not be found")
 		err = resp.Body.Close()
 		require.NoError(t, err)
-
-		// A new dashboard is not created in this situation.
-		require.Equal(t, originalCount, getDashboardCount(t, grafanaListedAddr, "admin", "admin"))
 	})
 }
 
@@ -332,7 +379,7 @@ func TestIntegrationDashboardQuota(t *testing.T) {
 		dashboardDTO := &plugindashboards.PluginDashboard{}
 		err = json.Unmarshal(b, dashboardDTO)
 		require.NoError(t, err)
-		require.EqualValues(t, 1, dashboardDTO.DashboardId)
+		require.EqualValues(t, "just testing", dashboardDTO.Title)
 	})
 
 	t.Run("when quota limit exceeds importing a dashboard should fail", func(t *testing.T) {
@@ -421,7 +468,7 @@ providers:
 			dashboardUID = d.UID
 			dashboardID = d.ID // nolint:staticcheck
 		}
-		assert.Equal(t, int64(1), dashboardID)
+		assert.Len(t, *dashboardList, 1)
 
 		testCases := []struct {
 			desc          string
@@ -781,7 +828,7 @@ func TestIntegrationImportDashboardWithLibraryPanels(t *testing.T) {
 				},
 				{
 					"id": 2,
-					"title": "Library Panel 2", 
+					"title": "Library Panel 2",
 					"type": "stat",
 					"gridPos": {"h": 8, "w": 12, "x": 12, "y": 0},
 					"libraryPanel": {
@@ -805,7 +852,7 @@ func TestIntegrationImportDashboardWithLibraryPanels(t *testing.T) {
 					}
 				},
 				"test-lib-panel-2": {
-					"uid": "test-lib-panel-2", 
+					"uid": "test-lib-panel-2",
 					"name": "Test Library Panel 2",
 					"kind": 1,
 					"type": "stat",
@@ -1011,26 +1058,12 @@ func postDashboard(t *testing.T, grafanaListedAddr, user, password string, paylo
 	return http.Post(u, "application/json", bytes.NewBuffer(payloadBytes)) // nolint:gosec
 }
 
-func getDashboardCount(t *testing.T, grafanaListenAddr, user, password string) int {
-	endpoint := fmt.Sprintf("http://%s:%s@%s/apis/dashboard.grafana.app/v0alpha1/namespaces/default/search", user, password, grafanaListenAddr)
-	resp, err := http.Get(endpoint) //nolint:gosec
-	require.NoError(t, err)
-
-	body, err := io.ReadAll(resp.Body)
-	require.NoError(t, err)
-	require.NoError(t, resp.Body.Close())
-
-	var payload map[string]any
-	require.NoError(t, json.Unmarshal(body, &payload))
-
-	return int(payload["totalHits"].(float64))
-}
-
 func TestIntegrationDashboardServicePermissions(t *testing.T) {
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
-		DisableAnonymous: true,
+		DisableAnonymous:        true,
+		DisableAuthZClientCache: true,
 	})
 	grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path)
 	tests.CreateUser(t, env.SQLStore, env.Cfg, user.CreateUserCommand{

pkg/tests/apis/collections/stars_test.go

@@ -42,9 +42,10 @@ func TestIntegrationStars(t *testing.T) {
 		}
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false, // required for experimental APIs
-			DisableAnonymous:     true,
-			EnableFeatureToggles: flags,
+			DisableDataMigrations: true,
+			AppModeProduction:     false, // required for experimental APIs
+			DisableAnonymous:      true,
+			EnableFeatureToggles:  flags,
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				"dashboards.dashboard.grafana.app": {
 					DualWriterMode: mode,

pkg/tests/apis/dashboard/dashboards_test.go

@@ -37,7 +37,8 @@ func TestMain(m *testing.M) {
 func runDashboardTest(t *testing.T, mode rest.DualWriterMode, gvr schema.GroupVersionResource) {
 	t.Run("simple crud+list", func(t *testing.T) {
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			DisableAnonymous: true,
+			DisableAnonymous:      true,
+			DisableDataMigrations: true,
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				"dashboards.dashboard.grafana.app": {
 					DualWriterMode: mode,
@@ -194,7 +195,9 @@ func TestIntegrationLegacySupport(t *testing.T) {
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	ctx := context.Background()
-	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{})
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		DisableDataMigrations: true,
+	})
 
 	clientV0 := helper.GetResourceClient(apis.ResourceClientArgs{
 		User: helper.Org1.Admin,
@@ -500,9 +503,10 @@ func runDashboardSearchTest(t *testing.T, mode rest.DualWriterMode) {
 		ctx := context.Background()
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "unified",
+			AppModeProduction:     true,
+			DisableDataMigrations: true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "unified",
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				"dashboards.dashboard.grafana.app": {DualWriterMode: mode},
 				"folders.folder.grafana.app":       {DualWriterMode: mode},

pkg/tests/apis/dashboard/integration/api_validation_test.go

@@ -68,7 +68,8 @@ func TestIntegrationDashboardAPIValidation(t *testing.T) {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			// Create a K8sTestHelper which will set up a real API server
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				EnableFeatureToggles: []string{
 					featuremgmt.FlagKubernetesDashboards, // Enable FE-only dashboard feature flag
 				},
@@ -105,7 +106,8 @@ func TestIntegrationDashboardAPIValidation(t *testing.T) {
 		t.Run(fmt.Sprintf("DualWriterMode %d - kubernetesDashboards disabled", dualWriterMode), func(t *testing.T) {
 			// Create a K8sTestHelper which will set up a real API server
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				DisableFeatureToggles: []string{
 					featuremgmt.FlagKubernetesDashboards,
 				},
@@ -138,7 +140,8 @@ func TestIntegrationDashboardAPIAuthorization(t *testing.T) {
 	for _, dualWriterMode := range dualWriterModes {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					"dashboards.dashboard.grafana.app": {
 						DualWriterMode: dualWriterMode,
@@ -185,7 +188,8 @@ func TestIntegrationDashboardAPI(t *testing.T) {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			// Create a K8sTestHelper which will set up a real API server
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				EnableFeatureToggles: []string{
 					featuremgmt.FlagKubernetesDashboards,
 				},

pkg/tests/apis/dashboard/integration/library_panels_api_validation_test.go

@@ -29,7 +29,8 @@ func TestIntegrationLibraryPanelConnections(t *testing.T) {
 	for _, dualWriterMode := range dualWriterModes {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				EnableFeatureToggles: []string{
 					"kubernetesLibraryPanels",
 				},
@@ -93,7 +94,8 @@ func TestIntegrationLibraryElementPermissions(t *testing.T) {
 	for _, dualWriterMode := range dualWriterModes {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				EnableFeatureToggles: []string{
 					"kubernetesLibraryPanels",
 					"grafanaAPIServerWithExperimentalAPIs", // needed until we move it to v0beta1 at least (currently v0alpha1)
@@ -296,7 +298,8 @@ func TestIntegrationLibraryPanelConnectionsWithFolderAccess(t *testing.T) {
 	for _, dualWriterMode := range dualWriterModes {
 		t.Run(fmt.Sprintf("DualWriterMode %d", dualWriterMode), func(t *testing.T) {
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				DisableAnonymous: true,
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
 				EnableFeatureToggles: []string{
 					"kubernetesLibraryPanels",
 				},

pkg/tests/apis/dashboard/search_test.go

@@ -37,9 +37,10 @@ func runSearchPermissionTest(t *testing.T, mode rest.DualWriterMode) {
 		ctx := context.Background()
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "unified",
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "unified",
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				"dashboards.dashboard.grafana.app": {DualWriterMode: mode},
 				"folders.folder.grafana.app":       {DualWriterMode: mode},

pkg/tests/apis/folder/folder_tree_test.go

@@ -48,9 +48,10 @@ func TestIntegrationFolderTree(t *testing.T) {
 	for _, mode := range modes {
 		t.Run(fmt.Sprintf("mode %d", mode), func(t *testing.T) {
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					"dashboards.dashboard.grafana.app": {
 						DualWriterMode: mode,

pkg/tests/apis/folder/folders_test.go

@@ -139,9 +139,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 
 		t.Run(fmt.Sprintf("with dual write (unified storage, mode %v)", modeDw), func(t *testing.T) {
 			doFolderTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -153,9 +154,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 
 		t.Run(fmt.Sprintf("with dual write (unified storage, mode %v, create nested folders)", modeDw), func(t *testing.T) {
 			doNestedCreateTest(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -166,9 +168,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 
 		t.Run(fmt.Sprintf("with dual write (unified storage, mode %v, create existing folder)", modeDw), func(t *testing.T) {
 			doCreateDuplicateFolderTest(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -179,9 +182,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 
 		t.Run(fmt.Sprintf("when creating a folder, mode %v, it should trim leading and trailing spaces", modeDw), func(t *testing.T) {
 			doCreateEnsureTitleIsTrimmedTest(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -192,9 +196,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 
 		t.Run(fmt.Sprintf("with dual write (unified storage, mode %v, create circular reference folder)", modeDw), func(t *testing.T) {
 			doCreateCircularReferenceFolderTest(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -218,9 +223,10 @@ func TestIntegrationFoldersApp(t *testing.T) {
 		for _, mode := range modes {
 			t.Run(fmt.Sprintf("mode %d", mode), func(t *testing.T) {
 				doListFoldersTest(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-					AppModeProduction:    true,
-					DisableAnonymous:     true,
-					APIServerStorageType: "unified",
+					DisableDataMigrations: true,
+					AppModeProduction:     true,
+					DisableAnonymous:      true,
+					APIServerStorageType:  "unified",
 					UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 						folders.RESOURCEGROUP: {
 							DualWriterMode: mode,
@@ -735,9 +741,10 @@ func TestIntegrationFolderCreatePermissions(t *testing.T) {
 		t.Run(fmt.Sprintf("Mode_%d", mode), func(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -862,9 +869,10 @@ func TestIntegrationFolderGetPermissions(t *testing.T) {
 		t.Run(fmt.Sprintf("Mode_%d", mode), func(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1079,9 +1087,10 @@ func TestIntegrationFoldersCreateAPIEndpointK8S(t *testing.T) {
 	for mode := 0; mode <= 4; mode++ {
 		modeDw := grafanarest.DualWriterMode(mode)
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "unified",
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "unified",
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				folders.RESOURCEGROUP: {
 					DualWriterMode: modeDw,
@@ -1254,9 +1263,10 @@ func TestIntegrationFoldersGetAPIEndpointK8S(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1366,9 +1376,10 @@ func TestIntegrationFolderDeletionBlockedByLibraryElements(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1446,9 +1457,10 @@ func TestIntegrationRootFolderDeletionBlockedByLibraryElementsInSubfolder(t *tes
 			modeDw := grafanarest.DualWriterMode(mode)
 
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1542,9 +1554,10 @@ func TestIntegrationFolderDeletionBlockedByConnectedLibraryPanels(t *testing.T)
 			modeDw := grafanarest.DualWriterMode(mode)
 
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1620,9 +1633,10 @@ func TestIntegrationFolderDeletionWithDanglingLibraryPanels(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -1901,9 +1915,10 @@ func TestIntegrationDeleteNestedFoldersPostorder(t *testing.T) {
 		t.Run(fmt.Sprintf("Mode %d: Delete nested folder hierarchy in postorder", mode), func(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 			helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-				AppModeProduction:    true,
-				DisableAnonymous:     true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				AppModeProduction:     true,
+				DisableAnonymous:      true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -2027,9 +2042,10 @@ func TestIntegrationDeleteFolderWithProvisionedDashboards(t *testing.T) {
 		t.Run(fmt.Sprintf("Mode %d: Delete provisioned folders and dashboards", mode), func(t *testing.T) {
 			modeDw := grafanarest.DualWriterMode(mode)
 			ops := testinfra.GrafanaOpts{
-				DisableAnonymous:     true,
-				AppModeProduction:    true,
-				APIServerStorageType: "unified",
+				DisableDataMigrations: true,
+				DisableAnonymous:      true,
+				AppModeProduction:     true,
+				APIServerStorageType:  "unified",
 				UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 					folders.RESOURCEGROUP: {
 						DualWriterMode: modeDw,
@@ -2131,11 +2147,14 @@ func TestIntegrationDeleteFolderWithProvisionedDashboards(t *testing.T) {
 // Test that folders created during provisioning using the dual writer have the
 // appropriate labels and annotations in unified storage.
 func TestIntegrationProvisionedFolderPropagatesLabelsAndAnnotations(t *testing.T) {
+	testutil.SkipIntegrationTestInShortMode(t)
+
 	mode3 := grafanarest.DualWriterMode(3)
 	ops := testinfra.GrafanaOpts{
-		DisableAnonymous:     true,
-		AppModeProduction:    true,
-		APIServerStorageType: "unified",
+		DisableDataMigrations: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+		APIServerStorageType:  "unified",
 		UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 			folders.RESOURCEGROUP: {
 				DualWriterMode: mode3,

pkg/tests/apis/openapi_snapshots/playlist.grafana.app-v0alpha1.json

@@ -40,7 +40,7 @@
         "tags": [
           "Playlist"
         ],
-        "description": "list objects of kind Playlist",
+        "description": "list or watch objects of kind Playlist",
         "operationId": "listPlaylist",
         "parameters": [
           {
@@ -1850,6 +1850,32 @@
         "description": "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.",
         "type": "string",
         "format": "date-time"
+      },
+      "io.k8s.apimachinery.pkg.apis.meta.v1.WatchEvent": {
+        "description": "Event represents a single event to a watched resource.",
+        "type": "object",
+        "required": [
+          "type",
+          "object"
+        ],
+        "properties": {
+          "object": {
+            "description": "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *Status is recommended; other types may make sense\n   depending on context.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/io.k8s.apimachinery.pkg.runtime.RawExtension"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "default": ""
+          }
+        }
+      },
+      "io.k8s.apimachinery.pkg.runtime.RawExtension": {
+        "description": "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
+        "type": "object"
       }
     }
   }

pkg/tests/apis/playlist/playlist_test.go

@@ -54,47 +54,48 @@ func TestIntegrationPlaylist(t *testing.T) {
 		require.NoError(t, err)
 		// t.Logf("%s", disco)
 		require.JSONEq(t, `[
-			{
-			  "version": "v0alpha1",
-			  "freshness": "Current",
-			  "resources": [
-				{
-				  "resource": "playlists",
-				  "responseKind": {
-					"group": "",
-					"kind": "Playlist",
-					"version": ""
-				  },
-				  "scope": "Namespaced",
-				  "singularResource": "playlist",
-				  "subresources": [
-					{
-					  "responseKind": {
-						"group": "",
-						"kind": "Playlist",
-						"version": ""
-					  },
-					  "subresource": "status",
-					  "verbs": [
-						"get",
-						"patch",
-						"update"
-					  ]
-					}
-				  ],
-				  "verbs": [
-					"create",
-					"delete",
-					"deletecollection",
-					"get",
-					"list",
-					"patch",
-					"update"
-				  ]
-				}
-			  ]
-			}
-		  ]`, disco)
+          {
+            "freshness": "Current",
+            "resources": [
+              {
+                "resource": "playlists",
+                "responseKind": {
+                  "group": "",
+                  "kind": "Playlist",
+                  "version": ""
+                },
+                "scope": "Namespaced",
+                "singularResource": "playlist",
+                "subresources": [
+                  {
+                    "responseKind": {
+                      "group": "",
+                      "kind": "Playlist",
+                      "version": ""
+                    },
+                    "subresource": "status",
+                    "verbs": [
+                      "get",
+                      "patch",
+                      "update"
+                    ]
+                  }
+                ],
+                "verbs": [
+                  "create",
+                  "delete",
+                  "deletecollection",
+                  "get",
+                  "list",
+                  "patch",
+                  "update",
+                  "watch"
+                ]
+              }
+            ],
+            "version": "v0alpha1"
+          }
+        ]`, disco)
 	})
 
 	t.Run("with k8s api flag", func(t *testing.T) {
@@ -106,9 +107,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (file, mode 0)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "file", // write the files to disk
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "file", // write the files to disk
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode0,
@@ -119,9 +121,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (file, mode 1)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "file", // write the files to disk
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "file", // write the files to disk
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode1,
@@ -132,9 +135,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (file, mode 2)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "file", // write the files to disk
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "file", // write the files to disk
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode2,
@@ -145,9 +149,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (file, mode 3)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "file", // write the files to disk
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "file", // write the files to disk
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode3,
@@ -158,9 +163,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (file, mode 5)", func(t *testing.T) {
 		helper := doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: "file", // write the files to disk
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  "file", // write the files to disk
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode5,
@@ -198,9 +204,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (unified storage, mode 0)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false, // required for  unified storage
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeUnified, // use the entity api tables
+			DisableDataMigrations: true,
+			AppModeProduction:     false, // required for  unified storage
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeUnified, // use the entity api tables
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode0,
@@ -211,18 +218,20 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (unified storage, mode 1)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeUnified,
-			EnableFeatureToggles: []string{},
+			DisableDataMigrations: true,
+			AppModeProduction:     false,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeUnified,
+			EnableFeatureToggles:  []string{},
 		}))
 	})
 
 	t.Run("with dual write (unified storage, mode 2)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false, // required for  unified storage
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeUnified, // use the entity api tables
+			DisableDataMigrations: true,
+			AppModeProduction:     false, // required for  unified storage
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeUnified, // use the entity api tables
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode2,
@@ -233,9 +242,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (unified storage, mode 3)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false, // required for  unified storage
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeUnified, // use the entity api tables
+			DisableDataMigrations: true,
+			AppModeProduction:     false, // required for  unified storage
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeUnified, // use the entity api tables
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode3,
@@ -246,9 +256,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 
 	t.Run("with dual write (unified storage, mode 5)", func(t *testing.T) {
 		doPlaylistTests(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    false, // required for  unified storage
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeUnified, // use the entity api tables
+			DisableDataMigrations: true,
+			AppModeProduction:     false, // required for  unified storage
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeUnified, // use the entity api tables
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode5,
@@ -262,9 +273,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 		t.Skip("local etcd testing")
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeEtcd, // requires etcd running on localhost:2379
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeEtcd, // requires etcd running on localhost:2379
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode0,
@@ -288,9 +300,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 		t.Skip("local etcd testing")
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeEtcd, // requires etcd running on localhost:2379
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeEtcd, // requires etcd running on localhost:2379
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode1,
@@ -314,9 +327,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 		t.Skip("local etcd testing")
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeEtcd, // requires etcd running on localhost:2379
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeEtcd, // requires etcd running on localhost:2379
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode2,
@@ -340,9 +354,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 		t.Skip("local etcd testing")
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeEtcd, // requires etcd running on localhost:2379
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeEtcd, // requires etcd running on localhost:2379
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode3,
@@ -366,9 +381,10 @@ func TestIntegrationPlaylist(t *testing.T) {
 		t.Skip("local etcd testing")
 
 		helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-			AppModeProduction:    true,
-			DisableAnonymous:     true,
-			APIServerStorageType: options.StorageTypeEtcd, // requires etcd running on localhost:2379
+			DisableDataMigrations: true,
+			AppModeProduction:     true,
+			DisableAnonymous:      true,
+			APIServerStorageType:  options.StorageTypeEtcd, // requires etcd running on localhost:2379
 			UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
 				RESOURCEGROUP: {
 					DualWriterMode: grafanarest.Mode5,

pkg/tests/testinfra/testinfra.go

@@ -362,6 +362,13 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 	_, err = rbacSect.NewKey("permission_cache", "false")
 	require.NoError(t, err)
 
+	if opts.DisableAuthZClientCache {
+		authzSect, err := cfg.NewSection("authorization")
+		require.NoError(t, err)
+		_, err = authzSect.NewKey("cache_ttl", "0")
+		require.NoError(t, err)
+	}
+
 	analyticsSect, err := cfg.NewSection("analytics")
 	require.NoError(t, err)
 	_, err = analyticsSect.NewKey("intercom_secret", "intercom_secret_at_config")
@@ -547,6 +554,8 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 			require.NoError(t, err)
 			_, err = section.NewKey("dualWriterMode", fmt.Sprintf("%d", v.DualWriterMode))
 			require.NoError(t, err)
+			_, err = section.NewKey("enableMigration", fmt.Sprintf("%t", v.EnableMigration))
+			require.NoError(t, err)
 		}
 	}
 	if opts.UnifiedStorageEnableSearch {
@@ -670,6 +679,7 @@ type GrafanaOpts struct {
 	DisableDataMigrations                 bool
 	SecretsManagerEnableDBMigrations      bool
 	OpenFeatureAPIEnabled                 bool
+	DisableAuthZClientCache               bool
 
 	// Allow creating grafana dir beforehand
 	Dir     string

public/app/core/components/Login/LoginCtrl.tsx

@@ -119,11 +119,11 @@ export const LoginCtrl = memo(({ resetCode, children }: Props) => {
   }, []);
 
   const login = useCallback(
-    (formModel: FormModel) => {
+    async (formModel: FormModel) => {
       setLoginErrorMessage(undefined);
       setIsLoggingIn(true);
 
-      getBackendSrv()
+      return getBackendSrv()
         .post<LoginDTO>('/login', formModel, { showErrorAlert: false })
         .then((result) => {
           setResult(result);