wip: improve the working branch

docs: add comments explaining blur timeout pattern
- Explain why blur timeout is needed for focus transitions - Clarify that it handles focus moving between related UI elements - Addresses review feedback requesting explanation of blur timeout
2026-01-09 17:11:30 -05:00 · 2026-01-06 19:34:20 -05:00 · 2026-01-06 19:29:28 -05:00 · 2026-01-06 19:23:40 -05:00 · 2026-01-06 19:18:33 -05:00 · 2026-01-06 19:14:29 -05:00
222 changed files with 1441 additions and 5272 deletions
@@ -501,6 +501,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/filter-annotations.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
+/e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/grafana-datasource-random-walk.spec.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
@@ -519,7 +520,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
 /e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/visualization-suggestions*.spec.ts @grafana/dataviz-squad
+/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform

 # Packages
@@ -0,0 +1,99 @@
+# Contribution: Pie Chart Keyboard Focus Indicator Fix
+
+## Issue
+**Issue #114227**: Keyboard focus indicator is not visible on data links in Pie Chart visualization
+
+When keyboard users navigate through a Pie Chart panel using the Tab key, data links (clickable links on chart segments) do not show a visible focus indicator. This makes it impossible for keyboard-only users to know which element is currently focused, reducing navigation clarity and accessibility.
+
+## Problem Analysis
+
+### Root Cause
+1. Pie chart slices with data links are rendered as SVG `<g>` elements
+2. These elements are not naturally keyboard focusable (SVG elements need `tabIndex` to be focusable)
+3. No focus event handlers were attached to trigger visual feedback
+4. No keyboard activation support (Enter/Space keys)
+
+### Two Rendering Cases
+- **Single link case**: `DataLinksContextMenu` wraps the slice in an `<a>` tag
+- **Multiple links case**: `DataLinksContextMenu` provides an `openMenu` function via render prop
+
+## Solution Approach
+
+### 1. Data Link Detection
+- Check for data links using `arc.data.hasLinks` and `arc.data.getLinks`
+- Determine if slice should be focusable based on presence of links
+
+### 2. Keyboard Accessibility
+- Added `tabIndex={0}` for slices with data links (multiple links case)
+- Added `tabIndex={-1}` for slices wrapped in `<a>` tag (single link case) to prevent double focus
+- Added `role="link"` and `aria-label` for proper screen reader support
+
+### 3. Focus Indicator
+- Leveraged Grafana's existing `DataHoverEvent` system for highlighting
+- On focus, publish `DataHoverEvent` to trigger the same visual highlight as mouse hover
+- On blur, publish `DataHoverClearEvent` to clear the highlight
+- Used a small delay on blur to prevent flickering during focus transitions
+
+### 4. Keyboard Activation
+- Added `handleKeyDown` to handle Enter key presses
+- For multiple links: Create synthetic mouse event and call `openMenu` directly
+- For single link: Dispatch native click event to trigger the `<a>` tag's default behavior
+
+### 5. Single Link Case Handling
+- Detected when slice is wrapped in `<a>` tag (when `openMenu` is undefined)
+- Attached focus/blur event listeners to the parent `<a>` tag
+- Ensured inner `<g>` element has `tabIndex={-1}` to prevent tab order conflicts
+- Ensured `<a>` tag is properly focusable (remove any `tabIndex="-1"` if present)
+
+### 6. Tab Order Optimization
+- Sorted slices with data links first in the DOM to ensure proper tab order
+- This ensures keyboard users reach interactive elements before non-interactive ones
+
+## Implementation Details
+
+### Key Changes in `PieChart.tsx`
+
+1. **Imports**: Added `useRef` and `useEffect` from React
+
+2. **SliceProps Interface**: Added `outerRadius` and `innerRadius` props to calculate click coordinates
+
+3. **PieSlice Component**:
+   - Added `elementRef` and `blurTimeoutRef` for DOM manipulation and blur handling
+   - Detected data links: `hasDataLinksDirect` and `hasDataLinks`
+   - Determined focusability: `shouldBeFocusable` (true only for multiple links case)
+   - Added `useEffect` hook to handle single link case (`<a>` tag focus/blur)
+   - Added `handleFocus` callback to publish `DataHoverEvent` on focus
+   - Added `handleBlur` callback to publish `DataHoverClearEvent` on blur (with delay)
+   - Added `handleKeyDown` callback to handle Enter key activation
+   - Updated `<g>` element with accessibility attributes:
+     - `tabIndex={shouldBeFocusable ? 0 : -1}`
+     - `role={shouldBeFocusable ? 'link' : undefined}`
+     - `aria-label={shouldBeFocusable ? ... : undefined}`
+     - `onKeyDown={shouldBeFocusable ? handleKeyDown : undefined}`
+     - `onFocus={hasDataLinks ? handleFocus : undefined}`
+     - `onBlur={hasDataLinks ? handleBlur : undefined}`
+     - `style={{ outline: 'none' }}` to remove browser default outline
+
+4. **PieChart Component**:
+   - Added sorting to `pie.arcs.map` to put slices with data links first
+   - Passed `outerRadius` and `innerRadius` to `PieSlice` components
+
+## Testing
+
+### Expected Behavior
+- Tab navigation reaches slices with data links
+- Focused slice shows visual highlight (scales up, others fade)
+- Enter key activates the data link menu
+- Tab order is logical (data link slices appear before non-link slices)
+
+## Files Modified
+
+- `public/app/plugins/panel/piechart/PieChart.tsx`
+
+## References
+
+- [WCAG 2.4.7 Focus Visible](https://www.w3.org/WAI/WCAG21/Understanding/focus-visible.html)
+- [Grafana Contributing Guide](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md)
+- Issue: https://github.com/grafana/grafana/issues/114227
+
+
@@ -157,7 +157,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect
@@ -619,8 +619,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=
@@ -4,7 +4,7 @@ go 1.25.5

 require (
 	github.com/go-kit/log v0.2.1
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4
 	github.com/grafana/grafana-app-sdk v0.48.7
 	github.com/grafana/grafana-app-sdk/logging v0.48.7
@@ -243,8 +243,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 h1:jSojuc7njleS3UOz223WDlXOinmuLAIPI0z2vtq8EgI=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4/go.mod h1:VahT+GtfQIM+o8ht2StR6J9g+Ef+C2Vokh5uuSmOD/4=
 github.com/grafana/grafana-app-sdk v0.48.7 h1:9mF7nqkqP0QUYYDlznoOt+GIyjzj45wGfUHB32u2ZMo=
@@ -180,15 +180,12 @@ func countAnnotationsV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if annotationList, ok := annotations["list"].([]interface{}); ok {
-		return len(annotationList)
-	}
-	if annotationList, ok := annotations["list"].([]map[string]interface{}); ok {
-		return len(annotationList)
+	annotationList, ok := annotations["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(annotationList)
 }

 // countLinksV0V1 counts dashboard links in v0alpha1 or v1beta1 dashboard spec
@@ -197,15 +194,12 @@ func countLinksV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if links, ok := spec["links"].([]interface{}); ok {
-		return len(links)
-	}
-	if links, ok := spec["links"].([]map[string]interface{}); ok {
-		return len(links)
+	links, ok := spec["links"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(links)
 }

 // countVariablesV0V1 counts template variables in v0alpha1 or v1beta1 dashboard spec
@@ -219,15 +213,12 @@ func countVariablesV0V1(spec map[string]interface{}) int {
 		return 0
 	}

-	// Handle both []interface{} (from JSON unmarshaling) and []map[string]interface{} (from programmatic creation)
-	if variableList, ok := templating["list"].([]interface{}); ok {
-		return len(variableList)
-	}
-	if variableList, ok := templating["list"].([]map[string]interface{}); ok {
-		return len(variableList)
+	variableList, ok := templating["list"].([]interface{})
+	if !ok {
+		return 0
 	}

-	return 0
+	return len(variableList)
 }

 // collectStatsV0V1 collects statistics from v0alpha1 or v1beta1 dashboard
@@ -1,142 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v1beta1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "title": "BOM Stripping Test Dashboard",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "schemaVersion": 42,
-    "tags": ["test", "bom"],
-    "editable": true,
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "url": "http://example.com?var=${datasource}&other=value",
-        "targetBlank": true,
-        "icon": "external link"
-      }
-    ],
-    "panels": [
-      {
-        "id": 1,
-        "type": "table",
-        "title": "Panel with BOM in field config override links",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {"color": "green"},
-                {"color": "red", "value": 80}
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "server"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "Override link with BOM",
-                      "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "links": [
-          {
-            "title": "Panel data link with BOM",
-            "url": "http://example.com/${__data.fields.cluster}&var=value",
-            "targetBlank": true
-          }
-        ],
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      },
-      {
-        "id": 2,
-        "type": "timeseries",
-        "title": "Panel with BOM in options dataLinks",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "options": {
-          "legend": {
-            "showLegend": true,
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "dataLinks": [
-            {
-              "title": "Options data link with BOM",
-              "url": "http://example.com?series=${__series.name}&time=${__value.time}",
-              "targetBlank": true
-            }
-          ]
-        },
-        "fieldConfig": {
-          "defaults": {
-            "links": [
-              {
-                "title": "Field config default link with BOM",
-                "url": "http://example.com?field=${__field.name}&value=${__value.raw}",
-                "targetBlank": false
-              }
-            ]
-          },
-          "overrides": []
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            }
-          }
-        ]
-      }
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": ["5s", "10s", "30s", "1m", "5m"]
-    }
-  }
-}
-
@@ -120,7 +120,7 @@
                        "value": [
                          {
                            "title": "filter",
-                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
+                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
                          }
                        ]
                      }
@@ -124,7 +124,7 @@
                        "value": [
                          {
                            "title": "filter",
-                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
+                            "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
                          }
                        ]
                      }
@@ -2051,4 +2051,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -2691,4 +2691,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -2764,4 +2764,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -1173,4 +1173,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -1618,4 +1618,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -1670,4 +1670,4 @@
      "storedVersion": "v0alpha1"
    }
  }
-}
+}
@@ -1,161 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v0alpha1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "links": [
-      {
-        "icon": "external link",
-        "targetBlank": true,
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "url": "http://example.com?var=${datasource}\u0026other=value"
-      }
-    ],
-    "panels": [
-      {
-        "fieldConfig": {
-          "defaults": {
-            "custom": {},
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "server"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "Override link with BOM",
-                      "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 1,
-        "links": [
-          {
-            "targetBlank": true,
-            "title": "Panel data link with BOM",
-            "url": "http://example.com/${__data.fields.cluster}\u0026var=value"
-          }
-        ],
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            },
-            "refId": "A"
-          }
-        ],
-        "title": "Panel with BOM in field config override links",
-        "type": "table"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": false,
-                "title": "Field config default link with BOM",
-                "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-              }
-            ]
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "dataLinks": [
-            {
-              "targetBlank": true,
-              "title": "Options data link with BOM",
-              "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-            }
-          ],
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          }
-        },
-        "targets": [
-          {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "test-ds"
-            },
-            "refId": "A"
-          }
-        ],
-        "title": "Panel with BOM in options dataLinks",
-        "type": "timeseries"
-      }
-    ],
-    "schemaVersion": 42,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ]
-    },
-    "title": "BOM Stripping Test Dashboard"
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}
@@ -1,242 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2alpha1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "annotations": [],
-    "cursorSync": "Off",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Panel with BOM in field config override links",
-          "description": "",
-          "links": [
-            {
-              "title": "Panel data link with BOM",
-              "url": "http://example.com/${__data.fields.cluster}\u0026var=value",
-              "targetBlank": true
-            }
-          ],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {}
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "test-ds"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "table",
-            "spec": {
-              "pluginVersion": "",
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": null,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  }
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "server"
-                    },
-                    "properties": [
-                      {
-                        "id": "links",
-                        "value": [
-                          {
-                            "title": "Override link with BOM",
-                            "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "Panel with BOM in options dataLinks",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {}
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "test-ds"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "timeseries",
-            "spec": {
-              "pluginVersion": "",
-              "options": {
-                "dataLinks": [
-                  {
-                    "targetBlank": true,
-                    "title": "Options data link with BOM",
-                    "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-                  }
-                ],
-                "legend": {
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "links": [
-                    {
-                      "targetBlank": false,
-                      "title": "Field config default link with BOM",
-                      "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-                    }
-                  ]
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "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"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "icon": "external link",
-        "tooltip": "",
-        "url": "http://example.com?var=${datasource}\u0026other=value",
-        "tags": [],
-        "asDropdown": false,
-        "targetBlank": true,
-        "includeVars": false,
-        "keepTime": false
-      }
-    ],
-    "liveNow": false,
-    "preload": false,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "BOM Stripping Test Dashboard",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}
@@ -1,246 +0,0 @@
-{
-  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v2beta1",
-  "metadata": {
-    "name": "bom-in-links-test",
-    "namespace": "org-1",
-    "labels": {
-      "test": "bom-stripping"
-    }
-  },
-  "spec": {
-    "annotations": [],
-    "cursorSync": "Off",
-    "description": "Testing that BOM characters are stripped from URLs during conversion",
-    "editable": true,
-    "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Panel with BOM in field config override links",
-          "description": "",
-          "links": [
-            {
-              "title": "Panel data link with BOM",
-              "url": "http://example.com/${__data.fields.cluster}\u0026var=value",
-              "targetBlank": true
-            }
-          ],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "test-ds"
-                      },
-                      "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "table",
-            "version": "",
-            "spec": {
-              "options": {},
-              "fieldConfig": {
-                "defaults": {
-                  "thresholds": {
-                    "mode": "absolute",
-                    "steps": [
-                      {
-                        "value": null,
-                        "color": "green"
-                      },
-                      {
-                        "value": 80,
-                        "color": "red"
-                      }
-                    ]
-                  }
-                },
-                "overrides": [
-                  {
-                    "matcher": {
-                      "id": "byName",
-                      "options": "server"
-                    },
-                    "properties": [
-                      {
-                        "id": "links",
-                        "value": [
-                          {
-                            "title": "Override link with BOM",
-                            "url": "http://localhost:3000/d/test?var-datacenter=${__data.fields[datacenter]}\u0026var-server=${__value.raw}"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          }
-        }
-      },
-      "panel-2": {
-        "kind": "Panel",
-        "spec": {
-          "id": 2,
-          "title": "Panel with BOM in options dataLinks",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "test-ds"
-                      },
-                      "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "timeseries",
-            "version": "",
-            "spec": {
-              "options": {
-                "dataLinks": [
-                  {
-                    "targetBlank": true,
-                    "title": "Options data link with BOM",
-                    "url": "http://example.com?series=${__series.name}\u0026time=${__value.time}"
-                  }
-                ],
-                "legend": {
-                  "displayMode": "list",
-                  "placement": "bottom",
-                  "showLegend": true
-                }
-              },
-              "fieldConfig": {
-                "defaults": {
-                  "links": [
-                    {
-                      "targetBlank": false,
-                      "title": "Field config default link with BOM",
-                      "url": "http://example.com?field=${__field.name}\u0026value=${__value.raw}"
-                    }
-                  ]
-                },
-                "overrides": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "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"
-              }
-            }
-          }
-        ]
-      }
-    },
-    "links": [
-      {
-        "title": "Dashboard link with BOM",
-        "type": "link",
-        "icon": "external link",
-        "tooltip": "",
-        "url": "http://example.com?var=${datasource}\u0026other=value",
-        "tags": [],
-        "asDropdown": false,
-        "targetBlank": true,
-        "includeVars": false,
-        "keepTime": false
-      }
-    ],
-    "liveNow": false,
-    "preload": false,
-    "tags": [
-      "test",
-      "bom"
-    ],
-    "timeSettings": {
-      "timezone": "browser",
-      "from": "now-6h",
-      "to": "now",
-      "autoRefresh": "",
-      "autoRefreshIntervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m"
-      ],
-      "hideTimepicker": false,
-      "fiscalYearStartMonth": 0
-    },
-    "title": "BOM Stripping Test Dashboard",
-    "variables": []
-  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
-}
@@ -229,36 +229,6 @@ func getBoolField(m map[string]interface{}, key string, defaultValue bool) bool
 	return defaultValue
 }

-// stripBOM removes Byte Order Mark (BOM) characters from a string.
-// BOMs (U+FEFF) can be introduced through copy/paste from certain editors
-// and cause CUE validation errors ("illegal byte order mark").
-func stripBOM(s string) string {
-	return strings.ReplaceAll(s, "\ufeff", "")
-}
-
-// stripBOMFromInterface recursively strips BOM characters from all strings
-// in an interface{} value (map, slice, or string).
-func stripBOMFromInterface(v interface{}) interface{} {
-	switch val := v.(type) {
-	case string:
-		return stripBOM(val)
-	case map[string]interface{}:
-		result := make(map[string]interface{}, len(val))
-		for k, v := range val {
-			result[k] = stripBOMFromInterface(v)
-		}
-		return result
-	case []interface{}:
-		result := make([]interface{}, len(val))
-		for i, item := range val {
-			result[i] = stripBOMFromInterface(item)
-		}
-		return result
-	default:
-		return v
-	}
-}
-
 func getUnionField[T ~string](m map[string]interface{}, key string) *T {
 	if val, ok := m[key]; ok {
 		if str, ok := val.(string); ok && str != "" {
@@ -423,8 +393,7 @@ func transformLinks(dashboard map[string]interface{}) []dashv2alpha1.DashboardDa
 				// Optional field - only set if present
 				if url, exists := linkMap["url"]; exists {
 					if urlStr, ok := url.(string); ok {
-						cleanUrl := stripBOM(urlStr)
-						dashLink.Url = &cleanUrl
+						dashLink.Url = &urlStr
 					}
 				}

@@ -2270,7 +2239,7 @@ func transformDataLinks(panelMap map[string]interface{}) []dashv2alpha1.Dashboar
 		if linkMap, ok := link.(map[string]interface{}); ok {
 			dataLink := dashv2alpha1.DashboardDataLink{
 				Title: schemaversion.GetStringValue(linkMap, "title"),
-				Url:   stripBOM(schemaversion.GetStringValue(linkMap, "url")),
+				Url:   schemaversion.GetStringValue(linkMap, "url"),
 			}
 			if _, exists := linkMap["targetBlank"]; exists {
 				targetBlank := getBoolField(linkMap, "targetBlank", false)
@@ -2362,12 +2331,6 @@ func buildVizConfig(panelMap map[string]interface{}) dashv2alpha1.DashboardVizCo
 		}
 	}

-	// Strip BOMs from options (may contain dataLinks with URLs that have BOMs)
-	cleanedOptions := stripBOMFromInterface(options)
-	if cleanedMap, ok := cleanedOptions.(map[string]interface{}); ok {
-		options = cleanedMap
-	}
-
 	// Build field config by mapping each field individually
 	fieldConfigSource := extractFieldConfigSource(fieldConfig)

@@ -2511,14 +2474,9 @@ func extractFieldConfigDefaults(defaults map[string]interface{}) dashv2alpha1.Da
 		hasDefaults = true
 	}

-	// Extract array field - strip BOMs from link URLs
+	// Extract array field
 	if linksArray, ok := extractArrayField(defaults, "links"); ok {
-		cleanedLinks := stripBOMFromInterface(linksArray)
-		if cleanedArray, ok := cleanedLinks.([]interface{}); ok {
-			fieldConfigDefaults.Links = cleanedArray
-		} else {
-			fieldConfigDefaults.Links = linksArray
-		}
+		fieldConfigDefaults.Links = linksArray
 		hasDefaults = true
 	}

@@ -2804,11 +2762,9 @@ func extractFieldConfigOverrides(fieldConfig map[string]interface{}) []dashv2alp
 				fieldOverride.Properties = make([]dashv2alpha1.DashboardDynamicConfigValue, 0, len(propertiesArray))
 				for _, property := range propertiesArray {
 					if propertyMap, ok := property.(map[string]interface{}); ok {
-						// Strip BOMs from property values (may contain links with URLs)
-						cleanedValue := stripBOMFromInterface(propertyMap["value"])
 						fieldOverride.Properties = append(fieldOverride.Properties, dashv2alpha1.DashboardDynamicConfigValue{
 							Id:    schemaversion.GetStringValue(propertyMap, "id"),
-							Value: cleanedValue,
+							Value: propertyMap["value"],
 						})
 					}
 				}
@@ -628,20 +628,6 @@
        }
      ],
      "title": "Only nulls and no user set min \u0026 max",
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options":  {
-            "conversions": [
-              {
-                "destinationType": "number",
-                "targetField": "A-series"
-              }
-            ],
-            "fields": {}
-          }
-        }
-      ],
      "type": "gauge"
    },
    {
@@ -1193,4 +1179,4 @@
  "title": "Panel Tests - Gauge",
  "uid": "_5rDmaQiz",
  "weekStart": ""
-}
+}
@@ -1760,22 +1760,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active gateways",
      "type": "radialbar"
    },
@@ -1859,22 +1843,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active pods",
      "type": "radialbar"
    },
@@ -485,7 +485,6 @@
      },
      "id": 12,
      "options": {
-        "displayName": "My gauge",
        "minVizHeight": 75,
        "minVizWidth": 75,
        "orientation": "auto",
@@ -223,7 +223,7 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
@@ -827,8 +827,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=
@@ -1,20 +0,0 @@
-# Plugins App
-
-API documentation is available at http://localhost:3000/swagger?api=plugins.grafana.app-v0alpha1
-
-## Codegen
-
- Go: `make generate`
- Frontend: Follow instructions in this [README](../..//packages/grafana-api-clients/README.md)
-
-## Plugin sync
-
-The plugin sync pushes the plugins loaded from disk to the plugins API.
-
-To enable, add these feature toggles in your `custom.ini`:
-
-```ini
-[feature_toggles]
-pluginInstallAPISync = true
-pluginStoreServiceLoading = true
-```
@@ -90,7 +90,7 @@ require (
 	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // indirect
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
@@ -213,8 +213,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=
@@ -600,20 +600,6 @@
          "stringInput": "null,null"
        }
      ],
-      "transformations": [
-        {
-          "id": "convertFieldType",
-          "options": {
-            "fields": {},
-            "conversions": [
-              {
-                "targetField": "A-series",
-                "destinationType": "number"
-              }
-            ]
-          }
-        }
-      ],
      "title": "Only nulls and no user set min & max",
      "type": "gauge"
    },
@@ -1718,22 +1718,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active gateways",
      "type": "radialbar"
    },
@@ -1815,22 +1799,6 @@
          "startValue": 0
        }
      ],
-      "transformations": [
-        {
-          "id": "calculateField",
-          "options": {
-            "mode": "unary",
-            "reduce": {
-              "reducer": "sum"
-            },
-            "replaceFields": true,
-            "unary": {
-              "operator": "round",
-              "fieldName": "A-series"
-            }
-          }
-        }
-      ],
      "title": "Active pods",
      "type": "radialbar"
    },
@@ -474,7 +474,6 @@
      },
      "id": 12,
      "options": {
-        "displayName": "My gauge",
        "minVizHeight": 75,
        "minVizWidth": 75,
        "orientation": "auto",
@@ -134,7 +134,7 @@ To convert data source-managed alert rules to Grafana managed alerts:

   Pausing stops alert rule evaluation behavior for the newly created Grafana-managed alert rules.

-9. (Optional) In the **Target data source** of the **Recording rules** section, you can select the data source to which the imported recording rules will write metrics. By default, it is the data source selected in the **Data source** dropdown.
+9. (Optional) In the **Target data source** of the **Recording rules** section, you can select the data source that the imported recording rules will query. By default, it is the data source selected in the **Data source** dropdown.

 10. Click **Import**.

@@ -98,7 +98,7 @@ You can share dashboards in the following ways:
 - [As a report](#schedule-a-report)
 - [As a snapshot](#share-a-snapshot)
 - [As a PDF export](#export-a-dashboard-as-pdf)
- [As a JSON file export](#export-a-dashboard-as-code)
+- [As a JSON file export](#export-a-dashboard-as-json)
 - [As an image export](#export-a-dashboard-as-an-image)

 When you share a dashboard externally as a link or by email, those dashboards are included in a list of your shared dashboards. To view the list and manage these dashboards, navigate to **Dashboards > Shared dashboards**.
@@ -10,7 +10,7 @@ const NUM_NESTED_DASHBOARDS = 60;
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/TestDashboard.json';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -7,7 +7,7 @@ test.use({
    scenes: true,
    sharingDashboardImage: true, // Enable the export image feature
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/DataLinkWithoutSlugTest.json';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/DashboardLiveTest.json';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -4,7 +4,7 @@ test.use({
  featureToggles: {
    scenes: true,
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -4,7 +4,7 @@ test.use({
  featureToggles: {
    scenes: true,
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ test.use({
  featureToggles: {
    scenes: true,
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ test.use({
  timezoneId: 'Pacific/Easter',
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -8,7 +8,7 @@ const TIMEZONE_DASHBOARD_UID = 'd41dbaa2-a39e-4536-ab2b-caca52f1a9c8';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -17,7 +17,7 @@ test.use({
  },
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'edediimbjhdz4b/a-tall-dashboard';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ import testDashboard from '../dashboards/TestDashboard.json';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -53,7 +53,7 @@ async function assertPreviewValues(
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -19,7 +19,7 @@ async function assertPreviewValues(
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Templating - Nested Template Variables';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -6,7 +6,7 @@ const DASHBOARD_NAME = 'Test variable output';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -5,7 +5,7 @@ const DASHBOARD_UID = 'ZqZnVvFZz';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
    dashboardScene: false, // this test is for the old sharing modal only used when scenes is turned off
  },
 });
@@ -5,7 +5,7 @@ const DASHBOARD_UID = 'yBCC3aKGk';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -7,7 +7,7 @@ const PAGE_UNDER_TEST = 'AejrN1AMz';
 test.use({
  featureToggles: {
    kubernetesDashboards: process.env.FORCE_V2_DASHBOARDS_API === 'true',
-    dashboardNewLayouts: process.env.FORCE_V2_DASHBOARDS_API === 'true',
+    kubernetesDashboardsV2: process.env.FORCE_V2_DASHBOARDS_API === 'true',
  },
 });

@@ -2,16 +2,18 @@ import { Locator } from '@playwright/test';

 import { test, expect } from '@grafana/plugin-e2e';

+import { setVisualization } from './vizpicker-utils';
+
 test.use({
  featureToggles: {
    canvasPanelPanZoom: true,
  },
 });
 test.describe('Canvas Panel - Scene Tests', () => {
-  test.beforeEach(async ({ page, gotoDashboardPage }) => {
+  test.beforeEach(async ({ page, gotoDashboardPage, selectors }) => {
    const dashboardPage = await gotoDashboardPage({});
    const panelEditPage = await dashboardPage.addPanel();
-    await panelEditPage.setVisualization('Canvas');
+    await setVisualization(panelEditPage, 'Canvas', selectors);

    // Wait for canvas panel to load
    await page.waitForSelector('[data-testid="canvas-scene-pan-zoom"]', { timeout: 10000 });
@@ -1,101 +0,0 @@
-import { test, expect } from '@grafana/plugin-e2e';
-
-// this test requires a larger viewport so all gauge panels load properly
-test.use({
-  featureToggles: { newGauge: true },
-  viewport: { width: 1280, height: 3000 },
-});
-
-const OLD_GAUGES_DASHBOARD_UID = '_5rDmaQiz';
-const NEW_GAUGES_DASHBOARD_UID = 'panel-tests-gauge-new';
-
-test.describe(
-  'Gauge Panel',
-  {
-    tag: ['@panels', '@gauge'],
-  },
-  () => {
-    test('successfully migrates all gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({ uid: OLD_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(16);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders new gauge panels', async ({ gotoDashboardPage, selectors }) => {
-      // open Panel Tests - Gauge
-      const dashboardPage = await gotoDashboardPage({ uid: NEW_GAUGES_DASHBOARD_UID });
-
-      // check that gauges are rendered
-      const gaugeElements = dashboardPage.getByGrafanaSelector(
-        selectors.components.Panels.Visualization.Gauge.Container
-      );
-      await expect(gaugeElements).toHaveCount(32);
-
-      // check that no panel errors exist
-      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
-      await expect(errorInfo).toBeHidden();
-    });
-
-    test('renders sparklines in gauge panels', async ({ gotoDashboardPage, page }) => {
-      await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '11' }),
-      });
-
-      await expect(page.locator('.uplot')).toHaveCount(5);
-    });
-
-    test('"no data"', async ({ gotoDashboardPage, selectors }) => {
-      const dashboardPage = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '36' }),
-      });
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('No data');
-
-      // update the "No value" option and see if the panel updates
-      const noValueOption = dashboardPage
-        .getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Standard options No value'))
-        .locator('input');
-
-      await noValueOption.fill('My empty value');
-      await noValueOption.blur();
-      await expect(
-        dashboardPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the empty text shows up in an empty gauge'
-      ).toHaveText('My empty value');
-
-      // test the "no numeric fields" message on the next panel
-      const dashboardPage2 = await gotoDashboardPage({
-        uid: NEW_GAUGES_DASHBOARD_UID,
-        queryParams: new URLSearchParams({ editPanel: '37' }),
-      });
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Visualization.Gauge.Container),
-        'that the gauge does not appear'
-      ).toBeHidden();
-
-      await expect(
-        dashboardPage2.getByGrafanaSelector(selectors.components.Panels.Panel.PanelDataErrorMessage),
-        'that the empty text appears'
-      ).toHaveText('Data is missing a number field');
-    });
-  }
-);
@@ -0,0 +1,24 @@
+import { expect, E2ESelectorGroups, PanelEditPage } from '@grafana/plugin-e2e';
+
+// this replaces the panelEditPage.setVisualization method used previously in tests, since it
+// does not know how to use the updated 12.4 viz picker UI to set the visualization
+export const setVisualization = async (panelEditPage: PanelEditPage, vizName: string, selectors: E2ESelectorGroups) => {
+  const vizPicker = panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker);
+  await expect(vizPicker, '"Change" button should be visible').toBeVisible();
+  await vizPicker.click();
+
+  const allVizTabBtn = panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('All visualizations'));
+  await expect(allVizTabBtn, '"All visualiations" button should be visible').toBeVisible();
+  await allVizTabBtn.click();
+
+  const vizItem = panelEditPage.getByGrafanaSelector(selectors.components.PluginVisualization.item(vizName));
+  await expect(vizItem, `"${vizName}" item should be visible`).toBeVisible();
+  await vizItem.scrollIntoViewIfNeeded();
+  await vizItem.click();
+
+  await expect(vizPicker, '"Change" button should be visible again').toBeVisible();
+  await expect(
+    panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
+    'Panel header should have the new viz type name'
+  ).toHaveText(vizName);
+};
@@ -1,5 +1,6 @@
 import { expect, test } from '@grafana/plugin-e2e';

+import { setVisualization } from '../../../panels-suite/vizpicker-utils';
 import { formatExpectError } from '../errors';
 import { successfulDataQuery } from '../mocks/queries';

@@ -24,10 +25,10 @@ test.describe(
        ).toContainText(['Field', 'Max', 'Mean', 'Last']);
      });

-      test('table panel data assertions', async ({ panelEditPage }) => {
+      test('table panel data assertions', async ({ panelEditPage, selectors }) => {
        await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
        await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization('Table');
+        await setVisualization(panelEditPage, 'Table', selectors);
        await panelEditPage.refreshPanel();
        await expect(
          panelEditPage.panel.locator,
@@ -43,10 +44,10 @@ test.describe(
        ).toContainText(['val1', 'val2', 'val3', 'val4']);
      });

-      test('timeseries panel - table view assertions', async ({ panelEditPage }) => {
+      test('timeseries panel - table view assertions', async ({ panelEditPage, selectors }) => {
        await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
        await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization('Time series');
+        await setVisualization(panelEditPage, 'Time series', selectors);
        await panelEditPage.refreshPanel();
        await panelEditPage.toggleTableView();
        await expect(
@@ -1,5 +1,6 @@
 import { expect, test } from '@grafana/plugin-e2e';

+import { setVisualization } from '../../../panels-suite/vizpicker-utils';
 import { formatExpectError } from '../errors';
 import { successfulDataQuery } from '../mocks/queries';
 import { scenarios } from '../mocks/resources';
@@ -53,10 +54,10 @@ test.describe(
        ).toHaveText(scenarios.map((s) => s.name));
      });

-      test('mocked query data response', async ({ panelEditPage, page }) => {
+      test('mocked query data response', async ({ panelEditPage, page, selectors }) => {
        await panelEditPage.mockQueryDataResponse(successfulDataQuery, 200);
        await panelEditPage.datasource.set('gdev-testdata');
-        await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+        await setVisualization(panelEditPage, TABLE_VIZ_NAME, selectors);
        await panelEditPage.refreshPanel();
        await expect(
          panelEditPage.panel.getErrorIcon(),
@@ -75,7 +76,7 @@ test.describe(
        selectors,
        page,
      }) => {
-        await panelEditPage.setVisualization(TABLE_VIZ_NAME);
+        await setVisualization(panelEditPage, TABLE_VIZ_NAME, selectors);
        await expect(
          panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
          formatExpectError('Expected panel visualization to be set to table')
@@ -92,8 +93,8 @@ test.describe(
        ).toBeVisible();
      });

-      test('Select time zone in timezone picker', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('Select time zone in timezone picker', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = await panelEditPage.getCustomOptions('Axis');
        const timeZonePicker = axisOptions.getSelect('Time zone');

@@ -101,8 +102,8 @@ test.describe(
        await expect(timeZonePicker).toHaveSelected('Europe/Stockholm');
      });

-      test('select unit in unit picker', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('select unit in unit picker', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const standardOptions = panelEditPage.getStandardOptions();
        const unitPicker = standardOptions.getUnitPicker('Unit');

@@ -111,8 +112,8 @@ test.describe(
        await expect(unitPicker).toHaveSelected('Pixels');
      });

-      test('enter value in number input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in number input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = panelEditPage.getCustomOptions('Axis');
        const lineWith = axisOptions.getNumberInput('Soft min');

@@ -121,8 +122,8 @@ test.describe(
        await expect(lineWith).toHaveValue('10');
      });

-      test('enter value in slider', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in slider', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const graphOptions = panelEditPage.getCustomOptions('Graph styles');
        const lineWidth = graphOptions.getSliderInput('Line width');

@@ -131,8 +132,8 @@ test.describe(
        await expect(lineWidth).toHaveValue('10');
      });

-      test('select value in single value select', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('select value in single value select', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const standardOptions = panelEditPage.getStandardOptions();
        const colorSchemeSelect = standardOptions.getSelect('Color scheme');

@@ -140,8 +141,8 @@ test.describe(
        await expect(colorSchemeSelect).toHaveSelected('Classic palette');
      });

-      test('clear input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('clear input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const panelOptions = panelEditPage.getPanelOptions();
        const title = panelOptions.getTextInput('Title');

@@ -150,8 +151,8 @@ test.describe(
        await expect(title).toHaveValue('');
      });

-      test('enter value in input', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('enter value in input', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const panelOptions = panelEditPage.getPanelOptions();
        const description = panelOptions.getTextInput('Description');

@@ -160,8 +161,8 @@ test.describe(
        await expect(description).toHaveValue('This is a panel');
      });

-      test('unchecking switch', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('unchecking switch', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = panelEditPage.getCustomOptions('Axis');
        const showBorder = axisOptions.getSwitch('Show border');

@@ -173,8 +174,8 @@ test.describe(
        await expect(showBorder).toBeChecked({ checked: false });
      });

-      test('checking switch', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('checking switch', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = panelEditPage.getCustomOptions('Axis');
        const showBorder = axisOptions.getSwitch('Show border');

@@ -183,8 +184,8 @@ test.describe(
        await expect(showBorder).toBeChecked();
      });

-      test('re-selecting value in radio button group', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('re-selecting value in radio button group', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = panelEditPage.getCustomOptions('Axis');
        const placement = axisOptions.getRadioGroup('Placement');

@@ -195,8 +196,8 @@ test.describe(
        await expect(placement).toHaveChecked('Auto');
      });

-      test('selecting value in radio button group', async ({ panelEditPage }) => {
-        await panelEditPage.setVisualization(TIME_SERIES_VIZ_NAME);
+      test('selecting value in radio button group', async ({ panelEditPage, selectors }) => {
+        await setVisualization(panelEditPage, TIME_SERIES_VIZ_NAME, selectors);
        const axisOptions = panelEditPage.getCustomOptions('Axis');
        const placement = axisOptions.getRadioGroup('Placement');

@@ -1,4 +1,4 @@
-import { BootData, PanelPluginMeta } from '@grafana/data';
+import { BootData } from '@grafana/data';
 import { test, expect } from '@grafana/plugin-e2e';

 test.describe(
@@ -22,7 +22,7 @@ test.describe(
      await dashboardPage.addPanel();

      // Get panel types from window object
-      const panelTypes: PanelPluginMeta[] = await page.evaluate(() => {
+      const panelTypes = await page.evaluate(() => {
        // @grafana/plugin-e2e doesn't export the full bootdata config
        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
        const win = window as typeof window & { grafanaBootData: BootData };
@@ -0,0 +1,27 @@
+import { test, expect } from '@grafana/plugin-e2e';
+
+// this test requires a larger viewport so all gauge panels load properly
+test.use({
+  viewport: { width: 1280, height: 1080 },
+});
+
+test.describe(
+  'Gauge Panel',
+  {
+    tag: ['@various'],
+  },
+  () => {
+    test('Gauge rendering e2e tests', async ({ gotoDashboardPage, selectors, page }) => {
+      // open Panel Tests - Gauge
+      const dashboardPage = await gotoDashboardPage({ uid: '_5rDmaQiz' });
+
+      // check that gauges are rendered
+      const gaugeElements = page.locator('.flot-base');
+      await expect(gaugeElements).toHaveCount(16);
+
+      // check that no panel errors exist
+      const errorInfo = dashboardPage.getByGrafanaSelector(selectors.components.Panels.Panel.headerCornerInfo('error'));
+      await expect(errorInfo).toBeHidden();
+    });
+  }
+);
@@ -17,5 +17,9 @@ test.describe(
      );
      await expect(pieChartSlices).toHaveCount(5);
    });
+
+    describe('keyboard accessibility', () => {
+      // FIXME: DATALINKS ACCESSIBILITY TESTS HERE
+    });
  }
 );
@@ -1,178 +0,0 @@
-import { test, expect } from '@grafana/plugin-e2e';
-
-test.use({
-  featureToggles: {
-    newVizSuggestions: true,
-    externalVizSuggestions: false,
-  },
-  viewport: {
-    width: 800,
-    height: 1500,
-  },
-});
-
-test.describe(
-  'Visualization suggestions v2',
-  {
-    tag: ['@various', '@suggestions'],
-  },
-  () => {
-    test('Should be shown and clickable', async ({ selectors, gotoPanelEditPage }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel'
-      ).toBeVisible();
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // TODO: in this part of the test, we will change the query and the transforms and observe suggestions being updated.
-
-      // Select a visualization and verify table header is visible from preview
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button disabled since panel has not yet changed'
-      ).toBeDisabled();
-
-      // apply the suggestion and verify panel options are visible
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.confirm('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
-        'options pane to be rendered'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button enabled now that panel is dirty'
-      ).toBeEnabled();
-    });
-
-    test('should not apply suggestion if you navigate toggle the viz picker back off', async ({
-      selectors,
-      gotoPanelEditPage,
-    }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel;'
-      ).toBeVisible();
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // Select a visualization
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(
-        panelEditPage
-          .getByGrafanaSelector(selectors.components.Panels.Panel.content)
-          .getByRole('grid')
-          .getByRole('row')
-          .first(),
-        'table to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton)
-      ).toBeDisabled();
-
-      // Verify that toggling the viz picker back cancels the suggestion, restores the line chart, shows panel options
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.content).locator('.uplot'),
-        'time series to be rendered inside panel'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.header),
-        'options pane to be rendered'
-      ).toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton),
-        'discard changes button is still disabled since no changes were applied'
-      ).toBeDisabled();
-    });
-
-    test('should not apply suggestion if you navigate back to the dashboard', async ({
-      page,
-      selectors,
-      gotoPanelEditPage,
-    }) => {
-      // Open dashboard with edit panel
-      const panelEditPage = await gotoPanelEditPage({
-        dashboard: {
-          uid: 'aBXrJ0R7z',
-        },
-        id: '9',
-      });
-
-      // Try visualization suggestions
-      await panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker).click();
-      await panelEditPage.getByGrafanaSelector(selectors.components.Tab.title('Suggestions')).click();
-
-      // Verify we see suggestions
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Line chart')),
-        'line chart suggestion to be rendered'
-      ).toBeVisible();
-
-      // Select a visualization
-      await panelEditPage.getByGrafanaSelector(selectors.components.VisualizationPreview.card('Table')).click();
-      await expect(page.getByRole('grid').getByRole('row').first(), 'table row to be rendered').toBeVisible();
-      await expect(
-        panelEditPage.getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.discardChangesButton)
-      ).toBeDisabled();
-
-      // Verify that navigating back to the dashboard cancels the suggestion and restores the line chart.
-      await panelEditPage
-        .getByGrafanaSelector(selectors.components.NavToolbar.editDashboard.backToDashboardButton)
-        .click();
-      await expect(
-        page.locator('[data-viz-panel-key="panel-9"]').locator('.uplot'),
-        'time series to be rendered inside the panel'
-      ).toBeVisible();
-    });
-  }
-);
@@ -3,7 +3,7 @@ import { test, expect } from '@grafana/plugin-e2e';
 test.describe(
  'Visualization suggestions',
  {
-    tag: ['@various', '@suggestions'],
+    tag: ['@various'],
  },
  () => {
    test('Should be shown and clickable', async ({ page, selectors, gotoPanelEditPage }) => {
@@ -87,7 +87,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.15.0 // @grafana/grafana-backend-group
 	github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f // @grafana/alerting-backend
+	github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 // @grafana/alerting-backend
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // @grafana/identity-access-team
 	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 // @grafana/identity-access-team
 	github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
@@ -181,7 +181,6 @@ require (
 	github.com/xlab/treeprint v1.2.0 // @grafana/observability-traces-and-profiling
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // @grafana/grafana-operator-experience-squad
 	github.com/yudai/gojsondiff v1.0.0 // @grafana/grafana-backend-group
-	go.etcd.io/bbolt v1.4.2 // @grafana/grafana-search-and-storage
 	go.opentelemetry.io/collector/pdata v1.44.0 // @grafana/grafana-backend-group
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // @grafana/plugins-platform-backend
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // @grafana/grafana-operator-experience-squad
@@ -604,6 +603,7 @@ require (
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	github.com/zclconf/go-cty v1.16.3 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.etcd.io/bbolt v1.4.2 // indirect
 	go.etcd.io/etcd/api/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.6 // indirect
@@ -1622,8 +1622,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f h1:Br4SaUL3dnVopKKNhDavCLgehw60jdtl/sIxdfzmVts=
-github.com/grafana/alerting v0.0.0-20251231150637-b7821017d69f/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196 h1:A9UJtyBBUE7PkRsAITKU05iz+HpHO9SaVjfdo2Df3UQ=
+github.com/grafana/alerting v0.0.0-20251223160021-926c74910196/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4 h1:Muoy+FMGrHj3GdFbvsMzUT7eusgii9PKf9L1ZaXDDbY=
@@ -285,10 +285,6 @@ const injectedRtkApi = api
        query: (queryArg) => ({ url: `/snapshots/delete/${queryArg.deleteKey}`, method: 'DELETE' }),
        invalidatesTags: ['Snapshot'],
      }),
-      getSnapshotSettings: build.query<GetSnapshotSettingsApiResponse, GetSnapshotSettingsApiArg>({
-        query: () => ({ url: `/snapshots/settings` }),
-        providesTags: ['Snapshot'],
-      }),
      getSnapshot: build.query<GetSnapshotApiResponse, GetSnapshotApiArg>({
        query: (queryArg) => ({
          url: `/snapshots/${queryArg.name}`,
@@ -746,8 +742,6 @@ export type DeleteWithKeyApiArg = {
  /** unique key returned in create */
  deleteKey: string;
 };
-export type GetSnapshotSettingsApiResponse = /** status 200 undefined */ any;
-export type GetSnapshotSettingsApiArg = void;
 export type GetSnapshotApiResponse = /** status 200 OK */ Snapshot;
 export type GetSnapshotApiArg = {
  /** name of the Snapshot */
@@ -1279,8 +1273,6 @@ export const {
  useLazyListSnapshotQuery,
  useCreateSnapshotMutation,
  useDeleteWithKeyMutation,
-  useGetSnapshotSettingsQuery,
-  useLazyGetSnapshotSettingsQuery,
  useGetSnapshotQuery,
  useLazyGetSnapshotQuery,
  useDeleteSnapshotMutation,
@@ -356,6 +356,10 @@ export interface FeatureToggles {
  */
  dashboardNewLayouts?: boolean;
  /**
+  * Use the v2 kubernetes API in the frontend for dashboards
+  */
+  kubernetesDashboardsV2?: boolean;
+  /**
  * Enables undo/redo in dynamic dashboards
  */
  dashboardUndoRedo?: boolean;
@@ -417,10 +421,6 @@ export interface FeatureToggles {
  */
  jitterAlertRulesWithinGroups?: boolean;
  /**
-  * Enable audit logging with Kubernetes under app platform
-  */
-  auditLoggingAppPlatform?: boolean;
-  /**
  * Enable the secrets management API and services under app platform
  */
  secretsManagementAppPlatform?: boolean;
@@ -535,11 +535,6 @@ export const versionedComponents = {
          '12.3.0': 'data-testid viz-tooltip-wrapper',
        },
      },
-      Gauge: {
-        Container: {
-          '12.4.0': 'data-testid gauge container',
-        },
-      },
    },
  },
  VizLegend: {
@@ -1293,9 +1288,6 @@ export const versionedComponents = {
    card: {
      [MIN_GRAFANA_VERSION]: (name: string) => `data-testid suggestion-${name}`,
    },
-    confirm: {
-      '12.4.0': (name: string) => `data-testid suggestion-${name} confirm button`,
-    },
  },
  ColorSwatch: {
    name: {
@@ -48,7 +48,7 @@ describe('MetricsModal', () => {
      operations: [],
    };

-    setup(query, ['with-labels']);
+    setup(query, ['with-labels'], true);
    await waitFor(() => {
      expect(screen.getByText('with-labels')).toBeInTheDocument();
    });
@@ -220,10 +220,6 @@ function createDatasource(withLabels?: boolean) {
  // display different results if their labels are selected in the PromVisualQuery
  if (withLabels) {
    languageProvider.queryMetricsMetadata = jest.fn().mockResolvedValue({
-      ALERTS: {
-        type: 'gauge',
-        help: 'alerts help text',
-      },
      'with-labels': {
        type: 'with-labels-type',
        help: 'with-labels-help',
@@ -301,7 +297,7 @@ function createProps(query: PromVisualQuery, datasource: PrometheusDatasource, m
  };
 }

-function setup(query: PromVisualQuery, metrics: string[]) {
+function setup(query: PromVisualQuery, metrics: string[], withlabels?: boolean) {
  const withLabels: boolean = query.labels.length > 0;
  const datasource = createDatasource(withLabels);
  const props = createProps(query, datasource, metrics);
@@ -138,7 +138,7 @@ const MetricsModalContent = (props: MetricsModalProps) => {

 export const MetricsModal = (props: MetricsModalProps) => {
  return (
-    <MetricsModalContextProvider languageProvider={props.datasource.languageProvider} timeRange={props.timeRange}>
+    <MetricsModalContextProvider languageProvider={props.datasource.languageProvider}>
      <MetricsModalContent {...props} />
    </MetricsModalContextProvider>
  );
@@ -4,7 +4,6 @@ import { ReactNode } from 'react';
 import { TimeRange } from '@grafana/data';

 import { PrometheusLanguageProviderInterface } from '../../../language_provider';
-import { getMockTimeRange } from '../../../test/mocks/datasource';

 import { DEFAULT_RESULTS_PER_PAGE, MetricsModalContextProvider, useMetricsModal } from './MetricsModalContext';
 import { generateMetricData } from './helpers';
@@ -26,9 +25,7 @@ const mockLanguageProvider: PrometheusLanguageProviderInterface = {
 // Helper to create wrapper component
 const createWrapper = (languageProvider = mockLanguageProvider) => {
  return ({ children }: { children: ReactNode }) => (
-    <MetricsModalContextProvider languageProvider={languageProvider} timeRange={getMockTimeRange()}>
-      {children}
-    </MetricsModalContextProvider>
+    <MetricsModalContextProvider languageProvider={languageProvider}>{children}</MetricsModalContextProvider>
  );
 };

@@ -170,7 +167,6 @@ describe('MetricsModalContext', () => {

    it('should handle empty metadata response', async () => {
      (mockLanguageProvider.queryMetricsMetadata as jest.Mock).mockResolvedValue({});
-      (mockLanguageProvider.queryLabelValues as jest.Mock).mockResolvedValue(['metric1', 'metric2']);

      const { result } = renderHook(() => useMetricsModal(), {
        wrapper: createWrapper(),
@@ -180,18 +176,7 @@ describe('MetricsModalContext', () => {
        expect(result.current.isLoading).toBe(false);
      });

-      expect(result.current.filteredMetricsData).toEqual([
-        {
-          value: 'metric1',
-          type: 'counter',
-          description: 'Test metric',
-        },
-        {
-          value: 'metric2',
-          type: 'counter',
-          description: 'Test metric',
-        },
-      ]);
+      expect(result.current.filteredMetricsData).toEqual([]);
    });

    it('should handle metadata fetch error', async () => {
@@ -254,7 +239,6 @@ describe('MetricsModalContext', () => {
      }));

      (mockLanguageProvider.queryMetricsMetadata as jest.Mock).mockResolvedValue({
-        ALERTS: { type: 'gauge', help: 'Test alerts help' },
        test_metric: { type: 'counter', help: 'Test metric' },
      });

@@ -266,7 +250,7 @@ describe('MetricsModalContext', () => {
        expect(result.current.isLoading).toBe(false);
      });

-      expect(result.current.filteredMetricsData).toHaveLength(2);
+      expect(result.current.filteredMetricsData).toHaveLength(1);
      expect(result.current.selectedTypes).toEqual([]);
    });

@@ -334,7 +318,7 @@ describe('MetricsModalContext', () => {
      };

      const { getByTestId } = render(
-        <MetricsModalContextProvider languageProvider={mockLanguageProvider} timeRange={getMockTimeRange()}>
+        <MetricsModalContextProvider languageProvider={mockLanguageProvider}>
          <TestComponent />
        </MetricsModalContextProvider>
      );
@@ -52,13 +52,11 @@ const MetricsModalContext = createContext<MetricsModalContextValue | undefined>(

 type MetricsModalContextProviderProps = {
  languageProvider: PrometheusLanguageProviderInterface;
-  timeRange: TimeRange;
 };

 export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalContextProviderProps>> = ({
  children,
  languageProvider,
-  timeRange,
 }) => {
  const [isLoading, setIsLoading] = useState(true);
  const [metricsData, setMetricsData] = useState<MetricsData>([]);
@@ -113,16 +111,8 @@ export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalConte
      setIsLoading(true);
      const metadata = await languageProvider.queryMetricsMetadata(PROMETHEUS_QUERY_BUILDER_MAX_RESULTS);

-      // We receive ALERTS metadata in any case
-      if (Object.keys(metadata).length <= 1) {
-        const fetchedMetrics = await languageProvider.queryLabelValues(
-          timeRange,
-          METRIC_LABEL,
-          undefined,
-          PROMETHEUS_QUERY_BUILDER_MAX_RESULTS
-        );
-        const processedData = fetchedMetrics.map((m) => generateMetricData(m, languageProvider));
-        setMetricsData(processedData);
+      if (Object.keys(metadata).length === 0) {
+        setMetricsData([]);
      } else {
        const processedData = Object.keys(metadata).map((m) => generateMetricData(m, languageProvider));
        setMetricsData(processedData);
@@ -132,7 +122,7 @@ export const MetricsModalContextProvider: FC<PropsWithChildren<MetricsModalConte
    } finally {
      setIsLoading(false);
    }
-  }, [languageProvider, timeRange]);
+  }, [languageProvider]);

  const debouncedBackendSearch = useMemo(
    () =>
@@ -35,7 +35,6 @@ export interface Options extends common.SingleStatBaseOptions {
  showThresholdLabels: boolean;
  showThresholdMarkers: boolean;
  sparkline?: boolean;
-  textMode?: ('auto' | 'value_and_name' | 'value' | 'name' | 'none');
 }

 export const defaultOptions: Partial<Options> = {
@@ -49,5 +48,4 @@ export const defaultOptions: Partial<Options> = {
  showThresholdLabels: false,
  showThresholdMarkers: true,
  sparkline: true,
-  textMode: 'auto',
 };
@@ -0,0 +1,174 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { MenuItem, MenuGroup } from '@grafana/ui';
+
+import { WithContextMenu } from './WithContextMenu';
+
+describe('WithContextMenu', () => {
+  it('supports mouse events', async () => {
+    render(
+      <WithContextMenu
+        renderMenuItems={() => (
+          <>
+            <MenuGroup>
+              <MenuItem label="Item 1" />
+              <MenuItem label="Item 2" />
+            </MenuGroup>
+          </>
+        )}
+      >
+        {({ openMenu }) => (
+          <div data-testid="context-menu-target" onClick={openMenu}>
+            Click me
+          </div>
+        )}
+      </WithContextMenu>
+    );
+
+    expect(screen.getByTestId('context-menu-target')).toBeInTheDocument();
+    expect(screen.queryByText('Item 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Item 2')).not.toBeInTheDocument();
+
+    // Simulate click to open context menu
+    await userEvent.click(screen.getByTestId('context-menu-target'));
+
+    expect(screen.getByText('Item 1')).toBeInTheDocument();
+    expect(screen.getByText('Item 2')).toBeInTheDocument();
+  });
+
+  // FIXME: this test isn't correct yet, probably because of how I've done the user-events wrong
+  it('supports keyboard events', async () => {
+    class DOMRect {
+      public get top(): number {
+        return this.y;
+      }
+      public get left(): number {
+        return this.x;
+      }
+      public get bottom(): number {
+        return this.y + this.height;
+      }
+      public get right(): number {
+        return this.x + this.width;
+      }
+      constructor(
+        public x = 0,
+        public y = 0,
+        public width = 0,
+        public height = 0
+      ) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+      }
+      static fromRect(other: DOMRect) {
+        return new DOMRect(other.x, other.y, other.width, other.height);
+      }
+      toJSON() {
+        return JSON.stringify(this);
+      }
+    }
+
+    render(
+      <WithContextMenu
+        renderMenuItems={() => (
+          <>
+            <MenuGroup>
+              <MenuItem label="Item 1" />
+              <MenuItem label="Item 2" />
+            </MenuGroup>
+          </>
+        )}
+      >
+        {({ openMenu }) => (
+          <div
+            data-testid="context-menu-target"
+            tabIndex={0}
+            onKeyDown={(ev) => {
+              ev.preventDefault();
+              openMenu(ev);
+            }}
+          >
+            Press enter on me
+          </div>
+        )}
+      </WithContextMenu>
+    );
+
+    expect(screen.getByTestId('context-menu-target')).toBeInTheDocument();
+    expect(screen.queryByText('Item 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Item 2')).not.toBeInTheDocument();
+
+    const target = screen.getByTestId('context-menu-target');
+
+    // Simulate key down to open context menu
+    await userEvent.type(target, ' ');
+
+    expect(screen.getByText('Item 1')).toBeInTheDocument();
+    expect(screen.getByText('Item 2')).toBeInTheDocument();
+  });
+
+  it('supports explicit positioning', async () => {
+    render(
+      <WithContextMenu
+        renderMenuItems={() => (
+          <>
+            <MenuGroup>
+              <MenuItem label="Item 1" />
+              <MenuItem label="Item 2" />
+            </MenuGroup>
+          </>
+        )}
+      >
+        {({ openMenu }) => (
+          <div data-testid="context-menu-target" onClick={(ev) => openMenu({ x: ev.pageX, y: ev.pageY })}>
+            Click me
+          </div>
+        )}
+      </WithContextMenu>
+    );
+
+    expect(screen.getByTestId('context-menu-target')).toBeInTheDocument();
+    expect(screen.queryByText('Item 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Item 2')).not.toBeInTheDocument();
+
+    // Simulate key down to open context menu
+    await userEvent.click(screen.getByTestId('context-menu-target'));
+
+    expect(screen.getByText('Item 1')).toBeInTheDocument();
+    expect(screen.getByText('Item 2')).toBeInTheDocument();
+  });
+
+  it('does not open menu when openMenu is called with undefined', async () => {
+    render(
+      <WithContextMenu
+        renderMenuItems={() => (
+          <>
+            <MenuGroup>
+              <MenuItem label="Item 1" />
+              <MenuItem label="Item 2" />
+            </MenuGroup>
+          </>
+        )}
+      >
+        {({ openMenu }) => (
+          <div data-testid="context-menu-target" onClick={() => openMenu(undefined)}>
+            Click me
+          </div>
+        )}
+      </WithContextMenu>
+    );
+
+    expect(screen.getByTestId('context-menu-target')).toBeInTheDocument();
+    expect(screen.queryByText('Item 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Item 2')).not.toBeInTheDocument();
+
+    // Simulate click to open context menu
+    await userEvent.click(screen.getByTestId('context-menu-target'));
+
+    expect(screen.queryByText('Item 1')).not.toBeInTheDocument();
+    expect(screen.queryByText('Item 2')).not.toBeInTheDocument();
+  });
+});
@@ -3,9 +3,23 @@ import * as React from 'react';

 import { ContextMenu } from '../ContextMenu/ContextMenu';

+/**
+ * This callback supports several ways to provide the x/y coordinates to open the context menu:
+ * - MouseEvent, to open the menu at the mouse position
+ * - SyntheticEvent, to open the menu at the location of the currentTarget element for non-mouse events
+ * - An object with x and y coordinates to open the menu at a specific position, for other use-cases
+ */
+export type WithContextMenuOpenMenuCallback = (
+  e:
+    | React.MouseEvent<HTMLElement | SVGElement>
+    | React.SyntheticEvent<HTMLElement | SVGElement>
+    | { x: number; y: number }
+    | undefined
+) => void;
+
 export interface WithContextMenuProps {
  /** Menu item trigger that accepts openMenu prop */
-  children: (props: { openMenu: React.MouseEventHandler<HTMLElement> }) => JSX.Element;
+  children: (props: { openMenu: WithContextMenuOpenMenuCallback }) => JSX.Element;
  /** A function that returns an array of menu items */
  renderMenuItems: () => React.ReactNode;
  /** On menu open focus the first element */
@@ -15,17 +29,43 @@ export interface WithContextMenuProps {
 export const WithContextMenu = ({ children, renderMenuItems, focusOnOpen = true }: WithContextMenuProps) => {
  const [isMenuOpen, setIsMenuOpen] = useState(false);
  const [menuPosition, setMenuPosition] = useState({ x: 0, y: 0 });
+
+  const handleOpenMenu: WithContextMenuOpenMenuCallback = React.useCallback((e) => {
+    if (!e) {
+      return;
+    }
+
+    setIsMenuOpen(true);
+
+    if ('pageX' in e && 'pageY' in e) {
+      // Mouse event
+      setMenuPosition({
+        x: e.pageX,
+        y: e.pageY - window.scrollY,
+      });
+    } else if ('currentTarget' in e) {
+      // Element - calculate position from element's bounding rect
+      const rect = e.currentTarget.getBoundingClientRect();
+      if (rect) {
+        setMenuPosition({
+          x: rect.left + rect.width / 2,
+          y: rect.top + rect.height / 2 + window.scrollY,
+        });
+      }
+    } else if ('x' in e && 'y' in e && typeof e.x === 'number') {
+      // Position object
+      setMenuPosition({
+        x: e.x,
+        y: e.y,
+      });
+    } else if (process.env.NODE_ENV !== 'production') {
+      console.warn('WithContextMenu: Unsupported parameter to openMenu:', e);
+    }
+  }, []);
+
  return (
    <>
-      {children({
-        openMenu: (e) => {
-          setIsMenuOpen(true);
-          setMenuPosition({
-            x: e.pageX,
-            y: e.pageY - window.scrollY,
-          });
-        },
-      })}
+      {children({ openMenu: handleOpenMenu })}

      {isMenuOpen && (
        <ContextMenu
@@ -1,13 +1,12 @@
 import { css } from '@emotion/css';
 import { CSSProperties, type JSX } from 'react';
-import * as React from 'react';

 import { ActionModel, GrafanaTheme2, LinkModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';

 import { useStyles2 } from '../../themes/ThemeContext';
 import { linkModelToContextMenuItems } from '../../utils/dataLinks';
-import { WithContextMenu } from '../ContextMenu/WithContextMenu';
+import { WithContextMenu, WithContextMenuOpenMenuCallback } from '../ContextMenu/WithContextMenu';
 import { MenuGroup, MenuItemsGroup } from '../Menu/MenuGroup';
 import { MenuItem } from '../Menu/MenuItem';

@@ -22,7 +21,7 @@ export interface DataLinksContextMenuProps {
 }

 export interface DataLinksContextMenuApi {
-  openMenu?: React.MouseEventHandler<HTMLOrSVGElement>;
+  openMenu?: WithContextMenuOpenMenuCallback;
  targetClassName?: string;
 }

@@ -47,6 +46,7 @@ export const DataLinksContextMenu = ({ children, links, style }: DataLinksContex
            active={item.active}
            onClick={item.onClick}
            className={styles.itemWrapper}
+            tabIndex={0}
          />
        ))}
      </MenuGroup>
@@ -248,17 +248,15 @@ export function PanelChrome({

  const onContentPointerDown = React.useCallback(
    (evt: React.PointerEvent) => {
-      // When selected, ignore clicks inside buttons, links, canvas and svg elments
+      // Ignore clicks inside buttons, links, canvas and svg elments
      // This does prevent a clicks inside a graphs from selecting panel as there is normal div above the canvas element that intercepts the click
-      if (isSelected && evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
-        // Stop propagation otherwise row config editor will get selected
-        evt.stopPropagation();
+      if (evt.target instanceof Element && evt.target.closest('button,a,canvas,svg')) {
        return;
      }

      onSelect?.(evt);
    },
-    [isSelected, onSelect]
+    [onSelect]
  );

  const headerContent = (
@@ -32,6 +32,24 @@ const meta: Meta<StoryProps> = {
    controls: {
      exclude: ['theme', 'values', 'vizCount'],
    },
+    a11y: {
+      config: {
+        rules: [
+          {
+            id: 'scrollable-region-focusable',
+            selector: 'body',
+            enabled: false,
+          },
+          // NOTE: this is necessary due to a false positive with the filered svg glow in one of the examples.
+          // The color-contrast in this component should be accessible!
+          {
+            id: 'color-contrast',
+            selector: 'text',
+            enabled: false,
+          },
+        ],
+      },
+    },
  },
  args: {
    barWidthFactor: 0.2,
@@ -2,7 +2,6 @@ import { css, cx } from '@emotion/css';
 import { useId } from 'react';

 import { DisplayValueAlignmentFactors, FALLBACK_COLOR, FieldDisplay, GrafanaTheme2, TimeRange } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';

 import { useStyles2, useTheme2 } from '../../themes/ThemeContext';
@@ -276,11 +275,7 @@ export function RadialGauge(props: RadialGaugeProps) {
  }

  return (
-    <div
-      data-testid={selectors.components.Panels.Visualization.Gauge.Container}
-      className={styles.vizWrapper}
-      style={{ width, height }}
-    >
+    <div className={styles.vizWrapper} style={{ width, height }}>
      {body}
    </div>
  );
@@ -1,4 +1,4 @@
-import { colorManipulator, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';

 import { RadialGaugeDimensions } from './types';

@@ -25,14 +25,13 @@ export function GlowGradient({ id, barWidth }: GlowGradientProps) {
  );
 }

-const CENTER_GLOW_OPACITY = 0.25;
+const CENTER_GLOW_OPACITY = 0.15;

 export function CenterGlowGradient({ gaugeId, color }: { gaugeId: string; color: string }) {
-  const transparentColor = colorManipulator.alpha(color, CENTER_GLOW_OPACITY);
  return (
    <radialGradient id={`circle-glow-${gaugeId}`} r="50%" fr="0%">
-      <stop offset="0%" stopColor={transparentColor} />
-      <stop offset="90%" stopColor={'#ffffff00'} />
+      <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+      <stop offset="90%" stopColor={color} stopOpacity={0} />
    </radialGradient>
  );
 }
@@ -45,14 +44,13 @@ export interface CenterGlowProps {

 export function MiddleCircleGlow({ dimensions, gaugeId, color }: CenterGlowProps) {
  const gradientId = `circle-glow-${gaugeId}`;
-  const transparentColor = color ? colorManipulator.alpha(color, CENTER_GLOW_OPACITY) : color;

  return (
    <>
      <defs>
        <radialGradient id={gradientId} r="50%" fr="0%">
-          <stop offset="0%" stopColor={transparentColor} />
-          <stop offset="90%" stopColor="#ffffff00" />
+          <stop offset="0%" stopColor={color} stopOpacity={CENTER_GLOW_OPACITY} />
+          <stop offset="90%" stopColor={color} stopOpacity={0} />
        </radialGradient>
      </defs>
      <g>
@@ -88,9 +86,9 @@ export function SpotlightGradient({

  return (
    <linearGradient x1={x1} y1={y1} x2={x2} y2={y2} id={id} gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stopColor="#ffffff00" />
-      <stop offset="95%" stopColor="#ffffff88" />
-      {roundedBars && <stop offset="100%" stopColor={roundedBars ? '#ffffffbb' : 'white'} />}
+      <stop offset="0%" stopColor={'white'} stopOpacity={0.0} />
+      <stop offset="95%" stopColor={'white'} stopOpacity={0.5} />
+      {roundedBars && <stop offset="100%" stopColor={'white'} stopOpacity={roundedBars ? 0.7 : 1} />}
    </linearGradient>
  );
 }
@@ -17,9 +17,8 @@ export interface SparklineProps extends Themeable2 {
  showHighlights?: boolean;
 }

-export const Sparkline: React.FC<SparklineProps> = memo((props) => {
+export const SparklineFn: React.FC<SparklineProps> = memo((props) => {
  const { sparkline, config: fieldConfig, theme, width, height, showHighlights } = props;
-
  const { frame: alignedDataFrame, warning } = prepareSeries(sparkline, theme, fieldConfig, showHighlights);
  if (warning) {
    return null;
@@ -31,4 +30,14 @@ export const Sparkline: React.FC<SparklineProps> = memo((props) => {
  return <UPlotChart data={data} config={configBuilder} width={width} height={height} />;
 });

-Sparkline.displayName = 'Sparkline';
+SparklineFn.displayName = 'Sparkline';
+
+// we converted to function component above, but some apps extend Sparkline, so we need
+// to keep exporting a class component until those apps are all rolled out.
+// see https://github.com/grafana/app-observability-plugin/pull/2079
+// eslint-disable-next-line react-prefer-function-component/react-prefer-function-component
+export class Sparkline extends React.PureComponent<SparklineProps> {
+  render() {
+    return <SparklineFn {...this.props} />;
+  }
+}
@@ -167,8 +167,7 @@ export class VizRepeater<V, D = {}> extends PureComponent<PropsWithDefaults<V, D

    const repeaterStyle: React.CSSProperties = {
      display: 'flex',
-      overflowX: `${minVizWidth ? 'auto' : 'hidden'}`,
-      overflowY: `${minVizHeight ? 'auto' : 'hidden'}`,
+      overflow: `${minVizWidth ? 'auto' : 'hidden'} ${minVizHeight ? 'auto' : 'hidden'}`,
    };

    let vizHeight = height;
@@ -1,88 +0,0 @@
-package auditing
-
-import (
-	"encoding/json"
-	"time"
-)
-
-type Event struct {
-	// The namespace the action was performed in.
-	Namespace string `json:"namespace"`
-
-	// When it happened.
-	ObservedAt time.Time `json:"-"` // see MarshalJSON for why this is omitted
-
-	// Who/what performed the action.
-	SubjectName string `json:"subjectName"`
-	SubjectUID  string `json:"subjectUID"`
-
-	// What was performed.
-	Verb string `json:"verb"`
-
-	// The object the action was performed on. For verbs like "list" this will be empty.
-	Object string `json:"object,omitempty"`
-
-	// API information.
-	APIGroup   string `json:"apiGroup,omitempty"`
-	APIVersion string `json:"apiVersion,omitempty"`
-	Kind       string `json:"kind,omitempty"`
-
-	// Outcome of the action.
-	Outcome EventOutcome `json:"outcome"`
-
-	// Extra fields to add more context to the event.
-	Extra map[string]string `json:"extra,omitempty"`
-}
-
-func (e Event) Time() time.Time {
-	return e.ObservedAt
-}
-
-func (e Event) MarshalJSON() ([]byte, error) {
-	type Alias Event
-	return json.Marshal(&struct {
-		FormattedTimestamp string `json:"observedAt"`
-		Alias
-	}{
-		FormattedTimestamp: e.ObservedAt.UTC().Format(time.RFC3339Nano),
-		Alias:              (Alias)(e),
-	})
-}
-
-func (e Event) KVPairs() []any {
-	args := []any{
-		"audit", true,
-		"namespace", e.Namespace,
-		"observedAt", e.ObservedAt.UTC().Format(time.RFC3339Nano),
-		"subjectName", e.SubjectName,
-		"subjectUID", e.SubjectUID,
-		"verb", e.Verb,
-		"object", e.Object,
-		"apiGroup", e.APIGroup,
-		"apiVersion", e.APIVersion,
-		"kind", e.Kind,
-		"outcome", e.Outcome,
-	}
-
-	if len(e.Extra) > 0 {
-		extraArgs := make([]any, 0, len(e.Extra)*2)
-
-		for k, v := range e.Extra {
-			extraArgs = append(extraArgs, "extra_"+k, v)
-		}
-
-		args = append(args, extraArgs...)
-	}
-
-	return args
-}
-
-type EventOutcome string
-
-const (
-	EventOutcomeUnknown             EventOutcome = "unknown"
-	EventOutcomeSuccess             EventOutcome = "success"
-	EventOutcomeFailureUnauthorized EventOutcome = "failure_unauthorized"
-	EventOutcomeFailureNotFound     EventOutcome = "failure_not_found"
-	EventOutcomeFailureGeneric      EventOutcome = "failure_generic"
-)
@@ -1,64 +0,0 @@
-package auditing_test
-
-import (
-	"encoding/json"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/grafana/grafana/pkg/apiserver/auditing"
-	"github.com/stretchr/testify/require"
-)
-
-func TestEvent_MarshalJSON(t *testing.T) {
-	t.Parallel()
-
-	t.Run("marshals the event", func(t *testing.T) {
-		t.Parallel()
-
-		now := time.Now()
-
-		event := auditing.Event{
-			ObservedAt: now,
-			Extra:      map[string]string{"k1": "v1", "k2": "v2"},
-		}
-
-		data, err := json.Marshal(event)
-		require.NoError(t, err)
-
-		var result map[string]any
-		require.NoError(t, json.Unmarshal(data, &result))
-
-		require.Equal(t, event.Time().UTC().Format(time.RFC3339Nano), result["observedAt"])
-		require.NotNil(t, result["extra"])
-		require.Len(t, result["extra"], 2)
-	})
-}
-
-func TestEvent_KVPairs(t *testing.T) {
-	t.Parallel()
-
-	t.Run("records extra fields", func(t *testing.T) {
-		t.Parallel()
-
-		extraFields := 2
-		extra := make(map[string]string, 0)
-		for i := 0; i < extraFields; i++ {
-			extra[strconv.Itoa(i)] = "value"
-		}
-
-		event := auditing.Event{Extra: extra}
-
-		kvPairs := event.KVPairs()
-
-		extraCount := 0
-		for i := 0; i < len(kvPairs); i += 2 {
-			if strings.HasPrefix(kvPairs[i].(string), "extra_") {
-				extraCount++
-			}
-		}
-
-		require.Equal(t, extraCount, extraFields)
-	})
-}
@@ -1,55 +0,0 @@
-package auditing
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-)
-
-// Sinkable is a log entry abstraction that can be sent to an audit log sink through the different implementing methods.
-type Sinkable interface {
-	json.Marshaler
-	KVPairs() []any
-	Time() time.Time
-}
-
-// Logger specifies the contract for a specific audit logger.
-type Logger interface {
-	Log(entry Sinkable) error
-	Close() error
-	Type() string
-}
-
-// Implementation inspired by https://github.com/grafana/grafana-app-sdk/blob/main/logging/logger.go
-type loggerContextKey struct{}
-
-var (
-	// DefaultLogger is the default Logger if one hasn't been provided in the context.
-	// You may use this to add arbitrary audit logging outside of an API request lifecycle.
-	DefaultLogger Logger = &NoopLogger{}
-
-	contextKey = loggerContextKey{}
-)
-
-// FromContext returns the Logger set in the context with Context(), or the DefaultLogger if no Logger is set in the context.
-// If DefaultLogger is nil, it returns a *NoopLogger so that the return is always valid to call methods on without nil-checking.
-// You may use this to add arbitrary audit logging outside of an API request lifecycle.
-func FromContext(ctx context.Context) Logger {
-	if l := ctx.Value(contextKey); l != nil {
-		if logger, ok := l.(Logger); ok {
-			return logger
-		}
-	}
-
-	if DefaultLogger != nil {
-		return DefaultLogger
-	}
-
-	return &NoopLogger{}
-}
-
-// Context returns a new context built from the provided context with the provided logger in it.
-// The Logger added with Context() can be retrieved with FromContext()
-func Context(ctx context.Context, logger Logger) context.Context {
-	return context.WithValue(ctx, contextKey, logger)
-}
@@ -11,9 +11,9 @@ type NoopBackend struct{}

 func ProvideNoopBackend() audit.Backend { return &NoopBackend{} }

-func (NoopBackend) ProcessEvents(...*auditinternal.Event) bool { return false }
+func (b *NoopBackend) ProcessEvents(k8sEvents ...*auditinternal.Event) bool { return false }

-func (NoopBackend) Run(<-chan struct{}) error { return nil }
+func (NoopBackend) Run(stopCh <-chan struct{}) error { return nil }

 func (NoopBackend) Shutdown() {}

@@ -34,14 +34,3 @@ type NoopPolicyRuleEvaluator struct{}
 func (NoopPolicyRuleEvaluator) EvaluatePolicyRule(authorizer.Attributes) audit.RequestAuditConfig {
 	return audit.RequestAuditConfig{Level: auditinternal.LevelNone}
 }
-
-// NoopLogger is a no-op implementation of Logger
-type NoopLogger struct{}
-
-func ProvideNoopLogger() Logger { return &NoopLogger{} }
-
-func (NoopLogger) Type() string { return "noop" }
-
-func (NoopLogger) Log(Sinkable) error { return nil }
-
-func (NoopLogger) Close() error { return nil }
@@ -46,23 +46,14 @@ func (defaultGrafanaPolicyRuleEvaluator) EvaluatePolicyRule(attrs authorizer.Att
 		}
 	}

-	// Logging the response object allows us to get the resource name for create requests.
-	level := auditinternal.LevelMetadata
-	if attrs.GetVerb() == utils.VerbCreate {
-		level = auditinternal.LevelRequestResponse
-	}
-
 	return audit.RequestAuditConfig{
-		Level: level,
-
-		// Only log on StageResponseComplete, to avoid noisy logs.
+		Level: auditinternal.LevelMetadata,
 		OmitStages: []auditinternal.Stage{
+			// Only log on StageResponseComplete
 			auditinternal.StageRequestReceived,
 			auditinternal.StageResponseStarted,
 			auditinternal.StagePanic,
 		},
-
-		// Setting it to true causes extra copying/unmarshalling.
-		OmitManagedFields: false,
+		OmitManagedFields: false, // Setting it to true causes extra copying/unmarshalling.
 	}
 }
@@ -55,7 +55,7 @@ func TestDefaultGrafanaPolicyRuleEvaluator(t *testing.T) {
 		require.Equal(t, auditinternal.LevelNone, config.Level)
 	})

-	t.Run("return audit level request+response for create requests", func(t *testing.T) {
+	t.Run("return audit level metadata for other resource requests", func(t *testing.T) {
 		t.Parallel()

 		attrs := authorizer.AttributesRecord{
@@ -67,22 +67,6 @@ func TestDefaultGrafanaPolicyRuleEvaluator(t *testing.T) {
 			},
 		}

-		config := evaluator.EvaluatePolicyRule(attrs)
-		require.Equal(t, auditinternal.LevelRequestResponse, config.Level)
-	})
-
-	t.Run("return audit level metadata for other resource requests", func(t *testing.T) {
-		t.Parallel()
-
-		attrs := authorizer.AttributesRecord{
-			ResourceRequest: true,
-			Verb:            utils.VerbGet,
-			User: &user.DefaultInfo{
-				Name:   "test-user",
-				Groups: []string{"test-group"},
-			},
-		}
-
 		config := evaluator.EvaluatePolicyRule(attrs)
 		require.Equal(t, auditinternal.LevelMetadata, config.Level)
 	})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul Marbach	849098bcf0	wip: improve the working branch	2026-01-09 17:11:30 -05:00
Abhijnya002	f70bc80a5c	docs: add comments explaining blur timeout pattern - Explain why blur timeout is needed for focus transitions - Clarify that it handles focus moving between related UI elements - Addresses review feedback requesting explanation of blur timeout	2026-01-06 19:34:20 -05:00
Abhijnya002	254a7b9971	feat: extend DataLinksContextMenu to support keyboard events - Update DataLinksContextMenu API to accept position objects for keyboard events - Add getMenuPosition helper function to calculate position from element - Update WithContextMenu to handle position objects and elements - Simplify pie chart keyboard handler to use position object API - Position calculation logic now in core component (DataLinksContextMenu) - Addresses review feedback about keyboard accessibility and position calculation	2026-01-06 19:29:28 -05:00
Abhijnya002	838bc756db	refactor: move event handler logic into wrapper component - Create PieChartDataLinksContextMenu wrapper that handles anchor event listeners - Create PieSliceWithDataLinks component that uses the wrapper - Remove large useEffect from PieSlice that was finding anchor after creation - Event handler logic is now co-located with DataLinksContextMenu usage - Addresses review feedback about handler management being outside component creation	2026-01-06 19:23:40 -05:00
Abhijnya002	bb012056eb	refactor: extract repeated event dispatch into useCallback - Create publishDataHoverEvent and publishDataHoverClearEvent useCallback functions - Replace all repeated eventBus.publish calls with the new callbacks - Update dependency arrays to use the new callbacks - Addresses review feedback on code duplication	2026-01-06 19:18:33 -05:00
Abhijnya002	4ac1bbc657	refactor: simplify ensureNotFocusable calls - Remove unnecessary 100ms setTimeout call - Keep immediate call and setTimeout(0) to handle React render timing - Add comments explaining the rationale - Addresses review feedback on code clarity	2026-01-06 19:14:29 -05:00
Abhijnya002	d46947ccb2	refactor: move outline style from inline to getSvgStyle CSS - Move outline: 'none' from inline style prop to CSS styles - Add outline: 'none' to all svgArg states (normal, highlighted, deemphasized) - Addresses review feedback on code organization	2026-01-06 19:11:51 -05:00
Abhijnya002	45bdeefbdf	fix: use i18n for aria-label and always set it in pie chart - Replace hardcoded aria-label string with @grafana/i18n translation - Always set aria-label instead of conditionally setting to undefined - Addresses review feedback on internationalization and accessibility	2026-01-06 19:09:22 -05:00
Abhijnya002	eb3df4fa00	Remove data links sorting from pie chart slices Remove the sort() call that was reordering pie slices based on data links presence. Pie slices should maintain their original order regardless of data links.	2026-01-05 12:37:34 -05:00
Abhijnya002	65919fc0bf	fix(piechart): add visible keyboard focus indicator for data links Fixes #114227 Adds visible focus indicator to data links in pie chart visualization to improve keyboard navigation accessibility. - Added keyboard focus handlers for slices with data links - Implemented highlight on focus using DataHoverEvent system - Added Enter key support to activate data links - Handled both single and multiple link cases - Ensured proper tab order by sorting slices with data links first - Added proper ARIA attributes (role, aria-label) for accessibility	2025-12-27 00:02:34 -05:00