Fixed merge conflict

Full edit
I18n: Download translations from Crowdin (#115291 )
2025-12-12 23:02:33 -05:00 · 2025-12-12 22:28:35 -05:00 · 2025-12-13 00:42:48 +00:00 · 2025-12-12 22:26:28 +00:00 · 2025-12-12 22:14:48 +00:00 · 2025-12-12 21:57:47 +00:00
914 changed files with 7268 additions and 25633 deletions
@@ -14,7 +14,7 @@ ARG JS_SRC=js-builder

 # Dependabot cannot update dependencies listed in ARGs
 # By using FROM instructions we can delegate dependency updates to dependabot
-FROM alpine:3.23.0 AS alpine-base
+FROM alpine:3.22.2 AS alpine-base
 FROM ubuntu:22.04 AS ubuntu-base
 FROM golang:1.25.5-alpine AS go-builder-base
 FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base
@@ -8,8 +8,9 @@ import (
 func (stars *StarsSpec) Add(group, kind, name string) {
 	for i, r := range stars.Resource {
 		if r.Group == group && r.Kind == kind {
-			stars.Resource[i].Names = append(r.Names, name)
-			stars.Normalize()
+			r.Names = append(r.Names, name)
+			slices.Sort(r.Names)
+			stars.Resource[i].Names = slices.Compact(r.Names)
 			return
 		}
 	}
@@ -45,15 +46,8 @@ func (stars *StarsSpec) Normalize() {
 	resources := make([]StarsResource, 0, len(stars.Resource))
 	for _, r := range stars.Resource {
 		if len(r.Names) > 0 {
-			unique := make([]string, 0, len(r.Names))
-			found := make(map[string]bool, len(r.Names))
-			for _, name := range r.Names {
-				if !found[name] {
-					unique = append(unique, name)
-					found[name] = true
-				}
-			}
-			r.Names = unique
+			slices.Sort(r.Names)
+			r.Names = slices.Compact(r.Names) // removes any duplicates
 			resources = append(resources, r)
 		}
 	}
@@ -39,7 +39,7 @@ func TestStarsWrite(t *testing.T) {
 				Resource: []StarsResource{{
 					Group: "g",
 					Kind:  "k",
-					Names: []string{"a", "b", "x", "c"}, // added c to the end
+					Names: []string{"a", "b", "c", "x"}, // added "b" (and sorted)
 				}},
 			},
 		}, {
@@ -57,7 +57,6 @@ require (
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.7.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -112,8 +112,6 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-plugin v1.7.0 h1:YghfQH/0QmPNc/AZMTFE3ac8fipZyZECHdDPshfk+mA=
 github.com/hashicorp/go-plugin v1.7.0/go.mod h1:BExt6KEaIYx804z8k4gRzRLEvxKVb+kn0NMcihqOqb8=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
 github.com/jaegertracing/jaeger-idl v0.5.0 h1:zFXR5NL3Utu7MhPg8ZorxtCBjHrL3ReM1VoB65FOFGE=
@@ -1,454 +0,0 @@
-package conversion
-
-import (
-	"context"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
-	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
-	dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
-	dashv2beta1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1"
-	"github.com/grafana/grafana/apps/dashboard/pkg/migration"
-	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
-	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// countingDataSourceProvider tracks how many times Index() is called
-type countingDataSourceProvider struct {
-	datasources []schemaversion.DataSourceInfo
-	callCount   atomic.Int64
-}
-
-func newCountingDataSourceProvider(datasources []schemaversion.DataSourceInfo) *countingDataSourceProvider {
-	return &countingDataSourceProvider{
-		datasources: datasources,
-	}
-}
-
-func (p *countingDataSourceProvider) Index(_ context.Context) *schemaversion.DatasourceIndex {
-	p.callCount.Add(1)
-	return schemaversion.NewDatasourceIndex(p.datasources)
-}
-
-func (p *countingDataSourceProvider) getCallCount() int64 {
-	return p.callCount.Load()
-}
-
-// countingLibraryElementProvider tracks how many times GetLibraryElementInfo() is called
-type countingLibraryElementProvider struct {
-	elements  []schemaversion.LibraryElementInfo
-	callCount atomic.Int64
-}
-
-func newCountingLibraryElementProvider(elements []schemaversion.LibraryElementInfo) *countingLibraryElementProvider {
-	return &countingLibraryElementProvider{
-		elements: elements,
-	}
-}
-
-func (p *countingLibraryElementProvider) GetLibraryElementInfo(_ context.Context) []schemaversion.LibraryElementInfo {
-	p.callCount.Add(1)
-	return p.elements
-}
-
-func (p *countingLibraryElementProvider) getCallCount() int64 {
-	return p.callCount.Load()
-}
-
-// createTestV0Dashboard creates a minimal v0 dashboard for testing
-// The dashboard has a datasource with UID only (no type) to force provider lookup
-// and includes library panels to test library element provider caching
-func createTestV0Dashboard(namespace, title string) *dashv0.Dashboard {
-	return &dashv0.Dashboard{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-dashboard",
-			Namespace: namespace,
-		},
-		Spec: common.Unstructured{
-			Object: map[string]interface{}{
-				"title":         title,
-				"schemaVersion": schemaversion.LATEST_VERSION,
-				// Variables with datasource reference that requires lookup
-				"templating": map[string]interface{}{
-					"list": []interface{}{
-						map[string]interface{}{
-							"name":  "query_var",
-							"type":  "query",
-							"query": "label_values(up, job)",
-							// Datasource with UID only - type needs to be looked up
-							"datasource": map[string]interface{}{
-								"uid": "ds1",
-								// type is intentionally omitted to trigger provider lookup
-							},
-						},
-					},
-				},
-				"panels": []interface{}{
-					map[string]interface{}{
-						"id":    1,
-						"title": "Test Panel",
-						"type":  "timeseries",
-						"targets": []interface{}{
-							map[string]interface{}{
-								// Datasource with UID only - type needs to be looked up
-								"datasource": map[string]interface{}{
-									"uid": "ds1",
-								},
-							},
-						},
-					},
-					// Library panel reference - triggers library element provider lookup
-					map[string]interface{}{
-						"id":    2,
-						"title": "Library Panel with Horizontal Repeat",
-						"type":  "library-panel-ref",
-						"gridPos": map[string]interface{}{
-							"h": 8,
-							"w": 12,
-							"x": 0,
-							"y": 8,
-						},
-						"libraryPanel": map[string]interface{}{
-							"uid":  "lib-panel-repeat-h",
-							"name": "Library Panel with Horizontal Repeat",
-						},
-					},
-					// Another library panel reference
-					map[string]interface{}{
-						"id":    3,
-						"title": "Library Panel without Repeat",
-						"type":  "library-panel-ref",
-						"gridPos": map[string]interface{}{
-							"h": 3,
-							"w": 6,
-							"x": 0,
-							"y": 16,
-						},
-						"libraryPanel": map[string]interface{}{
-							"uid":  "lib-panel-no-repeat",
-							"name": "Library Panel without Repeat",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-// createTestV1Dashboard creates a minimal v1beta1 dashboard for testing
-// The dashboard has a datasource with UID only (no type) to force provider lookup
-// and includes library panels to test library element provider caching
-func createTestV1Dashboard(namespace, title string) *dashv1.Dashboard {
-	return &dashv1.Dashboard{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-dashboard",
-			Namespace: namespace,
-		},
-		Spec: common.Unstructured{
-			Object: map[string]interface{}{
-				"title":         title,
-				"schemaVersion": schemaversion.LATEST_VERSION,
-				// Variables with datasource reference that requires lookup
-				"templating": map[string]interface{}{
-					"list": []interface{}{
-						map[string]interface{}{
-							"name":  "query_var",
-							"type":  "query",
-							"query": "label_values(up, job)",
-							// Datasource with UID only - type needs to be looked up
-							"datasource": map[string]interface{}{
-								"uid": "ds1",
-								// type is intentionally omitted to trigger provider lookup
-							},
-						},
-					},
-				},
-				"panels": []interface{}{
-					map[string]interface{}{
-						"id":    1,
-						"title": "Test Panel",
-						"type":  "timeseries",
-						"targets": []interface{}{
-							map[string]interface{}{
-								// Datasource with UID only - type needs to be looked up
-								"datasource": map[string]interface{}{
-									"uid": "ds1",
-								},
-							},
-						},
-					},
-					// Library panel reference - triggers library element provider lookup
-					map[string]interface{}{
-						"id":    2,
-						"title": "Library Panel with Vertical Repeat",
-						"type":  "library-panel-ref",
-						"gridPos": map[string]interface{}{
-							"h": 4,
-							"w": 6,
-							"x": 0,
-							"y": 8,
-						},
-						"libraryPanel": map[string]interface{}{
-							"uid":  "lib-panel-repeat-v",
-							"name": "Library Panel with Vertical Repeat",
-						},
-					},
-					// Another library panel reference
-					map[string]interface{}{
-						"id":    3,
-						"title": "Library Panel without Repeat",
-						"type":  "library-panel-ref",
-						"gridPos": map[string]interface{}{
-							"h": 3,
-							"w": 6,
-							"x": 6,
-							"y": 8,
-						},
-						"libraryPanel": map[string]interface{}{
-							"uid":  "lib-panel-no-repeat",
-							"name": "Library Panel without Repeat",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-// TestConversionCaching_V0_to_V2alpha1 verifies caching works when converting V0 to V2alpha1
-func TestConversionCaching_V0_to_V2alpha1(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	// Convert multiple dashboards in the same namespace
-	numDashboards := 5
-	namespace := "default"
-
-	for i := 0; i < numDashboards; i++ {
-		source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
-		target := &dashv2alpha1.Dashboard{}
-
-		err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
-		require.NoError(t, err, "conversion %d should succeed", i)
-		require.NotNil(t, target.Spec)
-	}
-
-	// With caching, the underlying datasource provider should only be called once per namespace
-	// The test dashboard has datasources without type that require lookup
-	assert.Equal(t, int64(1), underlyingDS.getCallCount(),
-		"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
-	// Library element provider should also be called only once per namespace due to caching
-	assert.Equal(t, int64(1), underlyingLE.getCallCount(),
-		"library element provider should be called only once for %d conversions in same namespace", numDashboards)
-}
-
-// TestConversionCaching_V0_to_V2beta1 verifies caching works when converting V0 to V2beta1
-func TestConversionCaching_V0_to_V2beta1(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	numDashboards := 5
-	namespace := "default"
-
-	for i := 0; i < numDashboards; i++ {
-		source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
-		target := &dashv2beta1.Dashboard{}
-
-		err := Convert_V0_to_V2beta1(source, target, nil, cachedDS, cachedLE)
-		require.NoError(t, err, "conversion %d should succeed", i)
-		require.NotNil(t, target.Spec)
-	}
-
-	assert.Equal(t, int64(1), underlyingDS.getCallCount(),
-		"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
-	assert.Equal(t, int64(1), underlyingLE.getCallCount(),
-		"library element provider should be called only once for %d conversions in same namespace", numDashboards)
-}
-
-// TestConversionCaching_V1beta1_to_V2alpha1 verifies caching works when converting V1beta1 to V2alpha1
-func TestConversionCaching_V1beta1_to_V2alpha1(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-v", Name: "Library Panel with Vertical Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	numDashboards := 5
-	namespace := "default"
-
-	for i := 0; i < numDashboards; i++ {
-		source := createTestV1Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
-		target := &dashv2alpha1.Dashboard{}
-
-		err := Convert_V1beta1_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
-		require.NoError(t, err, "conversion %d should succeed", i)
-		require.NotNil(t, target.Spec)
-	}
-
-	assert.Equal(t, int64(1), underlyingDS.getCallCount(),
-		"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
-	assert.Equal(t, int64(1), underlyingLE.getCallCount(),
-		"library element provider should be called only once for %d conversions in same namespace", numDashboards)
-}
-
-// TestConversionCaching_V1beta1_to_V2beta1 verifies caching works when converting V1beta1 to V2beta1
-func TestConversionCaching_V1beta1_to_V2beta1(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-v", Name: "Library Panel with Vertical Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	numDashboards := 5
-	namespace := "default"
-
-	for i := 0; i < numDashboards; i++ {
-		source := createTestV1Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
-		target := &dashv2beta1.Dashboard{}
-
-		err := Convert_V1beta1_to_V2beta1(source, target, nil, cachedDS, cachedLE)
-		require.NoError(t, err, "conversion %d should succeed", i)
-		require.NotNil(t, target.Spec)
-	}
-
-	assert.Equal(t, int64(1), underlyingDS.getCallCount(),
-		"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
-	assert.Equal(t, int64(1), underlyingLE.getCallCount(),
-		"library element provider should be called only once for %d conversions in same namespace", numDashboards)
-}
-
-// TestConversionCaching_MultipleNamespaces verifies that different namespaces get separate cache entries
-func TestConversionCaching_MultipleNamespaces(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	namespaces := []string{"default", "org-2", "org-3"}
-	numDashboardsPerNs := 3
-
-	for _, ns := range namespaces {
-		for i := 0; i < numDashboardsPerNs; i++ {
-			source := createTestV0Dashboard(ns, "Dashboard "+string(rune('A'+i)))
-			target := &dashv2alpha1.Dashboard{}
-
-			err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
-			require.NoError(t, err, "conversion for namespace %s should succeed", ns)
-		}
-	}
-
-	// With caching, each namespace should result in one call to the underlying provider
-	expectedCalls := int64(len(namespaces))
-	assert.Equal(t, expectedCalls, underlyingDS.getCallCount(),
-		"datasource provider should be called once per namespace (%d namespaces)", len(namespaces))
-	assert.Equal(t, expectedCalls, underlyingLE.getCallCount(),
-		"library element provider should be called once per namespace (%d namespaces)", len(namespaces))
-}
-
-// TestConversionCaching_CacheDisabled verifies that TTL=0 disables caching
-func TestConversionCaching_CacheDisabled(t *testing.T) {
-	datasources := []schemaversion.DataSourceInfo{
-		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
-	}
-	elements := []schemaversion.LibraryElementInfo{
-		{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
-		{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
-	}
-
-	underlyingDS := newCountingDataSourceProvider(datasources)
-	underlyingLE := newCountingLibraryElementProvider(elements)
-
-	// TTL of 0 should disable caching - the wrapper returns the underlying provider directly
-	cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, 0)
-	cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, 0)
-
-	migration.ResetForTesting()
-	migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
-
-	numDashboards := 3
-	namespace := "default"
-
-	for i := 0; i < numDashboards; i++ {
-		source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
-		target := &dashv2alpha1.Dashboard{}
-
-		err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
-		require.NoError(t, err, "conversion %d should succeed", i)
-	}
-
-	// Without caching, each conversion calls the underlying provider multiple times
-	// (once for each datasource lookup needed - variables and panels)
-	// The key check is that the count is GREATER than 1 per conversion (no caching benefit)
-	assert.Greater(t, underlyingDS.getCallCount(), int64(numDashboards),
-		"with cache disabled, conversions should call datasource provider multiple times")
-	// Library element provider is also called for each conversion without caching
-	assert.GreaterOrEqual(t, underlyingLE.getCallCount(), int64(numDashboards),
-		"with cache disabled, conversions should call library element provider multiple times")
-}
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"

+	"k8s.io/apimachinery/pkg/conversion"
+
 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
@@ -119,14 +121,6 @@ func countPanelsV0V1(spec map[string]interface{}) int {
 	return count
 }

-// countTargetsFromPanel counts the number of targets/queries in a panel.
-func countTargetsFromPanel(panelMap map[string]interface{}) int {
-	if targets, ok := panelMap["targets"].([]interface{}); ok {
-		return len(targets)
-	}
-	return 0
-}
-
 // countQueriesV0V1 counts data queries in v0alpha1 or v1beta1 dashboard spec
 // Note: Row panels are layout containers and should not have queries.
 // We ignore any queries on row panels themselves, but count queries in their collapsed panels.
@@ -151,7 +145,9 @@ func countQueriesV0V1(spec map[string]interface{}) int {

 		// Count queries in regular panels (NOT row panels)
 		if panelType != "row" {
-			count += countTargetsFromPanel(panelMap)
+			if targets, ok := panelMap["targets"].([]interface{}); ok {
+				count += len(targets)
+			}
 		}

 		// Count queries in collapsed panels inside row panels
@@ -159,7 +155,9 @@ func countQueriesV0V1(spec map[string]interface{}) int {
 			if collapsedPanels, ok := panelMap["panels"].([]interface{}); ok {
 				for _, cp := range collapsedPanels {
 					if cpMap, ok := cp.(map[string]interface{}); ok {
-						count += countTargetsFromPanel(cpMap)
+						if targets, ok := cpMap["targets"].([]interface{}); ok {
+							count += len(targets)
+						}
 					}
 				}
 			}
@@ -444,3 +442,77 @@ func collectDashboardStats(dashboard interface{}) dashboardStats {
 	}
 	return dashboardStats{}
 }
+
+// withConversionDataLossDetection wraps a conversion function to detect data loss
+func withConversionDataLossDetection(sourceFuncName, targetFuncName string, conversionFunc func(a, b interface{}, scope conversion.Scope) error) func(a, b interface{}, scope conversion.Scope) error {
+	return func(a, b interface{}, scope conversion.Scope) error {
+		// Collect source statistics
+		var sourceStats dashboardStats
+		switch source := a.(type) {
+		case *dashv0.Dashboard:
+			if source.Spec.Object != nil {
+				sourceStats = collectStatsV0V1(source.Spec.Object)
+			}
+		case *dashv1.Dashboard:
+			if source.Spec.Object != nil {
+				sourceStats = collectStatsV0V1(source.Spec.Object)
+			}
+		case *dashv2alpha1.Dashboard:
+			sourceStats = collectStatsV2alpha1(source.Spec)
+		case *dashv2beta1.Dashboard:
+			sourceStats = collectStatsV2beta1(source.Spec)
+		}
+
+		// Execute the conversion
+		err := conversionFunc(a, b, scope)
+		if err != nil {
+			return err
+		}
+
+		// Collect target statistics
+		var targetStats dashboardStats
+		switch target := b.(type) {
+		case *dashv0.Dashboard:
+			if target.Spec.Object != nil {
+				targetStats = collectStatsV0V1(target.Spec.Object)
+			}
+		case *dashv1.Dashboard:
+			if target.Spec.Object != nil {
+				targetStats = collectStatsV0V1(target.Spec.Object)
+			}
+		case *dashv2alpha1.Dashboard:
+			targetStats = collectStatsV2alpha1(target.Spec)
+		case *dashv2beta1.Dashboard:
+			targetStats = collectStatsV2beta1(target.Spec)
+		}
+
+		// Detect if data was lost
+		if dataLossErr := detectConversionDataLoss(sourceStats, targetStats, sourceFuncName, targetFuncName); dataLossErr != nil {
+			logger.Error("Dashboard conversion data loss detected",
+				"sourceFunc", sourceFuncName,
+				"targetFunc", targetFuncName,
+				"sourcePanels", sourceStats.panelCount,
+				"targetPanels", targetStats.panelCount,
+				"sourceQueries", sourceStats.queryCount,
+				"targetQueries", targetStats.queryCount,
+				"sourceAnnotations", sourceStats.annotationCount,
+				"targetAnnotations", targetStats.annotationCount,
+				"sourceLinks", sourceStats.linkCount,
+				"targetLinks", targetStats.linkCount,
+				"error", dataLossErr,
+			)
+			return dataLossErr
+		}
+
+		logger.Debug("Dashboard conversion completed without data loss",
+			"sourceFunc", sourceFuncName,
+			"targetFunc", targetFuncName,
+			"panels", targetStats.panelCount,
+			"queries", targetStats.queryCount,
+			"annotations", targetStats.annotationCount,
+			"links", targetStats.linkCount,
+		)
+
+		return nil
+	}
+}
@@ -35,7 +35,7 @@ func TestConversionMatrixExist(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	versions := []metav1.Object{
 		&dashv0.Dashboard{Spec: common.Unstructured{Object: map[string]any{"title": "dashboardV0"}}},
@@ -89,7 +89,7 @@ func TestDashboardConversionToAllVersions(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	// Set up conversion scheme
 	scheme := runtime.NewScheme()
@@ -309,7 +309,7 @@ func TestMigratedDashboardsConversion(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	// Set up conversion scheme
 	scheme := runtime.NewScheme()
@@ -428,7 +428,7 @@ func setupTestConversionScheme(t *testing.T) *runtime.Scheme {
 	t.Helper()
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	scheme := runtime.NewScheme()
 	err := RegisterConversions(scheme, dsProvider, leProvider)
@@ -527,7 +527,7 @@ func TestConversionMetrics(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	// Create a test registry for metrics
 	registry := prometheus.NewRegistry()
@@ -694,7 +694,7 @@ func TestConversionMetricsWrapper(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	// Create a test registry for metrics
 	registry := prometheus.NewRegistry()
@@ -864,7 +864,7 @@ func TestSchemaVersionExtraction(t *testing.T) {
 			dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 			// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 			leProvider := migrationtestutil.NewTestLibraryElementProvider()
-			migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+			migration.Initialize(dsProvider, leProvider)

 			// Create a test registry for metrics
 			registry := prometheus.NewRegistry()
@@ -910,7 +910,7 @@ func TestConversionLogging(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	// Create a test registry for metrics
 	registry := prometheus.NewRegistry()
@@ -1003,7 +1003,7 @@ func TestConversionLogLevels(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	t.Run("log levels and structured fields verification", func(t *testing.T) {
 		// Create test wrapper to verify logging behavior
@@ -1076,7 +1076,7 @@ func TestConversionLoggingFields(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	// Use TestLibraryElementProvider for tests that need library panel models with repeat options
 	leProvider := migrationtestutil.NewTestLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
+	migration.Initialize(dsProvider, leProvider)

 	t.Run("verify all log fields are present", func(t *testing.T) {
 		// Test that the conversion wrapper includes all expected structured fields
@@ -17,9 +17,7 @@ import (
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 )

-func getLogger() logging.Logger {
-	return logging.DefaultLogger.With("logger", "dashboard.conversion")
-}
+var logger = logging.DefaultLogger.With("logger", "dashboard.conversion")

 // getErroredSchemaVersionFunc determines the schema version function that errored
 func getErroredSchemaVersionFunc(err error) string {
@@ -199,9 +197,9 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
 			)

 			if errorType == "schema_minimum_version_error" {
-				getLogger().Warn("Dashboard conversion failed", logFields...)
+				logger.Warn("Dashboard conversion failed", logFields...)
 			} else {
-				getLogger().Error("Dashboard conversion failed", logFields...)
+				logger.Error("Dashboard conversion failed", logFields...)
 			}
 		} else {
 			// Record success metrics
@@ -237,7 +235,7 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
 				)
 			}

-			getLogger().Debug("Dashboard conversion succeeded", successLogFields...)
+			logger.Debug("Dashboard conversion succeeded", successLogFields...)
 		}

 		return nil
@@ -76,9 +76,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": true,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -155,9 +155,9 @@
          "barGlow": false,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -234,9 +234,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -313,9 +313,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -392,9 +392,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -471,9 +471,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": false,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -550,9 +550,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": false,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -642,9 +642,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -721,9 +721,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -800,9 +800,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -879,9 +879,9 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": false
+          "spotlight": true
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -975,9 +975,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1054,9 +1054,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1133,9 +1133,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": true
+          "spotlight": false
        },
+        "gradient": "auto",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1212,9 +1212,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1291,9 +1291,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1387,9 +1387,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": true
+          "spotlight": false
        },
+        "gradient": "auto",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1470,9 +1470,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": true
+          "spotlight": false
        },
+        "gradient": "auto",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1553,9 +1553,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": true
+          "spotlight": false
        },
+        "gradient": "auto",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1645,10 +1645,10 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "auto",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1731,10 +1731,10 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "scheme",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1831,10 +1831,10 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "scheme",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1919,10 +1919,10 @@
          "centerGlow": true,
          "rounded": true,
          "sparkline": false,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "scheme",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -2005,10 +2005,10 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "hue",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -2091,10 +2091,10 @@
          "barGlow": true,
          "centerGlow": true,
          "rounded": true,
-          "spotlight": true,
-          "gradient": true
+          "spotlight": true
        },
        "glow": "both",
+        "gradient": "hue",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -2147,4 +2147,4 @@
  "title": "Panel tests - Gauge (new)",
  "uid": "panel-tests-gauge-new",
  "weekStart": ""
-}
+}
@@ -956,9 +956,9 @@
          "barGlow": false,
          "centerGlow": false,
          "rounded": false,
-          "spotlight": false,
-          "gradient": false
+          "spotlight": false
        },
+        "gradient": "none",
        "orientation": "auto",
        "reduceOptions": {
          "calcs": [
@@ -1162,4 +1162,4 @@
  "title": "Panel tests - Old gauge to new",
  "uid": "panel-tests-old-gauge-to-new",
  "weekStart": ""
-}
+}
@@ -237,10 +237,5 @@
    "title": "V10 Table Thresholds Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -244,10 +244,5 @@
    "title": "V10 Table Thresholds Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -206,10 +206,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -213,10 +213,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -203,10 +203,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -216,10 +216,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -351,10 +351,5 @@
    "title": "V13 Graph Thresholds Migration Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -362,10 +362,5 @@
    "title": "V13 Graph Thresholds Migration Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -129,10 +129,5 @@
    "title": "Dashboard with minimal graph panel settings",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -132,10 +132,5 @@
    "title": "Dashboard with minimal graph panel settings",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -210,10 +210,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -217,10 +217,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1004,10 +1004,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1023,10 +1023,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -223,10 +223,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -231,10 +231,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1455,10 +1455,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1481,10 +1481,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -719,10 +719,5 @@
    "title": "V16 Grid Layout Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -739,10 +739,5 @@
    "title": "V16 Grid Layout Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1655,10 +1655,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1707,10 +1707,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -636,10 +636,5 @@
    "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -657,10 +657,5 @@
    "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -401,10 +401,5 @@
    "title": "V18 Gauge Options Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -412,10 +412,5 @@
    "title": "V18 Gauge Options Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -434,10 +434,5 @@
    "title": "V19 Panel Links Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -447,10 +447,5 @@
    "title": "V19 Panel Links Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -354,10 +354,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -365,10 +365,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -426,10 +426,5 @@
    "title": "V20 Variable Syntax Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -437,10 +437,5 @@
    "title": "V20 Variable Syntax Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -401,10 +401,5 @@
    "title": "V21 Data Links Series to Field Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -412,10 +412,5 @@
    "title": "V21 Data Links Series to Field Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -123,10 +123,5 @@
    "title": "V22 Table Panel Styles Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -126,10 +126,5 @@
    "title": "V22 Table Panel Styles Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -374,10 +374,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -391,10 +391,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1065,10 +1065,5 @@
    "title": "No Title",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1101,10 +1101,5 @@
    "title": "No Title",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -217,10 +217,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -226,10 +226,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -240,10 +240,5 @@
    "title": "No Title",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -247,10 +247,5 @@
    "title": "No Title",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -207,10 +207,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -211,10 +211,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -131,10 +131,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -134,10 +134,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -393,10 +393,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -406,10 +406,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -622,10 +622,5 @@
    "title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -642,10 +642,5 @@
    "title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -435,10 +435,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -458,10 +458,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -294,10 +294,5 @@
    "title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -303,10 +303,5 @@
    "title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -689,10 +689,5 @@
    "title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -705,10 +705,5 @@
    "title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -669,10 +669,5 @@
    "title": "V31 LabelsToFields Merge Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -684,10 +684,5 @@
    "title": "V31 LabelsToFields Merge Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -310,10 +310,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -320,10 +320,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -720,10 +720,5 @@
    "title": "V33 Panel Datasource Name to Ref Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -746,10 +746,5 @@
    "title": "V33 Panel Datasource Name to Ref Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1900,10 +1900,5 @@
    "title": "CloudWatch Multiple Statistics Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1964,10 +1964,5 @@
    "title": "CloudWatch Multiple Statistics Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -595,10 +595,5 @@
    "title": "X-Axis Visibility Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -612,10 +612,5 @@
    "title": "X-Axis Visibility Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1029,10 +1029,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -1065,10 +1065,5 @@
      }
    ]
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -629,10 +629,5 @@
    "title": "V37 Legend Normalization Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -642,10 +642,5 @@
    "title": "V37 Legend Normalization Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -659,10 +659,5 @@
    "title": "V38 Table Migration Comprehensive Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -671,10 +671,5 @@
    "title": "V38 Table Migration Comprehensive Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -659,10 +659,5 @@
    "title": "V38 Table Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -671,10 +671,5 @@
    "title": "V38 Table Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -586,10 +586,5 @@
    "title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -596,10 +596,5 @@
    "title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -237,10 +237,5 @@
    "title": "V4 No-Op Migration Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -244,10 +244,5 @@
    "title": "V4 No-Op Migration Test",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -64,10 +64,5 @@
    "title": "Empty String Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -65,10 +65,5 @@
    "title": "Empty String Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -64,10 +64,5 @@
    "title": "Boolean False Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -65,10 +65,5 @@
    "title": "Boolean False Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -64,10 +64,5 @@
    "title": "Refresh Not Set Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -65,10 +65,5 @@
    "title": "Refresh Not Set Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -64,10 +64,5 @@
    "title": "Numeric Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
@@ -65,10 +65,5 @@
    "title": "Numeric Refresh Test Dashboard",
    "variables": []
  },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Isabel Matwawana	2a1f96f3f2	Fixed merge conflict	2025-12-12 23:02:33 -05:00
Isabel Matwawana	dd65715082	Full edit	2025-12-12 22:28:35 -05:00
grafana-pr-automation[bot]	c5345498b1	I18n: Download translations from Crowdin (#115291 ) New Crowdin translations by GitHub Action Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-12-13 00:42:48 +00:00
Isabel Matwawana	1bcccd5e61	Docs: Update export as JSON task (#115288 )	2025-12-12 22:26:28 +00:00
Oscar Kilhed	12b38d1b7a	Dashboards: Never allow rows with hidden header to be collapsed (#115284 ) Never allow rows with hidden header to be collapsed	2025-12-12 22:14:48 +00:00
Paul Marbach	359d097154	Table: Remove hardcoded assumption of __nestedFrames field name (#115117 ) * Table: Remove hardcoded assumption of __nestedFrames field name * E2E for nested tables * Apply suggestion from @fastfrwrd	2025-12-12 21:57:47 +00:00
Haris Rozajac	cfc5d96c34	Dashboard Schema V2: Fix panel query tab (#115276 ) fix panel query tab for v2 schema	2025-12-12 14:39:43 -07:00
Larissa Wandzura	3459c67bfb	DOCS: Overhaul Azure Monitor data source docs (#115121 ) * continued edits * authentication updates * added more info to configure doc * started work on query editor * reviewed the configure doc, consolidated sections * fixed issue with headings * fixed errors * updates to the template variables doc * created initial troubleshooting doc * removed gerunds and fixed heading issues * new annotations doc added * more updates to query editor * fixed spelling * fixed some linter issues * fixed flow for the intro doc * updates to the intro doc * fixed transformation links * added review date to front matter * ran prettier * added a new alerting doc * linter updates * some final edits * ran prettier again * Update docs/sources/datasources/azure-monitor/configure/index.md Co-authored-by: Andreas Christou <andreas.christou@grafana.com> * Update docs/sources/datasources/azure-monitor/configure/index.md Co-authored-by: Andreas Christou <andreas.christou@grafana.com> * Update docs/sources/datasources/azure-monitor/troubleshooting/index.md Co-authored-by: Andreas Christou <andreas.christou@grafana.com> * edits based on feedback * removed all relative reference links * ran prettier --------- Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	2025-12-12 21:10:03 +00:00
Larissa Wandzura	37ccd8bc3d	Docs: Added troubleshooting guide for the InfluxDB data source (#115191 ) * Docs: Add troubleshooting guide for InfluxDB data source * linter fixes, updates based on feedback	2025-12-12 20:21:50 +00:00
colin-stuart	5156177079	SCIM: show error if SCIM-provisioned user attempts login with non-SAML auth module (#115271 )	2025-12-12 13:51:37 -06:00
Paul Marbach	4817ecf6a3	Sparkline: Guess decimals rather than going with 0 (#115246 ) * Sparkline: Guess decimals rather than going with 0 * Update packages/grafana-ui/src/components/Sparkline/utils.test.ts	2025-12-12 13:59:54 -05:00
Renato Costa	c73cab8eef	chore: add cleanup task for duplicated provisioned dashboards (#115103 ) * chore: add cleanup task for duplicated provisioned dashboards	2025-12-12 13:56:47 -05:00
Adela Almasan	a37ebf609e	VizSuggestions: Fix unique key warning (#115112 )	2025-12-12 12:25:03 -06:00
Kristina Demeshchik	b29e8ccb45	Dashboards: Generate default tab title when converting rows with empty titles to tabs (#115256 ) Generate default title for empty row titles	2025-12-12 13:14:56 -05:00
Matias Chomicki	644f7b7001	Infinite scroll: Fix interaction with client-side filter (#115243 ) Infinite scroll: fix interaction with client-side filter	2025-12-12 18:59:49 +01:00
Alexander Zobnin	629570926d	Zanzana: Fix resource translation for dashboards (#115077 )	2025-12-12 11:05:10 -06:00
Will Assis	1b59c82b74	Revert "Unified-storage: sql backend key path backfill (#115033 )" (#115257 ) This reverts commit `b2dd095bd8`.	2025-12-12 17:00:08 +00:00
Matias Chomicki	f35447435f	LogLineContext: remove broken permalink prop (#115252 )	2025-12-12 16:24:36 +00:00
Paul Marbach	c0dc92e8cd	Gauge: Fit-and-finish tweaks to glows, text position, and sparkline size (#115173 ) * Gauge: Fit-and-finish tweaks to glows, text position, and sparkline size * adjust text height and positions a little more * cohesive no data handling * more tweaks * fix migration test * Fix JSON formatting by adding missing newline * remove new line	2025-12-12 11:10:56 -05:00
Matias Chomicki	7114b9cd3b	Log Line Details: Fix width calculation in dashboards (#115248 ) * FieldSelector: rename functions to be more explicit * LogDetailsContext: calculate width based on field selector visibility * LogLineDetails: Fix sidebar max width calculation * Update functions usage * Add regression and fix context calculation	2025-12-12 16:56:23 +01:00
Kristina Demeshchik	b40d0e6ff4	Dashboards: Fix accessible color palettes not being saved in v2 schema (#115244 ) * Fix palette color v2 conversion * v2->v1 conversion	2025-12-12 10:36:31 -05:00
Yunwen Zheng	584615cf3f	RecentlyViewedDashboards: Set up container on browsing dashboards page (#115164 ) * RecentlyViewedDashboards: Set up container on browsing dashboards page	2025-12-12 10:32:05 -05:00
William Wernert	5f80a29a28	Alerting: Prevent users from saving rules to git-synced folders (#114944 ) --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2025-12-12 15:25:08 +00:00
Bogdan Matei	eab5d2b30e	Dashboard: Fix rogue modal when exiting edit mode (#115240 ) * Dashboard: Fix rogue modal when exiting edit mode * Remove unnecessary change	2025-12-12 17:17:34 +02:00
Anna Urbiztondo	f3421b9718	Docs: Git Sync scenarios (#115199 ) * WIP * Review * Move scenarions * Structure fix * Edits, fix * Vale, x-refs * Feedback, tweaks * Consolidate HA, titles * Prettier * Prettier * Adding missing content * Minor edits * Links * Prettier	2025-12-12 16:08:28 +01:00
Alex Khomenko	1addfd69b4	Provisioning: Fix duplicated breadcrumb (#115234 ) * Provisioning: Fix duplicated breadcrumb * translations	2025-12-12 15:00:40 +00:00
Gonzalo Trigueros Manzanas	d4a627c5fc	Provisioning: Add resource-level warning support. (#115023 )	2025-12-12 15:59:45 +01:00
Johnny Kartheiser	46ef9aaa0a	Alerting docs: Links fix (#115044 ) * alerting docs: links fix fixes 404 errors * Alerting docs: Fix Slack integration links Fixes Slack links and clarifies the first two steps. * prettier	2025-12-12 08:58:10 -06:00
Serge Zaitsev	6ce672dd00	Chore: Fix mysql query for annotation migration (#115222 ) fix mysql query for annotation migration	2025-12-12 15:37:43 +01:00
Matheus Macabu	403f4d41de	APIServer: Add wiring for audit backend and policy rule evaluator (#115212 )	2025-12-12 15:17:44 +01:00
Juan Cabanas	6512259acc	DashboardLibrary: Restore New dashboard naming (#115184 )	2025-12-12 10:10:05 -03:00
Will Assis	b2dd095bd8	Unified-storage: sql backend key path backfill (#115033 ) * unified-storage: add migration to backfill key_path in resource_history	2025-12-12 08:09:51 -05:00
Charandas	e525b529a8	fix: Add panic for nil authorizer in installer (#115186 )	2025-12-12 05:01:03 -08:00
Paul Marbach	7805e18368	Sparkline: Export a class component for now (#115189 )	2025-12-12 07:56:31 -05:00
Levente Balogh	7a07a49ecc	Dashboard: Update toolbar layout (option 2.) (#115210 ) fix: dashboard toolbar layout updates	2025-12-12 12:22:04 +00:00
beejeebus	9a4e13800d	Guard config CRUD metrics so it's safe for grafana-enterprise Previous attempt to land this required this PR and a grafana-enterprise PR to land at the ~same time. This PR guards the use of `dsConfigHandlerRequestsDuration` with a nil check, and doesn't change any existing APIs, so we can land it without any timing issues with grafana-enterprise. Once this has landed, we'll make a follow-up PR for grafana-enterprise.	2025-12-12 07:21:29 -05:00
Nathan Marrs	a0c4e8b4f4	Suggested Dashboards: Add missing loaded event tracking for v1 of feature (#115195 ) ## Summary Fixes a regression where the `loaded` analytics event was not being tracked for the `BasicProvisionedDashboardsEmptyPage` component, which is the component shown in production when the `suggestedDashboards` feature toggle is disabled (i.e. community dashboards disabled but v1 of feature enabled) ## Problem Regression introduced by https://github.com/grafana/grafana/pull/112808/changes#diff-3a19d2e887a3344cb0bcd2449b570bd50a7d78d1d473f4a3cf623f9fe40f35fc adding community dashboard support to `SuggestedDashboards`, the `BasicProvisionedDashboardsEmptyPage` component was missing the `loaded` event tracking. Component is mounted here: https://github.com/grafana/grafana/pull/112808/changes#diff-fba79ed6f8bfb5f712bdd529155158977a3e081d1d6a5932a5fa90fb57a243e6R82. This caused analytics discrepancies where in the past 7 days (note: issue has been present for last several weeks but here is sample of data from previous week): - 106 provisioned dashboard items were clicked - Only 1 `loaded` event was received (from `SuggestedDashboards` when the feature toggle is enabled) - The `loaded` events are missing for the production v1 flow (when `suggestedDashboards` feature toggle is off) ## Root Cause The `BasicProvisionedDashboardsEmptyPage` component (used in v1 flow in production) was never updated with the `loaded` event tracking that was added to `SuggestedDashboards` in PR #113417. Since the `suggestedDashboards` feature toggle is not enabled in production, users were seeing `BasicProvisionedDashboardsEmptyPage` which had no tracking, resulting in missing analytics events. ## Solution Added the `loaded` event tracking to `BasicProvisionedDashboardsEmptyPage` using the same approach that was previously used (tracking inside the async callback when dashboards are loaded). This ensures consistency with the existing pattern and restores analytics tracking for the production flow. ## Changes - Added `DashboardLibraryInteractions.loaded()` call in `BasicProvisionedDashboardsEmptyPage` when dashboards are successfully loaded - Uses the same tracking pattern as the original implementation (tracking inside async callback) - Matches the event structure used in `SuggestedDashboards` for consistency ## Testing - Verified that `loaded` events are now tracked when `BasicProvisionedDashboardsEmptyPage` loads dashboards - Confirmed the event includes correct `contentKinds`, `datasourceTypes`, and `eventLocation` values - No duplicate events are sent (tracking only occurs once per load) ## Related - Original analytics implementation: #113417 - Related PR: #112808 - Component: [`BasicProvisionedDashboardsEmptyPage.tsx`](https://github.com/grafana/grafana/blob/main/public/app/features/dashboard/dashgrid/DashboardLibrary/BasicProvisionedDashboardsEmptyPage.tsx)	2025-12-12 09:16:55 -03:00
Victor Marin	fa62113b41	Dashboards: Fix custom variable legacy model to return options when flag is set (#115154 ) * fix custom var legacy model options property * add test	2025-12-12 12:12:46 +00:00
Roberto Jiménez Sánchez	b863acab05	Provisioning: Fix race condition causing unhealthy repository message to be lost (#115150 ) * Fix race condition causing unhealthy repository message to be lost This commit fixes a race condition in the provisioning repository controller where the "Repository is unhealthy" message in the sync status could be lost due to status updates being based on stale repository objects. ## Problem The issue occurred in the `process` function when: 1. Repository object was fetched from cache with old status 2. `RefreshHealth` immediately patched the health status to "unhealthy" 3. `determineSyncStatusOps` used the stale object to check if unhealthy message was already set 4. A second patch operation based on stale data would overwrite the health status update ## Solution Introduced `RefreshHealthWithPatchOps` method that returns patch operations instead of immediately applying them. This allows batching all status updates (health + sync) into a single atomic patch operation, eliminating the race condition. ## Changes - Added `HealthCheckerInterface` for better testability - Added `RefreshHealthWithPatchOps` method to return patch ops without applying - Updated `process` function to batch health and sync status updates - Added comprehensive unit tests for the fix Fixes the issue where unhealthy repositories don't show the "Repository is unhealthy" message in their sync status. * Fix staticcheck lint error: remove unnecessary nil check for slice	2025-12-12 13:24:58 +02:00
Ezequiel Victorero	c7c052480d	Chore: Bump grafana/llm 1.0.1 (#115175 )	2025-12-12 11:22:37 +00:00
Gabriel MABILLE	478ae15f0e	`grafana-iam`: Use parent folder to authorize `ResourcePermissions` (#115008 ) * `grafana-iam`: Fetch target parent folder * WIP add different ParentProviders * Add version * Move code to a different file * Instantiate resourceParentProvider * same import name * imports * Add tests * Remove unecessary test * forgot wire * WIP integration tests * Add test to cover list * Fix caching problem in integration tests * comments * Logger and comments * Add lazy creation and caching * Instantiate clients only once * Rerun wire gen	2025-12-12 11:43:12 +01:00
Erik Sundell	8ebb1c2bc9	NPM: Remove dist-tag code (#115209 ) remove dist-tag	2025-12-12 11:41:57 +01:00
Marc M.	5572ce966a	DynamicDashboards: Hide variables from outline in view mode (#115142 )	2025-12-12 10:34:47 +00:00
Marc M.	e3510f6eb3	DynamicDashboards: Replace discard changes modal (#114789 )	2025-12-12 11:24:53 +01:00
Isabel Matwawana	ed5644be67	Fixed typo	2025-12-09 17:45:43 -05:00
Isabel Matwawana	5a5ff06fbc	Updated resource v1 section	2025-12-09 17:43:03 -05:00
Isabel Matwawana	824b2edb44	Updated differences and schema v2 section and moved schema v1 and v1 resource sections	2025-12-09 17:22:17 -05:00
Isabel Matwawana	12b26c4366	Updated access json section and added more aliases	2025-12-09 16:28:06 -05:00
Isabel Matwawana	911d2e48fc	Moved content from schema v2 page and deleted folder and index file	2025-12-09 16:04:01 -05:00
Isabel Matwawana	b9fcd914e5	Copied aliases and deleted pages	2025-12-09 16:00:52 -05:00
Isabel Matwawana	36e2bd34b2	Added new page sections	2025-12-09 15:30:41 -05:00
Isabel Matwawana	520d175f0c	Added aliases	2025-12-09 15:27:56 -05:00