Merge remote-tracking branch 'origin/main' into cleanup/deprecate-legacy-storage-migration-in-provisioning

Dockerfile

@@ -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.22.2 AS alpine-base
+FROM alpine:3.23.0 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

apps/dashboard/go.mod

@@ -57,6 +57,7 @@ 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

apps/dashboard/go.sum

@@ -112,6 +112,8 @@ 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=

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

@@ -0,0 +1,454 @@
+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")
+}

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

@@ -829,7 +829,7 @@ func TestDataLossDetectionOnAllInputFiles(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := testutil.NewDataSourceProvider(testutil.StandardTestConfig)
 	leProvider := testutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()

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

@@ -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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 			// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// 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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	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.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("verify all log fields are present", func(t *testing.T) {
 		// Test that the conversion wrapper includes all expected structured fields

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

@@ -20,7 +20,7 @@ func TestV0ConversionErrorHandling(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	tests := []struct {
 		name            string
@@ -132,7 +132,7 @@ func TestV0ConversionErrorPropagation(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("ConvertDashboard_V0_to_V1beta1 returns error on migration failure", func(t *testing.T) {
 		source := &dashv0.Dashboard{
@@ -206,7 +206,7 @@ func TestV0ConversionSuccessPaths(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("Convert_V0_to_V1beta1 success path returns nil", func(t *testing.T) {
 		source := &dashv0.Dashboard{
@@ -275,7 +275,7 @@ func TestV0ConversionSecondStepErrors(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("Convert_V0_to_V2alpha1 sets status on first step error", func(t *testing.T) {
 		// Create a dashboard that will fail v0->v1beta1 conversion

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

@@ -19,7 +19,7 @@ func TestV1ConversionErrorHandling(t *testing.T) {
 	// Initialize the migrator with a test data source provider
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("Convert_V1beta1_to_V2alpha1 sets status on conversion error", func(t *testing.T) {
 		// Create a dashboard that will cause conversion to fail

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

@@ -19,7 +19,7 @@ func TestV1beta1ToV2alpha1(t *testing.T) {
 	// Initialize the migrator with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()

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

@@ -18,7 +18,7 @@ func TestV2alpha1ConversionErrorHandling(t *testing.T) {
 	// Initialize the migrator with test data source and library element providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("Convert_V2alpha1_to_V1beta1 sets status on conversion", func(t *testing.T) {
 		// Create a dashboard for conversion
@@ -90,7 +90,7 @@ func TestV2beta1ConversionErrorHandling(t *testing.T) {
 	// Initialize the migrator with test data source and library element providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	t.Run("Convert_V2beta1_to_V1beta1 sets status on first step failure", func(t *testing.T) {
 		// Create a dashboard that might cause conversion to fail on first step (v2beta1 -> v2alpha1)

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

@@ -282,7 +282,7 @@ func TestV2alpha1ToV1beta1LayoutErrors(t *testing.T) {
 	// Initialize the migrator with test data source and library element providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()
@@ -498,7 +498,7 @@ func TestV2alpha1ToV1beta1BasicFields(t *testing.T) {
 	// Initialize the migrator with test data source and library element providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()

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

@@ -18,7 +18,7 @@ func TestV2alpha1ToV2beta1(t *testing.T) {
 	// Initialize the migrator with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()

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

@@ -24,7 +24,7 @@ func TestV2beta1ToV2alpha1RoundTrip(t *testing.T) {
 	// Initialize the migrator with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()
@@ -107,7 +107,7 @@ func TestV2beta1ToV2alpha1FromOutputFiles(t *testing.T) {
 	// Initialize the migrator with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()
@@ -193,7 +193,7 @@ func TestV2beta1ToV2alpha1(t *testing.T) {
 	// Initialize the migrator with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	migration.Initialize(dsProvider, leProvider)
+	migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
 
 	// Set up conversion scheme
 	scheme := runtime.NewScheme()

apps/dashboard/pkg/migration/migrate.go

@@ -4,13 +4,19 @@ import (
 	"context"
 	"fmt"
 	"sync"
+	"time"
 
+	"github.com/grafana/authlib/types"
+	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 )
 
+// DefaultCacheTTL is the default TTL for the datasource and library element caches.
+const DefaultCacheTTL = time.Minute
+
 // Initialize provides the migrator singleton with required dependencies and builds the map of migrations.
-func Initialize(dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider) {
-	migratorInstance.init(dsIndexProvider, leIndexProvider)
+func Initialize(dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider, cacheTTL time.Duration) {
+	migratorInstance.init(dsIndexProvider, leIndexProvider, cacheTTL)
 }
 
 // GetDataSourceIndexProvider returns the datasource index provider instance that was initialized.
@@ -38,6 +44,34 @@ func ResetForTesting() {
 	initOnce = sync.Once{}
 }
 
+// PreloadCache preloads the datasource and library element caches for the given namespaces.
+func PreloadCache(ctx context.Context, nsInfos []types.NamespaceInfo) {
+	// Wait for initialization to complete
+	<-migratorInstance.ready
+
+	// Try to preload datasource cache
+	if preloadable, ok := migratorInstance.dsIndexProvider.(schemaversion.PreloadableCache); ok {
+		preloadable.Preload(ctx, nsInfos)
+	}
+
+	// Try to preload library element cache
+	if preloadable, ok := migratorInstance.leIndexProvider.(schemaversion.PreloadableCache); ok {
+		preloadable.Preload(ctx, nsInfos)
+	}
+}
+
+// PreloadCacheInBackground starts a goroutine that preloads the caches for the given namespaces.
+func PreloadCacheInBackground(nsInfos []types.NamespaceInfo) {
+	go func() {
+		defer func() {
+			if r := recover(); r != nil {
+				logging.DefaultLogger.Error("panic during cache preloading", "error", r)
+			}
+		}()
+		PreloadCache(context.Background(), nsInfos)
+	}()
+}
+
 // Migrate migrates the given dashboard to the target version.
 // This will block until the migrator is initialized.
 func Migrate(ctx context.Context, dash map[string]interface{}, targetVersion int) error {
@@ -59,14 +93,14 @@ type migrator struct {
 	leIndexProvider schemaversion.LibraryElementIndexProvider
 }
 
-func (m *migrator) init(dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider) {
+func (m *migrator) init(dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider, cacheTTL time.Duration) {
 	initOnce.Do(func() {
-		// Wrap the provider once with 10s caching for all conversions.
+		// Wrap the provider with org-aware TTL caching for all conversions.
 		// This prevents repeated DB queries across multiple conversion calls while allowing
 		// the cache to refresh periodically, making it suitable for long-lived singleton usage.
-		m.dsIndexProvider = schemaversion.WrapIndexProviderWithCache(dsIndexProvider)
+		m.dsIndexProvider = schemaversion.WrapIndexProviderWithCache(dsIndexProvider, cacheTTL)
 		// Wrap library element provider with caching as well
-		m.leIndexProvider = schemaversion.WrapLibraryElementProviderWithCache(leIndexProvider)
+		m.leIndexProvider = schemaversion.WrapLibraryElementProviderWithCache(leIndexProvider, cacheTTL)
 		m.migrations = schemaversion.GetMigrations(m.dsIndexProvider, m.leIndexProvider)
 		close(m.ready)
 	})

apps/dashboard/pkg/migration/migrate_test.go

@@ -10,10 +10,13 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"testing"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"k8s.io/apiserver/pkg/endpoints/request"
 
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 	migrationtestutil "github.com/grafana/grafana/apps/dashboard/pkg/migration/testutil"
@@ -31,7 +34,7 @@ func TestMigrate(t *testing.T) {
 	ResetForTesting()
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	Initialize(dsProvider, leProvider)
+	Initialize(dsProvider, leProvider, DefaultCacheTTL)
 
 	t.Run("minimum version check", func(t *testing.T) {
 		err := Migrate(context.Background(), map[string]interface{}{
@@ -49,7 +52,7 @@ func TestMigrateSingleVersion(t *testing.T) {
 	// Use the same datasource provider as the frontend test to ensure consistency
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	Initialize(dsProvider, leProvider)
+	Initialize(dsProvider, leProvider, DefaultCacheTTL)
 
 	runSingleVersionMigrationTests(t, SINGLE_VERSION_OUTPUT_DIR)
 }
@@ -218,7 +221,7 @@ func TestSchemaMigrationMetrics(t *testing.T) {
 	// Initialize migration with test providers
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	Initialize(dsProvider, leProvider)
+	Initialize(dsProvider, leProvider, DefaultCacheTTL)
 
 	// Create a test registry for metrics
 	registry := prometheus.NewRegistry()
@@ -304,7 +307,7 @@ func TestSchemaMigrationMetrics(t *testing.T) {
 func TestSchemaMigrationLogging(t *testing.T) {
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	Initialize(dsProvider, leProvider)
+	Initialize(dsProvider, leProvider, DefaultCacheTTL)
 
 	tests := []struct {
 		name           string
@@ -423,7 +426,7 @@ func TestMigrateDevDashboards(t *testing.T) {
 	ResetForTesting()
 	dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.DevDashboardConfig)
 	leProvider := migrationtestutil.NewLibraryElementProvider()
-	Initialize(dsProvider, leProvider)
+	Initialize(dsProvider, leProvider, DefaultCacheTTL)
 
 	runDevDashboardMigrationTests(t, schemaversion.LATEST_VERSION, DEV_DASHBOARDS_OUTPUT_DIR)
 }
@@ -449,3 +452,232 @@ func runDevDashboardMigrationTests(t *testing.T, targetVersion int, outputDir st
 		})
 	}
 }
+
+func TestMigrateWithCache(t *testing.T) {
+	// Reset the migration singleton before each test
+	ResetForTesting()
+	datasources := []schemaversion.DataSourceInfo{
+		{UID: "ds-uid-1", Type: "prometheus", Name: "Prometheus", Default: true, APIVersion: "v1"},
+		{UID: "ds-uid-2", Type: "loki", Name: "Loki", Default: false, APIVersion: "v1"},
+		{UID: "ds-uid-3", Type: "prometheus", Name: "Prometheus 2", Default: false, APIVersion: "v1"},
+	}
+
+	// Create a dashboard at schema version 32 for V33 and V36 migration with datasource references
+	dashboard1 := map[string]interface{}{
+		"schemaVersion": 32,
+		"title":         "Test Dashboard 1",
+		"panels": []interface{}{
+			map[string]interface{}{
+				"id":   1,
+				"type": "timeseries",
+				// String datasource that V33 will migrate to object reference
+				"datasource": "Prometheus",
+				"targets": []interface{}{
+					map[string]interface{}{
+						"refId":      "A",
+						"datasource": "Loki",
+					},
+				},
+			},
+		},
+	}
+
+	// Create a dashboard at schema version 35 for testing V36 migration with datasource references in annotations
+	dashboard2 := map[string]interface{}{
+		"schemaVersion": 35,
+		"title":         "Test Dashboard 2",
+		"annotations": map[string]interface{}{
+			"list": []interface{}{
+				map[string]interface{}{
+					"name":       "Test Annotation",
+					"datasource": "Prometheus 2", // String reference that V36 should convert
+					"enable":     true,
+				},
+			},
+		},
+	}
+
+	t.Run("with datasources", func(t *testing.T) {
+		ResetForTesting()
+		dsProvider := newCountingProvider(datasources)
+		leProvider := newCountingLibraryProvider(nil)
+		// Initialize the migration system with our counting providers
+		Initialize(dsProvider, leProvider, DefaultCacheTTL)
+		// Verify initial call count is zero
+		assert.Equal(t, dsProvider.GetCallCount(), int64(0))
+		// Create a context with namespace (required for caching)
+		ctx := request.WithNamespace(context.Background(), "default")
+
+		// First migration - should invoke the provider once to build the cache
+		dash1 := deepCopyDashboard(dashboard1)
+		err := Migrate(ctx, dash1, schemaversion.LATEST_VERSION)
+		require.NoError(t, err)
+		assert.Equal(t, int64(1), dsProvider.GetCallCount())
+
+		// Verify datasource conversion from string to object reference
+		panels := dash1["panels"].([]interface{})
+		panel := panels[0].(map[string]interface{})
+		panelDS, ok := panel["datasource"].(map[string]interface{})
+		require.True(t, ok, "panel datasource should be converted to object")
+		assert.Equal(t, "ds-uid-1", panelDS["uid"])
+		assert.Equal(t, "prometheus", panelDS["type"])
+
+		// Verify target datasource conversion
+		targets := panel["targets"].([]interface{})
+		target := targets[0].(map[string]interface{})
+		targetDS, ok := target["datasource"].(map[string]interface{})
+		require.True(t, ok, "target datasource should be converted to object")
+		assert.Equal(t, "ds-uid-2", targetDS["uid"])
+		assert.Equal(t, "loki", targetDS["type"])
+
+		// Migration with V35 dashboard - should use the cached index from first migration
+		dash2 := deepCopyDashboard(dashboard2)
+		err = Migrate(ctx, dash2, schemaversion.LATEST_VERSION)
+		require.NoError(t, err, "second migration should succeed")
+		assert.Equal(t, int64(1), dsProvider.GetCallCount())
+
+		// Verify the annotation datasource was converted to object reference
+		annotations := dash2["annotations"].(map[string]interface{})
+		list := annotations["list"].([]interface{})
+		var testAnnotation map[string]interface{}
+		for _, a := range list {
+			ann := a.(map[string]interface{})
+			if ann["name"] == "Test Annotation" {
+				testAnnotation = ann
+				break
+			}
+		}
+		require.NotNil(t, testAnnotation, "Test Annotation should exist")
+		annotationDS, ok := testAnnotation["datasource"].(map[string]interface{})
+		require.True(t, ok, "annotation datasource should be converted to object")
+		assert.Equal(t, "ds-uid-3", annotationDS["uid"])
+		assert.Equal(t, "prometheus", annotationDS["type"])
+	})
+
+	// tests that cache isolates data per namespace
+	t.Run("with multiple orgs", func(t *testing.T) {
+		// Reset the migration singleton
+		ResetForTesting()
+		dsProvider := newCountingProvider(datasources)
+		leProvider := newCountingLibraryProvider(nil)
+		Initialize(dsProvider, leProvider, DefaultCacheTTL)
+		// Create contexts for different orgs with proper namespace format (org-ID)
+		ctx1 := request.WithNamespace(context.Background(), "default")  // org 1
+		ctx2 := request.WithNamespace(context.Background(), "stacks-2") // stack 2
+
+		// Migrate for org 1
+		err := Migrate(ctx1, deepCopyDashboard(dashboard1), schemaversion.LATEST_VERSION)
+		require.NoError(t, err)
+		callsAfterOrg1 := dsProvider.GetCallCount()
+
+		// Migrate for org 2 - should build separate cache
+		err = Migrate(ctx2, deepCopyDashboard(dashboard2), schemaversion.LATEST_VERSION)
+		require.NoError(t, err)
+		callsAfterOrg2 := dsProvider.GetCallCount()
+
+		assert.Greater(t, callsAfterOrg2, callsAfterOrg1,
+			"org 2 migration should have called provider (separate cache)")
+
+		// Migrate again for org 1 - should use cache
+		err = Migrate(ctx1, deepCopyDashboard(dashboard1), schemaversion.LATEST_VERSION)
+		require.NoError(t, err)
+		callsAfterOrg1Again := dsProvider.GetCallCount()
+		assert.Equal(t, callsAfterOrg2, callsAfterOrg1Again,
+			"second org 1 migration should use cache")
+
+		// Migrate again for org 2 - should use cache
+		err = Migrate(ctx2, deepCopyDashboard(dashboard1), schemaversion.LATEST_VERSION)
+		require.NoError(t, err)
+		callsAfterOrg2Again := dsProvider.GetCallCount()
+		assert.Equal(t, callsAfterOrg2, callsAfterOrg2Again,
+			"second org 2 migration should use cache")
+	})
+}
+
+// countingProvider wraps a datasource provider and counts calls to Index()
+type countingProvider struct {
+	datasources []schemaversion.DataSourceInfo
+	callCount   atomic.Int64
+}
+
+func newCountingProvider(datasources []schemaversion.DataSourceInfo) *countingProvider {
+	return &countingProvider{
+		datasources: datasources,
+	}
+}
+
+func (p *countingProvider) Index(_ context.Context) *schemaversion.DatasourceIndex {
+	p.callCount.Add(1)
+	return schemaversion.NewDatasourceIndex(p.datasources)
+}
+
+func (p *countingProvider) GetCallCount() int64 {
+	return p.callCount.Load()
+}
+
+// countingLibraryProvider wraps a library element provider and counts calls
+type countingLibraryProvider struct {
+	elements  []schemaversion.LibraryElementInfo
+	callCount atomic.Int64
+}
+
+func newCountingLibraryProvider(elements []schemaversion.LibraryElementInfo) *countingLibraryProvider {
+	return &countingLibraryProvider{
+		elements: elements,
+	}
+}
+
+func (p *countingLibraryProvider) GetLibraryElementInfo(_ context.Context) []schemaversion.LibraryElementInfo {
+	p.callCount.Add(1)
+	return p.elements
+}
+
+func (p *countingLibraryProvider) GetCallCount() int64 {
+	return p.callCount.Load()
+}
+
+// deepCopyDashboard creates a deep copy of a dashboard map
+func deepCopyDashboard(dash map[string]interface{}) map[string]interface{} {
+	cpy := make(map[string]interface{})
+	for k, v := range dash {
+		switch val := v.(type) {
+		case []interface{}:
+			cpy[k] = deepCopySlice(val)
+		case map[string]interface{}:
+			cpy[k] = deepCopyMapForCache(val)
+		default:
+			cpy[k] = v
+		}
+	}
+	return cpy
+}
+
+func deepCopySlice(s []interface{}) []interface{} {
+	cpy := make([]interface{}, len(s))
+	for i, v := range s {
+		switch val := v.(type) {
+		case []interface{}:
+			cpy[i] = deepCopySlice(val)
+		case map[string]interface{}:
+			cpy[i] = deepCopyMapForCache(val)
+		default:
+			cpy[i] = v
+		}
+	}
+	return cpy
+}
+
+func deepCopyMapForCache(m map[string]interface{}) map[string]interface{} {
+	cpy := make(map[string]interface{})
+	for k, v := range m {
+		switch val := v.(type) {
+		case []interface{}:
+			cpy[k] = deepCopySlice(val)
+		case map[string]interface{}:
+			cpy[k] = deepCopyMapForCache(val)
+		default:
+			cpy[k] = v
+		}
+	}
+	return cpy
+}

apps/dashboard/pkg/migration/schemaversion/cache.go

@@ -0,0 +1,104 @@
+package schemaversion
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"github.com/grafana/authlib/types"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/hashicorp/golang-lru/v2/expirable"
+	k8srequest "k8s.io/apiserver/pkg/endpoints/request"
+
+	"github.com/grafana/grafana/pkg/services/apiserver/endpoints/request"
+)
+
+const defaultCacheSize = 1000
+
+// CacheProvider is a generic cache interface for schema version providers.
+type CacheProvider[T any] interface {
+	// Get returns the cached value if it's still valid, otherwise calls fetch and caches the result.
+	Get(ctx context.Context) T
+}
+
+// PreloadableCache is an interface for providers that support preloading the cache.
+type PreloadableCache interface {
+	// Preload loads data into the cache for the given namespaces.
+	Preload(ctx context.Context, nsInfos []types.NamespaceInfo)
+}
+
+// cachedProvider is a thread-safe TTL cache that wraps any fetch function.
+type cachedProvider[T any] struct {
+	fetch    func(context.Context) T
+	cache    *expirable.LRU[string, T] // LRU cache: namespace to cache entry
+	inFlight sync.Map                  // map[string]*sync.Mutex - per-namespace fetch locks
+	logger   log.Logger
+}
+
+// newCachedProvider creates a new cachedProvider.
+// The fetch function should be able to handle context with different namespaces.
+// A non-positive size turns LRU mechanism off (cache of unlimited size).
+// A non-positive cacheTTL disables TTL expiration.
+func newCachedProvider[T any](fetch func(context.Context) T, size int, cacheTTL time.Duration, logger log.Logger) *cachedProvider[T] {
+	cacheProvider := &cachedProvider[T]{
+		fetch:  fetch,
+		logger: logger,
+	}
+	cacheProvider.cache = expirable.NewLRU(size, func(key string, value T) {
+		cacheProvider.inFlight.Delete(key)
+	}, cacheTTL)
+	return cacheProvider
+}
+
+// Get returns the cached value if it's still valid, otherwise calls fetch and caches the result.
+func (p *cachedProvider[T]) Get(ctx context.Context) T {
+	// Get namespace info from ctx
+	nsInfo, err := request.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		// No namespace, fall back to direct fetch call without caching
+		p.logger.Warn("Unable to get namespace info from context, skipping cache", "error", err)
+		return p.fetch(ctx)
+	}
+
+	namespace := nsInfo.Value
+	// Fast path: check if cache is still valid
+	if entry, ok := p.cache.Get(namespace); ok {
+		return entry
+	}
+
+	// Get or create a per-namespace lock for this fetch operation
+	// This ensures only one fetch happens per namespace at a time
+	lockInterface, _ := p.inFlight.LoadOrStore(namespace, &sync.Mutex{})
+	nsMutex := lockInterface.(*sync.Mutex)
+
+	// Lock this specific namespace - other namespaces can still proceed
+	nsMutex.Lock()
+	defer nsMutex.Unlock()
+
+	// Double-check: another goroutine might have already fetched while we waited
+	if entry, ok := p.cache.Get(namespace); ok {
+		return entry
+	}
+
+	// Fetch outside the main lock - only this namespace is blocked
+	p.logger.Debug("cache miss or expired, fetching new value", "namespace", namespace)
+	value := p.fetch(ctx)
+
+	// Update the cache for this namespace
+	p.cache.Add(namespace, value)
+
+	return value
+}
+
+// Preload loads data into the cache for the given namespaces.
+func (p *cachedProvider[T]) Preload(ctx context.Context, nsInfos []types.NamespaceInfo) {
+	// Build the cache using a context with the namespace
+	p.logger.Info("preloading cache", "nsInfos", len(nsInfos))
+	startedAt := time.Now()
+	defer func() {
+		p.logger.Info("finished preloading cache", "nsInfos", len(nsInfos), "elapsed", time.Since(startedAt))
+	}()
+	for _, nsInfo := range nsInfos {
+		p.cache.Add(nsInfo.Value, p.fetch(k8srequest.WithNamespace(ctx, nsInfo.Value)))
+	}
+}

apps/dashboard/pkg/migration/schemaversion/cache_test.go

@@ -0,0 +1,478 @@
+package schemaversion
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	authlib "github.com/grafana/authlib/types"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apiserver/pkg/endpoints/request"
+)
+
+// testProvider tracks how many times get() is called
+type testProvider struct {
+	testData  any
+	callCount atomic.Int64
+}
+
+func newTestProvider(testData any) *testProvider {
+	return &testProvider{
+		testData: testData,
+	}
+}
+
+func (p *testProvider) get(_ context.Context) any {
+	p.callCount.Add(1)
+	return p.testData
+}
+
+func (p *testProvider) getCallCount() int64 {
+	return p.callCount.Load()
+}
+
+func TestCachedProvider_CacheHit(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+		{UID: "ds2", Type: "loki", Name: "Loki"},
+	}
+
+	underlying := newTestProvider(datasources)
+	// Test newCachedProvider directly instead of the wrapper
+	cached := newCachedProvider(underlying.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Use "default" namespace (org 1) - this is the standard Grafana namespace format
+	ctx := request.WithNamespace(context.Background(), "default")
+
+	// First call should hit the underlying provider
+	idx1 := cached.Get(ctx)
+	require.NotNil(t, idx1)
+	assert.Equal(t, int64(1), underlying.getCallCount(), "first call should invoke underlying provider")
+
+	// Second call should use cache
+	idx2 := cached.Get(ctx)
+	require.NotNil(t, idx2)
+	assert.Equal(t, int64(1), underlying.getCallCount(), "second call should use cache, not invoke underlying provider")
+
+	// Both should return the same data
+	assert.Equal(t, idx1, idx2)
+}
+
+func TestCachedProvider_NamespaceIsolation(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+	}
+
+	underlying := newTestProvider(datasources)
+	cached := newCachedProvider(underlying.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Use "default" (org 1) and "org-2" (org 2) - standard Grafana namespace formats
+	ctx1 := request.WithNamespace(context.Background(), "default")
+	ctx2 := request.WithNamespace(context.Background(), "org-2")
+
+	// First call for org 1
+	idx1 := cached.Get(ctx1)
+	require.NotNil(t, idx1)
+	assert.Equal(t, int64(1), underlying.getCallCount(), "first org-1 call should invoke underlying provider")
+
+	// Call for org 2 should also invoke underlying provider (different namespace)
+	idx2 := cached.Get(ctx2)
+	require.NotNil(t, idx2)
+	assert.Equal(t, int64(2), underlying.getCallCount(), "org-2 call should invoke underlying provider (separate cache)")
+
+	// Second call for org 1 should use cache
+	idx3 := cached.Get(ctx1)
+	require.NotNil(t, idx3)
+	assert.Equal(t, int64(2), underlying.getCallCount(), "second org-1 call should use cache")
+
+	// Second call for org 2 should use cache
+	idx4 := cached.Get(ctx2)
+	require.NotNil(t, idx4)
+	assert.Equal(t, int64(2), underlying.getCallCount(), "second org-2 call should use cache")
+}
+
+func TestCachedProvider_NoNamespaceFallback(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+	}
+
+	underlying := newTestProvider(datasources)
+	cached := newCachedProvider(underlying.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Context without namespace - should fall back to direct provider call
+	ctx := context.Background()
+
+	idx1 := cached.Get(ctx)
+	require.NotNil(t, idx1)
+	assert.Equal(t, int64(1), underlying.getCallCount())
+
+	// Second call without namespace should also invoke underlying (no caching for unknown namespace)
+	idx2 := cached.Get(ctx)
+	require.NotNil(t, idx2)
+	assert.Equal(t, int64(2), underlying.getCallCount(), "without namespace, each call should invoke underlying provider")
+}
+
+func TestCachedProvider_ConcurrentAccess(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+	}
+
+	underlying := newTestProvider(datasources)
+	cached := newCachedProvider(underlying.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Use "default" namespace (org 1)
+	ctx := request.WithNamespace(context.Background(), "default")
+
+	var wg sync.WaitGroup
+	numGoroutines := 100
+
+	// Launch many goroutines that all try to access the cache simultaneously
+	for i := 0; i < numGoroutines; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			idx := cached.Get(ctx)
+			require.NotNil(t, idx)
+		}()
+	}
+
+	wg.Wait()
+
+	// Due to double-check locking, only 1 goroutine should have actually built the cache
+	// In practice, there might be a few more due to timing, but it should be much less than numGoroutines
+	callCount := underlying.getCallCount()
+	assert.LessOrEqual(t, callCount, int64(5), "with proper locking, very few goroutines should invoke underlying provider; got %d", callCount)
+}
+
+func TestCachedProvider_ConcurrentNamespaces(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+	}
+
+	underlying := newTestProvider(datasources)
+	cached := newCachedProvider(underlying.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	var wg sync.WaitGroup
+	numOrgs := 10
+	callsPerOrg := 20
+
+	// Launch goroutines for multiple namespaces
+	// Use valid namespace formats: "default" for org 1, "org-N" for N > 1
+	namespaces := make([]string, numOrgs)
+	namespaces[0] = "default"
+	for i := 1; i < numOrgs; i++ {
+		namespaces[i] = fmt.Sprintf("org-%d", i+1)
+	}
+
+	for _, ns := range namespaces {
+		ctx := request.WithNamespace(context.Background(), ns)
+		for i := 0; i < callsPerOrg; i++ {
+			wg.Add(1)
+			go func(ctx context.Context) {
+				defer wg.Done()
+				idx := cached.Get(ctx)
+				require.NotNil(t, idx)
+			}(ctx)
+		}
+	}
+
+	wg.Wait()
+
+	// Each org should have at most a few calls (ideally 1, but timing can cause a few more)
+	callCount := underlying.getCallCount()
+	// With 10 orgs, we expect around 10 calls (one per org)
+	assert.LessOrEqual(t, callCount, int64(numOrgs), "expected roughly one call per org, got %d calls for %d orgs", callCount, numOrgs)
+}
+
+// Test that cache returns correct data for each namespace
+func TestCachedProvider_CorrectDataPerNamespace(t *testing.T) {
+	// Provider that returns different data based on namespace
+	underlying := &namespaceAwareProvider{
+		datasourcesByNamespace: map[string][]DataSourceInfo{
+			"default": {{UID: "org1-ds", Type: "prometheus", Name: "Org1 DS", Default: true}},
+			"org-2":   {{UID: "org2-ds", Type: "loki", Name: "Org2 DS", Default: true}},
+		},
+	}
+	cached := newCachedProvider(underlying.Index, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Use valid namespace formats
+	ctx1 := request.WithNamespace(context.Background(), "default")
+	ctx2 := request.WithNamespace(context.Background(), "org-2")
+
+	idx1 := cached.Get(ctx1)
+	idx2 := cached.Get(ctx2)
+
+	assert.Equal(t, "org1-ds", idx1.GetDefault().UID, "org 1 should get org-1 datasources")
+	assert.Equal(t, "org2-ds", idx2.GetDefault().UID, "org 2 should get org-2 datasources")
+
+	// Subsequent calls should still return correct data
+	idx1Again := cached.Get(ctx1)
+	idx2Again := cached.Get(ctx2)
+
+	assert.Equal(t, "org1-ds", idx1Again.GetDefault().UID, "org 1 should still get org-1 datasources from cache")
+	assert.Equal(t, "org2-ds", idx2Again.GetDefault().UID, "org 2 should still get org-2 datasources from cache")
+}
+
+// TestCachedProvider_PreloadMultipleNamespaces verifies preloading multiple namespaces
+func TestCachedProvider_PreloadMultipleNamespaces(t *testing.T) {
+	// Provider that returns different data based on namespace
+	underlying := &namespaceAwareProvider{
+		datasourcesByNamespace: map[string][]DataSourceInfo{
+			"default": {{UID: "org1-ds", Type: "prometheus", Name: "Org1 DS", Default: true}},
+			"org-2":   {{UID: "org2-ds", Type: "loki", Name: "Org2 DS", Default: true}},
+			"org-3":   {{UID: "org3-ds", Type: "tempo", Name: "Org3 DS", Default: true}},
+		},
+	}
+	cached := newCachedProvider(underlying.Index, defaultCacheSize, time.Minute, log.New("test"))
+
+	// Preload multiple namespaces
+	nsInfos := []authlib.NamespaceInfo{
+		createNamespaceInfo(1, 0, "default"),
+		createNamespaceInfo(2, 0, "org-2"),
+		createNamespaceInfo(3, 0, "org-3"),
+	}
+	cached.Preload(context.Background(), nsInfos)
+
+	// After preload, the underlying provider should have been called once per namespace
+	assert.Equal(t, 3, underlying.callCount, "preload should call underlying provider once per namespace")
+
+	// Access all namespaces - should use preloaded data and get correct data per namespace
+	expectedUIDs := map[string]string{
+		"default": "org1-ds",
+		"org-2":   "org2-ds",
+		"org-3":   "org3-ds",
+	}
+
+	for _, ns := range []string{"default", "org-2", "org-3"} {
+		ctx := request.WithNamespace(context.Background(), ns)
+		idx := cached.Get(ctx)
+		require.NotNil(t, idx, "index for namespace %s should not be nil", ns)
+		assert.Equal(t, expectedUIDs[ns], idx.GetDefault().UID, "namespace %s should get correct datasource", ns)
+	}
+
+	// The underlying provider should still have been called only 3 times (from preload)
+	assert.Equal(t, 3, underlying.callCount,
+		"access after preload should use cached data for all namespaces")
+}
+
+// namespaceAwareProvider returns different datasources based on namespace
+type namespaceAwareProvider struct {
+	datasourcesByNamespace map[string][]DataSourceInfo
+	callCount              int
+}
+
+func (p *namespaceAwareProvider) Index(ctx context.Context) *DatasourceIndex {
+	p.callCount++
+	ns := request.NamespaceValue(ctx)
+	if ds, ok := p.datasourcesByNamespace[ns]; ok {
+		return NewDatasourceIndex(ds)
+	}
+	return NewDatasourceIndex(nil)
+}
+
+// createNamespaceInfo creates a NamespaceInfo for testing
+func createNamespaceInfo(orgID, stackID int64, value string) authlib.NamespaceInfo {
+	return authlib.NamespaceInfo{
+		OrgID:   orgID,
+		StackID: stackID,
+		Value:   value,
+	}
+}
+
+// Test DatasourceIndex functionality
+func TestDatasourceIndex_Lookup(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds-uid-1", Type: "prometheus", Name: "Prometheus DS", Default: true, APIVersion: "v1"},
+		{UID: "ds-uid-2", Type: "loki", Name: "Loki DS", Default: false, APIVersion: "v1"},
+	}
+	idx := NewDatasourceIndex(datasources)
+
+	t.Run("lookup by name", func(t *testing.T) {
+		ds := idx.Lookup("Prometheus DS")
+		require.NotNil(t, ds)
+		assert.Equal(t, "ds-uid-1", ds.UID)
+	})
+
+	t.Run("lookup by UID", func(t *testing.T) {
+		ds := idx.Lookup("ds-uid-2")
+		require.NotNil(t, ds)
+		assert.Equal(t, "Loki DS", ds.Name)
+	})
+
+	t.Run("lookup unknown returns nil", func(t *testing.T) {
+		ds := idx.Lookup("unknown")
+		assert.Nil(t, ds)
+	})
+
+	t.Run("get default", func(t *testing.T) {
+		ds := idx.GetDefault()
+		require.NotNil(t, ds)
+		assert.Equal(t, "ds-uid-1", ds.UID)
+	})
+
+	t.Run("lookup by UID directly", func(t *testing.T) {
+		ds := idx.LookupByUID("ds-uid-1")
+		require.NotNil(t, ds)
+		assert.Equal(t, "Prometheus DS", ds.Name)
+	})
+
+	t.Run("lookup by name directly", func(t *testing.T) {
+		ds := idx.LookupByName("Loki DS")
+		require.NotNil(t, ds)
+		assert.Equal(t, "ds-uid-2", ds.UID)
+	})
+}
+
+func TestDatasourceIndex_EmptyIndex(t *testing.T) {
+	idx := NewDatasourceIndex(nil)
+
+	assert.Nil(t, idx.GetDefault())
+	assert.Nil(t, idx.Lookup("anything"))
+	assert.Nil(t, idx.LookupByUID("anything"))
+	assert.Nil(t, idx.LookupByName("anything"))
+}
+
+// TestCachedProvider_TTLExpiration verifies that cache expires after TTL
+func TestCachedProvider_TTLExpiration(t *testing.T) {
+	datasources := []DataSourceInfo{
+		{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+	}
+
+	underlying := newTestProvider(datasources)
+	// Use a very short TTL for testing
+	shortTTL := 50 * time.Millisecond
+	cached := newCachedProvider(underlying.get, defaultCacheSize, shortTTL, log.New("test"))
+
+	ctx := request.WithNamespace(context.Background(), "default")
+
+	// First call - should call underlying provider
+	idx1 := cached.Get(ctx)
+	require.NotNil(t, idx1)
+	assert.Equal(t, int64(1), underlying.getCallCount(), "first call should invoke underlying provider")
+
+	// Second call immediately - should use cache
+	idx2 := cached.Get(ctx)
+	require.NotNil(t, idx2)
+	assert.Equal(t, int64(1), underlying.getCallCount(), "second call should use cache")
+
+	// Wait for TTL to expire
+	time.Sleep(shortTTL + 20*time.Millisecond)
+
+	// Third call after TTL - should call underlying provider again
+	idx3 := cached.Get(ctx)
+	require.NotNil(t, idx3)
+	assert.Equal(t, int64(2), underlying.getCallCount(),
+		"after TTL expiration, underlying provider should be called again")
+}
+
+// TestCachedProvider_ParallelNamespacesFetch verifies that different namespaces can fetch in parallel
+func TestCachedProvider_ParallelNamespacesFetch(t *testing.T) {
+	// Create a blocking provider that tracks concurrent executions
+	provider := &blockingProvider{
+		blockDuration: 100 * time.Millisecond,
+		datasources: []DataSourceInfo{
+			{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+		},
+	}
+	cached := newCachedProvider(provider.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	numNamespaces := 5
+	var wg sync.WaitGroup
+
+	// Launch fetches for different namespaces simultaneously
+	startTime := time.Now()
+	for i := 0; i < numNamespaces; i++ {
+		wg.Add(1)
+		namespace := fmt.Sprintf("org-%d", i+1)
+		go func(ns string) {
+			defer wg.Done()
+			ctx := request.WithNamespace(context.Background(), ns)
+			idx := cached.Get(ctx)
+			require.NotNil(t, idx)
+		}(namespace)
+	}
+	wg.Wait()
+	elapsed := time.Since(startTime)
+
+	// Verify that all namespaces were called
+	assert.Equal(t, int64(numNamespaces), provider.callCount.Load())
+
+	// Verify max concurrent executions shows parallelism
+	maxConcurrent := provider.maxConcurrent.Load()
+	assert.Equal(t, int64(numNamespaces), maxConcurrent)
+
+	// If all namespaces had to wait sequentially, it would take numNamespaces * blockDuration
+	// With parallelism, it should be much faster (close to just blockDuration)
+	sequentialTime := time.Duration(numNamespaces) * provider.blockDuration
+	assert.Less(t, elapsed, sequentialTime)
+}
+
+// TestCachedProvider_SameNamespaceSerialFetch verifies that the same namespace doesn't fetch concurrently
+func TestCachedProvider_SameNamespaceSerialFetch(t *testing.T) {
+	// Create a blocking provider that tracks concurrent executions
+	provider := &blockingProvider{
+		blockDuration: 100 * time.Millisecond,
+		datasources: []DataSourceInfo{
+			{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
+		},
+	}
+	cached := newCachedProvider(provider.get, defaultCacheSize, time.Minute, log.New("test"))
+
+	numGoroutines := 10
+	var wg sync.WaitGroup
+
+	// Launch multiple fetches for the SAME namespace simultaneously
+	ctx := request.WithNamespace(context.Background(), "default")
+	for i := 0; i < numGoroutines; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			idx := cached.Get(ctx)
+			require.NotNil(t, idx)
+		}()
+	}
+	wg.Wait()
+
+	// Max concurrent should be 1 since all goroutines are for the same namespace
+	maxConcurrent := provider.maxConcurrent.Load()
+	assert.Equal(t, int64(1), maxConcurrent)
+}
+
+// blockingProvider is a test provider that simulates slow fetch operations
+// and tracks concurrent executions
+type blockingProvider struct {
+	blockDuration time.Duration
+	datasources   []DataSourceInfo
+	callCount     atomic.Int64
+	currentActive atomic.Int64
+	maxConcurrent atomic.Int64
+}
+
+func (p *blockingProvider) get(_ context.Context) any {
+	p.callCount.Add(1)
+
+	// Track concurrent executions
+	current := p.currentActive.Add(1)
+
+	// Update max concurrent if this is a new peak
+	for {
+		maxVal := p.maxConcurrent.Load()
+		if current <= maxVal {
+			break
+		}
+		if p.maxConcurrent.CompareAndSwap(maxVal, current) {
+			break
+		}
+	}
+
+	// Simulate slow operation
+	time.Sleep(p.blockDuration)
+
+	p.currentActive.Add(-1)
+	return p.datasources
+}

apps/dashboard/pkg/migration/schemaversion/datasource_utils.go

@@ -2,8 +2,9 @@ package schemaversion
 
 import (
 	"context"
-	"sync"
 	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
 // Shared utility functions for datasource migrations across different schema versions.
@@ -11,65 +12,41 @@ import (
 // string names/UIDs to structured reference objects with uid, type, and apiVersion.
 
 // cachedIndexProvider wraps a DataSourceIndexProvider with time-based caching.
-// This prevents multiple DB queries and index builds during operations that may call
-// provider.Index() multiple times (e.g., dashboard conversions with many datasource lookups).
-// The cache expires after 10 seconds, allowing it to be used as a long-lived singleton
-// while still refreshing periodically.
-//
-// Thread-safe: Uses sync.RWMutex to guarantee safe concurrent access.
 type cachedIndexProvider struct {
-	provider DataSourceIndexProvider
-	mu       sync.RWMutex
-	index    *DatasourceIndex
-	cachedAt time.Time
-	cacheTTL time.Duration
+	*cachedProvider[*DatasourceIndex]
 }
 
-// Index returns the cached index if it's still valid (< 10s old), otherwise rebuilds it.
-// Uses RWMutex for efficient concurrent reads when cache is valid.
+// Index returns the cached index if it's still valid (< TTL old), otherwise rebuilds it.
 func (p *cachedIndexProvider) Index(ctx context.Context) *DatasourceIndex {
-	// Fast path: check if cache is still valid using read lock
-	p.mu.RLock()
-	if p.index != nil && time.Since(p.cachedAt) < p.cacheTTL {
-		idx := p.index
-		p.mu.RUnlock()
-		return idx
-	}
-	p.mu.RUnlock()
-
-	// Slow path: cache expired or not yet built, acquire write lock
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// Double-check: another goroutine might have refreshed the cache
-	// while we were waiting for the write lock
-	if p.index != nil && time.Since(p.cachedAt) < p.cacheTTL {
-		return p.index
-	}
-
-	// Rebuild the cache
-	p.index = p.provider.Index(ctx)
-	p.cachedAt = time.Now()
-	return p.index
+	return p.Get(ctx)
 }
 
-// WrapIndexProviderWithCache wraps a provider to cache the index with a 10-second TTL.
-// Useful for conversions or migrations that may call provider.Index() multiple times.
-// The cache expires after 10 seconds, making it suitable for use as a long-lived singleton
-// at the top level of dependency injection while still refreshing periodically.
-//
-// Example usage in dashboard conversion:
-//
-//	cachedDsIndexProvider := schemaversion.WrapIndexProviderWithCache(dsIndexProvider)
-//	// Now all calls to cachedDsIndexProvider.Index(ctx) return the same cached index
-//	// for up to 10 seconds before refreshing
-func WrapIndexProviderWithCache(provider DataSourceIndexProvider) DataSourceIndexProvider {
-	if provider == nil {
-		return nil
+// cachedLibraryElementProvider wraps a LibraryElementIndexProvider with time-based caching.
+type cachedLibraryElementProvider struct {
+	*cachedProvider[[]LibraryElementInfo]
+}
+
+func (p *cachedLibraryElementProvider) GetLibraryElementInfo(ctx context.Context) []LibraryElementInfo {
+	return p.Get(ctx)
+}
+
+// WrapIndexProviderWithCache wraps a DataSourceIndexProvider to cache indexes with a configurable TTL.
+func WrapIndexProviderWithCache(provider DataSourceIndexProvider, cacheTTL time.Duration) DataSourceIndexProvider {
+	if provider == nil || cacheTTL <= 0 {
+		return provider
 	}
 	return &cachedIndexProvider{
-		provider: provider,
-		cacheTTL: 10 * time.Second,
+		newCachedProvider[*DatasourceIndex](provider.Index, defaultCacheSize, cacheTTL, log.New("schemaversion.dsindexprovider")),
+	}
+}
+
+// WrapLibraryElementProviderWithCache wraps a LibraryElementIndexProvider to cache library elements with a configurable TTL.
+func WrapLibraryElementProviderWithCache(provider LibraryElementIndexProvider, cacheTTL time.Duration) LibraryElementIndexProvider {
+	if provider == nil || cacheTTL <= 0 {
+		return provider
+	}
+	return &cachedLibraryElementProvider{
+		newCachedProvider[[]LibraryElementInfo](provider.GetLibraryElementInfo, defaultCacheSize, cacheTTL, log.New("schemaversion.leindexprovider")),
 	}
 }
 
@@ -216,60 +193,3 @@ func MigrateDatasourceNameToRef(nameOrRef interface{}, options map[string]bool,
 
 	return nil
 }
-
-// cachedLibraryElementProvider wraps a LibraryElementIndexProvider with time-based caching.
-// This prevents multiple DB queries during operations that may call GetLibraryElementInfo()
-// multiple times (e.g., dashboard conversions with many library panel lookups).
-// The cache expires after 10 seconds, allowing it to be used as a long-lived singleton
-// while still refreshing periodically.
-//
-// Thread-safe: Uses sync.RWMutex to guarantee safe concurrent access.
-type cachedLibraryElementProvider struct {
-	provider LibraryElementIndexProvider
-	mu       sync.RWMutex
-	elements []LibraryElementInfo
-	cachedAt time.Time
-	cacheTTL time.Duration
-}
-
-// GetLibraryElementInfo returns the cached library elements if they're still valid (< 10s old), otherwise rebuilds the cache.
-// Uses RWMutex for efficient concurrent reads when cache is valid.
-func (p *cachedLibraryElementProvider) GetLibraryElementInfo(ctx context.Context) []LibraryElementInfo {
-	// Fast path: check if cache is still valid using read lock
-	p.mu.RLock()
-	if p.elements != nil && time.Since(p.cachedAt) < p.cacheTTL {
-		elements := p.elements
-		p.mu.RUnlock()
-		return elements
-	}
-	p.mu.RUnlock()
-
-	// Slow path: cache expired or not yet built, acquire write lock
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// Double-check: another goroutine might have refreshed the cache
-	// while we were waiting for the write lock
-	if p.elements != nil && time.Since(p.cachedAt) < p.cacheTTL {
-		return p.elements
-	}
-
-	// Rebuild the cache
-	p.elements = p.provider.GetLibraryElementInfo(ctx)
-	p.cachedAt = time.Now()
-	return p.elements
-}
-
-// WrapLibraryElementProviderWithCache wraps a provider to cache library elements with a 10-second TTL.
-// Useful for conversions or migrations that may call GetLibraryElementInfo() multiple times.
-// The cache expires after 10 seconds, making it suitable for use as a long-lived singleton
-// at the top level of dependency injection while still refreshing periodically.
-func WrapLibraryElementProviderWithCache(provider LibraryElementIndexProvider) LibraryElementIndexProvider {
-	if provider == nil {
-		return nil
-	}
-	return &cachedLibraryElementProvider{
-		provider: provider,
-		cacheTTL: 10 * time.Second,
-	}
-}

apps/iam/pkg/apis/iam/v0alpha1/corerole_object_gen.go

@@ -23,6 +23,12 @@ type CoreRole struct {
 	Spec CoreRoleSpec `json:"spec" yaml:"spec"`
 }
 
+func NewCoreRole() *CoreRole {
+	return &CoreRole{
+		Spec: *NewCoreRoleSpec(),
+	}
+}
+
 func (o *CoreRole) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/corerole_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaCoreRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &CoreRole{}, &CoreRoleList{}, resource.WithKind("CoreRole"),
+	schemaCoreRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewCoreRole(), &CoreRoleList{}, resource.WithKind("CoreRole"),
 		resource.WithPlural("coreroles"), resource.WithScope(resource.NamespacedScope))
 	kindCoreRole = resource.Kind{
 		Schema: schemaCoreRole,

apps/iam/pkg/apis/iam/v0alpha1/externalgroupmapping_object_gen.go

@@ -23,6 +23,12 @@ type ExternalGroupMapping struct {
 	Spec ExternalGroupMappingSpec `json:"spec" yaml:"spec"`
 }
 
+func NewExternalGroupMapping() *ExternalGroupMapping {
+	return &ExternalGroupMapping{
+		Spec: *NewExternalGroupMappingSpec(),
+	}
+}
+
 func (o *ExternalGroupMapping) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/externalgroupmapping_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaExternalGroupMapping = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ExternalGroupMapping{}, &ExternalGroupMappingList{}, resource.WithKind("ExternalGroupMapping"),
+	schemaExternalGroupMapping = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewExternalGroupMapping(), &ExternalGroupMappingList{}, resource.WithKind("ExternalGroupMapping"),
 		resource.WithPlural("externalgroupmappings"), resource.WithScope(resource.NamespacedScope))
 	kindExternalGroupMapping = resource.Kind{
 		Schema: schemaExternalGroupMapping,

apps/iam/pkg/apis/iam/v0alpha1/globalrole_object_gen.go

@@ -23,6 +23,12 @@ type GlobalRole struct {
 	Spec GlobalRoleSpec `json:"spec" yaml:"spec"`
 }
 
+func NewGlobalRole() *GlobalRole {
+	return &GlobalRole{
+		Spec: *NewGlobalRoleSpec(),
+	}
+}
+
 func (o *GlobalRole) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/globalrole_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaGlobalRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &GlobalRole{}, &GlobalRoleList{}, resource.WithKind("GlobalRole"),
+	schemaGlobalRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewGlobalRole(), &GlobalRoleList{}, resource.WithKind("GlobalRole"),
 		resource.WithPlural("globalroles"), resource.WithScope(resource.NamespacedScope))
 	kindGlobalRole = resource.Kind{
 		Schema: schemaGlobalRole,

apps/iam/pkg/apis/iam/v0alpha1/globalrolebinding_object_gen.go

@@ -23,6 +23,12 @@ type GlobalRoleBinding struct {
 	Spec GlobalRoleBindingSpec `json:"spec" yaml:"spec"`
 }
 
+func NewGlobalRoleBinding() *GlobalRoleBinding {
+	return &GlobalRoleBinding{
+		Spec: *NewGlobalRoleBindingSpec(),
+	}
+}
+
 func (o *GlobalRoleBinding) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/globalrolebinding_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaGlobalRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &GlobalRoleBinding{}, &GlobalRoleBindingList{}, resource.WithKind("GlobalRoleBinding"),
+	schemaGlobalRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewGlobalRoleBinding(), &GlobalRoleBindingList{}, resource.WithKind("GlobalRoleBinding"),
 		resource.WithPlural("globalrolebindings"), resource.WithScope(resource.NamespacedScope))
 	kindGlobalRoleBinding = resource.Kind{
 		Schema: schemaGlobalRoleBinding,

apps/iam/pkg/apis/iam/v0alpha1/resourcepermission_object_gen.go

@@ -23,6 +23,12 @@ type ResourcePermission struct {
 	Spec ResourcePermissionSpec `json:"spec" yaml:"spec"`
 }
 
+func NewResourcePermission() *ResourcePermission {
+	return &ResourcePermission{
+		Spec: *NewResourcePermissionSpec(),
+	}
+}
+
 func (o *ResourcePermission) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/resourcepermission_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaResourcePermission = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ResourcePermission{}, &ResourcePermissionList{}, resource.WithKind("ResourcePermission"),
+	schemaResourcePermission = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewResourcePermission(), &ResourcePermissionList{}, resource.WithKind("ResourcePermission"),
 		resource.WithPlural("resourcepermissions"), resource.WithScope(resource.NamespacedScope))
 	kindResourcePermission = resource.Kind{
 		Schema: schemaResourcePermission,

apps/iam/pkg/apis/iam/v0alpha1/role_object_gen.go

@@ -23,6 +23,12 @@ type Role struct {
 	Spec RoleSpec `json:"spec" yaml:"spec"`
 }
 
+func NewRole() *Role {
+	return &Role{
+		Spec: *NewRoleSpec(),
+	}
+}
+
 func (o *Role) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/role_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &Role{}, &RoleList{}, resource.WithKind("Role"),
+	schemaRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewRole(), &RoleList{}, resource.WithKind("Role"),
 		resource.WithPlural("roles"), resource.WithScope(resource.NamespacedScope))
 	kindRole = resource.Kind{
 		Schema: schemaRole,

apps/iam/pkg/apis/iam/v0alpha1/rolebinding_object_gen.go

@@ -23,6 +23,12 @@ type RoleBinding struct {
 	Spec RoleBindingSpec `json:"spec" yaml:"spec"`
 }
 
+func NewRoleBinding() *RoleBinding {
+	return &RoleBinding{
+		Spec: *NewRoleBindingSpec(),
+	}
+}
+
 func (o *RoleBinding) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/rolebinding_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &RoleBinding{}, &RoleBindingList{}, resource.WithKind("RoleBinding"),
+	schemaRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewRoleBinding(), &RoleBindingList{}, resource.WithKind("RoleBinding"),
 		resource.WithPlural("rolebindings"), resource.WithScope(resource.NamespacedScope))
 	kindRoleBinding = resource.Kind{
 		Schema: schemaRoleBinding,

apps/iam/pkg/apis/iam/v0alpha1/serviceaccount_object_gen.go

@@ -23,6 +23,12 @@ type ServiceAccount struct {
 	Spec ServiceAccountSpec `json:"spec" yaml:"spec"`
 }
 
+func NewServiceAccount() *ServiceAccount {
+	return &ServiceAccount{
+		Spec: *NewServiceAccountSpec(),
+	}
+}
+
 func (o *ServiceAccount) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/serviceaccount_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaServiceAccount = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ServiceAccount{}, &ServiceAccountList{}, resource.WithKind("ServiceAccount"),
+	schemaServiceAccount = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewServiceAccount(), &ServiceAccountList{}, resource.WithKind("ServiceAccount"),
 		resource.WithPlural("serviceaccounts"), resource.WithScope(resource.NamespacedScope))
 	kindServiceAccount = resource.Kind{
 		Schema: schemaServiceAccount,

apps/iam/pkg/apis/iam/v0alpha1/team_object_gen.go

@@ -23,6 +23,12 @@ type Team struct {
 	Spec TeamSpec `json:"spec" yaml:"spec"`
 }
 
+func NewTeam() *Team {
+	return &Team{
+		Spec: *NewTeamSpec(),
+	}
+}
+
 func (o *Team) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/team_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaTeam = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &Team{}, &TeamList{}, resource.WithKind("Team"),
+	schemaTeam = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewTeam(), &TeamList{}, resource.WithKind("Team"),
 		resource.WithPlural("teams"), resource.WithScope(resource.NamespacedScope))
 	kindTeam = resource.Kind{
 		Schema: schemaTeam,

apps/iam/pkg/apis/iam/v0alpha1/teambinding_object_gen.go

@@ -23,6 +23,12 @@ type TeamBinding struct {
 	Spec TeamBindingSpec `json:"spec" yaml:"spec"`
 }
 
+func NewTeamBinding() *TeamBinding {
+	return &TeamBinding{
+		Spec: *NewTeamBindingSpec(),
+	}
+}
+
 func (o *TeamBinding) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/teambinding_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaTeamBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &TeamBinding{}, &TeamBindingList{}, resource.WithKind("TeamBinding"),
+	schemaTeamBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewTeamBinding(), &TeamBindingList{}, resource.WithKind("TeamBinding"),
 		resource.WithPlural("teambindings"), resource.WithScope(resource.NamespacedScope))
 	kindTeamBinding = resource.Kind{
 		Schema: schemaTeamBinding,

apps/iam/pkg/apis/iam/v0alpha1/user_object_gen.go

@@ -23,6 +23,12 @@ type User struct {
 	Spec UserSpec `json:"spec" yaml:"spec"`
 }
 
+func NewUser() *User {
+	return &User{
+		Spec: *NewUserSpec(),
+	}
+}
+
 func (o *User) GetSpec() any {
 	return o.Spec
 }

apps/iam/pkg/apis/iam/v0alpha1/user_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaUser = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &User{}, &UserList{}, resource.WithKind("User"),
+	schemaUser = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewUser(), &UserList{}, resource.WithKind("User"),
 		resource.WithPlural("users"), resource.WithScope(resource.NamespacedScope))
 	kindUser = resource.Kind{
 		Schema: schemaUser,

apps/iam/pkg/apis/iam/v0alpha1/zz_openapi_gen.go

@@ -1,8 +1,3 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-
 package v0alpha1
 
 import (

apps/iam/pkg/apis/iam_manifest.go

@@ -109,6 +109,13 @@ var appManifestData = app.ManifestData{
 																			"items": {
 																				SchemaProps: spec.SchemaProps{
 																					Type: []string{"array"},
+																					Items: &spec.SchemaOrArray{
+																						Schema: &spec.Schema{
+																							SchemaProps: spec.SchemaProps{
+
+																								Ref: spec.MustCreateRef("#/components/schemas/getGroupsExternalGroupMapping"),
+																							}},
+																					},
 																				},
 																			},
 																			"kind": {
@@ -200,6 +207,13 @@ var appManifestData = app.ManifestData{
 																		"hits": {
 																			SchemaProps: spec.SchemaProps{
 																				Type: []string{"array"},
+																				Items: &spec.SchemaOrArray{
+																					Schema: &spec.Schema{
+																						SchemaProps: spec.SchemaProps{
+
+																							Ref: spec.MustCreateRef("#/components/schemas/getSearchTeamsTeamHit"),
+																						}},
+																				},
 																			},
 																		},
 																		"kind": {

apps/logsdrilldown/definitions/logsdrilldown-manifest.json

@@ -0,0 +1,319 @@
+{
+  "apiVersion": "apps.grafana.com/v1alpha2",
+  "kind": "AppManifest",
+  "metadata": {
+    "name": "logsdrilldown"
+  },
+  "spec": {
+    "appName": "logsdrilldown",
+    "group": "logsdrilldown.grafana.app",
+    "versions": [
+      {
+        "name": "v1alpha1",
+        "served": true,
+        "kinds": [
+          {
+            "kind": "LogsDrilldown",
+            "plural": "LogsDrilldowns",
+            "scope": "Namespaced",
+            "schemas": {
+              "LogsDrilldown": {
+                "properties": {
+                  "spec": {
+                    "$ref": "#/components/schemas/spec"
+                  },
+                  "status": {
+                    "$ref": "#/components/schemas/status"
+                  }
+                },
+                "required": ["spec"]
+              },
+              "OperatorState": {
+                "additionalProperties": false,
+                "properties": {
+                  "descriptiveState": {
+                    "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                    "type": "string"
+                  },
+                  "details": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "details contains any extra information that is operator-specific",
+                    "type": "object"
+                  },
+                  "lastEvaluation": {
+                    "description": "lastEvaluation is the ResourceVersion last evaluated",
+                    "type": "string"
+                  },
+                  "state": {
+                    "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                    "enum": ["success", "in_progress", "failed"],
+                    "type": "string"
+                  }
+                },
+                "required": ["lastEvaluation", "state"],
+                "type": "object"
+              },
+              "spec": {
+                "additionalProperties": false,
+                "properties": {
+                  "defaultFields": {
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "interceptDismissed": {
+                    "type": "boolean"
+                  },
+                  "prettifyJSON": {
+                    "type": "boolean"
+                  },
+                  "wrapLogMessage": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["defaultFields", "prettifyJSON", "wrapLogMessage", "interceptDismissed"],
+                "type": "object"
+              },
+              "status": {
+                "additionalProperties": false,
+                "properties": {
+                  "additionalFields": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object"
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "$ref": "#/components/schemas/OperatorState"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "conversion": false
+          },
+          {
+            "kind": "LogsDrilldownDefaults",
+            "plural": "LogsDrilldownDefaults",
+            "scope": "Namespaced",
+            "schemas": {
+              "LogsDrilldownDefaults": {
+                "properties": {
+                  "spec": {
+                    "$ref": "#/components/schemas/spec"
+                  },
+                  "status": {
+                    "$ref": "#/components/schemas/status"
+                  }
+                },
+                "required": ["spec"]
+              },
+              "OperatorState": {
+                "additionalProperties": false,
+                "properties": {
+                  "descriptiveState": {
+                    "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                    "type": "string"
+                  },
+                  "details": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "details contains any extra information that is operator-specific",
+                    "type": "object"
+                  },
+                  "lastEvaluation": {
+                    "description": "lastEvaluation is the ResourceVersion last evaluated",
+                    "type": "string"
+                  },
+                  "state": {
+                    "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                    "enum": ["success", "in_progress", "failed"],
+                    "type": "string"
+                  }
+                },
+                "required": ["lastEvaluation", "state"],
+                "type": "object"
+              },
+              "spec": {
+                "additionalProperties": false,
+                "properties": {
+                  "defaultFields": {
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "interceptDismissed": {
+                    "type": "boolean"
+                  },
+                  "prettifyJSON": {
+                    "type": "boolean"
+                  },
+                  "wrapLogMessage": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["defaultFields", "prettifyJSON", "wrapLogMessage", "interceptDismissed"],
+                "type": "object"
+              },
+              "status": {
+                "additionalProperties": false,
+                "properties": {
+                  "additionalFields": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object"
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "$ref": "#/components/schemas/OperatorState"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "conversion": false
+          },
+          {
+            "kind": "LogsDrilldownDefaultColumns",
+            "plural": "LogsDrilldownDefaultColumns",
+            "scope": "Namespaced",
+            "schemas": {
+              "LogsDefaultColumnsLabel": {
+                "additionalProperties": false,
+                "properties": {
+                  "key": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  }
+                },
+                "required": ["key", "value"],
+                "type": "object"
+              },
+              "LogsDefaultColumnsLabels": {
+                "items": {
+                  "$ref": "#/components/schemas/LogsDefaultColumnsLabel"
+                },
+                "type": "array"
+              },
+              "LogsDefaultColumnsRecord": {
+                "additionalProperties": false,
+                "properties": {
+                  "columns": {
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "labels": {
+                    "$ref": "#/components/schemas/LogsDefaultColumnsLabels"
+                  }
+                },
+                "required": ["columns", "labels"],
+                "type": "object"
+              },
+              "LogsDefaultColumnsRecords": {
+                "items": {
+                  "$ref": "#/components/schemas/LogsDefaultColumnsRecord"
+                },
+                "type": "array"
+              },
+              "LogsDrilldownDefaultColumns": {
+                "properties": {
+                  "spec": {
+                    "$ref": "#/components/schemas/spec"
+                  },
+                  "status": {
+                    "$ref": "#/components/schemas/status"
+                  }
+                },
+                "required": ["spec"]
+              },
+              "OperatorState": {
+                "additionalProperties": false,
+                "properties": {
+                  "descriptiveState": {
+                    "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                    "type": "string"
+                  },
+                  "details": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "details contains any extra information that is operator-specific",
+                    "type": "object"
+                  },
+                  "lastEvaluation": {
+                    "description": "lastEvaluation is the ResourceVersion last evaluated",
+                    "type": "string"
+                  },
+                  "state": {
+                    "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                    "enum": ["success", "in_progress", "failed"],
+                    "type": "string"
+                  }
+                },
+                "required": ["lastEvaluation", "state"],
+                "type": "object"
+              },
+              "spec": {
+                "additionalProperties": false,
+                "properties": {
+                  "records": {
+                    "$ref": "#/components/schemas/LogsDefaultColumnsRecords"
+                  }
+                },
+                "required": ["records"],
+                "type": "object"
+              },
+              "status": {
+                "additionalProperties": false,
+                "properties": {
+                  "additionalFields": {
+                    "additionalProperties": {
+                      "additionalProperties": {},
+                      "type": "object"
+                    },
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object"
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "$ref": "#/components/schemas/OperatorState"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "conversion": false
+          }
+        ]
+      }
+    ],
+    "preferredVersion": "v1alpha1"
+  }
+}

apps/logsdrilldown/definitions/logsdrilldown.logsdrilldown.grafana.app.json

@@ -0,0 +1,92 @@
+{
+  "kind": "CustomResourceDefinition",
+  "apiVersion": "apiextensions.k8s.io/v1",
+  "metadata": {
+    "name": "logsdrilldowns.logsdrilldown.grafana.app"
+  },
+  "spec": {
+    "group": "logsdrilldown.grafana.app",
+    "versions": [
+      {
+        "name": "v1alpha1",
+        "served": true,
+        "storage": true,
+        "schema": {
+          "openAPIV3Schema": {
+            "properties": {
+              "spec": {
+                "properties": {
+                  "defaultFields": {
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "interceptDismissed": {
+                    "type": "boolean"
+                  },
+                  "prettifyJSON": {
+                    "type": "boolean"
+                  },
+                  "wrapLogMessage": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["defaultFields", "prettifyJSON", "wrapLogMessage", "interceptDismissed"],
+                "type": "object"
+              },
+              "status": {
+                "properties": {
+                  "additionalFields": {
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object",
+                    "x-kubernetes-preserve-unknown-fields": true
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "properties": {
+                        "descriptiveState": {
+                          "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                          "type": "string"
+                        },
+                        "details": {
+                          "description": "details contains any extra information that is operator-specific",
+                          "type": "object",
+                          "x-kubernetes-preserve-unknown-fields": true
+                        },
+                        "lastEvaluation": {
+                          "description": "lastEvaluation is the ResourceVersion last evaluated",
+                          "type": "string"
+                        },
+                        "state": {
+                          "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                          "enum": ["success", "in_progress", "failed"],
+                          "type": "string"
+                        }
+                      },
+                      "required": ["lastEvaluation", "state"],
+                      "type": "object"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "required": ["spec"],
+            "type": "object"
+          }
+        },
+        "subresources": {
+          "status": {}
+        }
+      }
+    ],
+    "names": {
+      "kind": "LogsDrilldown",
+      "plural": "logsdrilldowns"
+    },
+    "scope": "Namespaced"
+  }
+}

apps/logsdrilldown/definitions/logsdrilldowndefaultcolumns.logsdrilldown.grafana.app.json

@@ -0,0 +1,107 @@
+{
+  "kind": "CustomResourceDefinition",
+  "apiVersion": "apiextensions.k8s.io/v1",
+  "metadata": {
+    "name": "logsdrilldowndefaultcolumns.logsdrilldown.grafana.app"
+  },
+  "spec": {
+    "group": "logsdrilldown.grafana.app",
+    "versions": [
+      {
+        "name": "v1alpha1",
+        "served": true,
+        "storage": true,
+        "schema": {
+          "openAPIV3Schema": {
+            "properties": {
+              "spec": {
+                "properties": {
+                  "records": {
+                    "items": {
+                      "properties": {
+                        "columns": {
+                          "items": {
+                            "type": "string"
+                          },
+                          "type": "array"
+                        },
+                        "labels": {
+                          "items": {
+                            "properties": {
+                              "key": {
+                                "type": "string"
+                              },
+                              "value": {
+                                "type": "string"
+                              }
+                            },
+                            "required": ["key", "value"],
+                            "type": "object"
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "required": ["columns", "labels"],
+                      "type": "object"
+                    },
+                    "type": "array"
+                  }
+                },
+                "required": ["records"],
+                "type": "object"
+              },
+              "status": {
+                "properties": {
+                  "additionalFields": {
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object",
+                    "x-kubernetes-preserve-unknown-fields": true
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "properties": {
+                        "descriptiveState": {
+                          "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                          "type": "string"
+                        },
+                        "details": {
+                          "description": "details contains any extra information that is operator-specific",
+                          "type": "object",
+                          "x-kubernetes-preserve-unknown-fields": true
+                        },
+                        "lastEvaluation": {
+                          "description": "lastEvaluation is the ResourceVersion last evaluated",
+                          "type": "string"
+                        },
+                        "state": {
+                          "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                          "enum": ["success", "in_progress", "failed"],
+                          "type": "string"
+                        }
+                      },
+                      "required": ["lastEvaluation", "state"],
+                      "type": "object"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "required": ["spec"],
+            "type": "object"
+          }
+        },
+        "subresources": {
+          "status": {}
+        }
+      }
+    ],
+    "names": {
+      "kind": "LogsDrilldownDefaultColumns",
+      "plural": "logsdrilldowndefaultcolumns"
+    },
+    "scope": "Namespaced"
+  }
+}

apps/logsdrilldown/definitions/logsdrilldowndefaults.logsdrilldown.grafana.app.json

@@ -0,0 +1,92 @@
+{
+  "kind": "CustomResourceDefinition",
+  "apiVersion": "apiextensions.k8s.io/v1",
+  "metadata": {
+    "name": "logsdrilldowndefaults.logsdrilldown.grafana.app"
+  },
+  "spec": {
+    "group": "logsdrilldown.grafana.app",
+    "versions": [
+      {
+        "name": "v1alpha1",
+        "served": true,
+        "storage": true,
+        "schema": {
+          "openAPIV3Schema": {
+            "properties": {
+              "spec": {
+                "properties": {
+                  "defaultFields": {
+                    "items": {
+                      "type": "string"
+                    },
+                    "type": "array"
+                  },
+                  "interceptDismissed": {
+                    "type": "boolean"
+                  },
+                  "prettifyJSON": {
+                    "type": "boolean"
+                  },
+                  "wrapLogMessage": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["defaultFields", "prettifyJSON", "wrapLogMessage", "interceptDismissed"],
+                "type": "object"
+              },
+              "status": {
+                "properties": {
+                  "additionalFields": {
+                    "description": "additionalFields is reserved for future use",
+                    "type": "object",
+                    "x-kubernetes-preserve-unknown-fields": true
+                  },
+                  "operatorStates": {
+                    "additionalProperties": {
+                      "properties": {
+                        "descriptiveState": {
+                          "description": "descriptiveState is an optional more descriptive state field which has no requirements on format",
+                          "type": "string"
+                        },
+                        "details": {
+                          "description": "details contains any extra information that is operator-specific",
+                          "type": "object",
+                          "x-kubernetes-preserve-unknown-fields": true
+                        },
+                        "lastEvaluation": {
+                          "description": "lastEvaluation is the ResourceVersion last evaluated",
+                          "type": "string"
+                        },
+                        "state": {
+                          "description": "state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.",
+                          "enum": ["success", "in_progress", "failed"],
+                          "type": "string"
+                        }
+                      },
+                      "required": ["lastEvaluation", "state"],
+                      "type": "object"
+                    },
+                    "description": "operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.",
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "required": ["spec"],
+            "type": "object"
+          }
+        },
+        "subresources": {
+          "status": {}
+        }
+      }
+    ],
+    "names": {
+      "kind": "LogsDrilldownDefaults",
+      "plural": "logsdrilldowndefaults"
+    },
+    "scope": "Namespaced"
+  }
+}

apps/logsdrilldown/kinds/logsdrilldown.cue

@@ -1,5 +1,9 @@
 package kinds
 
+import (
+	"github.com/grafana/grafana/apps/logsdrilldown/kinds/v0alpha1"
+)
+
 LogsDrilldownSpecv1alpha1: {
 	defaultFields: [...string] | *[]
 	prettifyJSON: bool
@@ -21,3 +25,12 @@ logsdrilldownDefaultsv1alpha1: {
 		spec: LogsDrilldownSpecv1alpha1
 	}
 }
+
+// Default columns API
+logsdrilldownDefaultColumnsv0alpha1: {
+	kind: "LogsDrilldownDefaultColumns"
+	pluralName: "LogsDrilldownDefaultColumns"
+	schema: {
+		spec: v0alpha1.LogsDefaultColumns
+	}
+}

apps/logsdrilldown/kinds/manifest.cue

@@ -35,12 +35,12 @@ manifest: {
 // It includes kinds which the v1alpha1 API serves, and (future) custom routes served globally from the v1alpha1 version.
 v1alpha1: {
     // kinds is the list of kinds served by this version
-    kinds: [logsdrilldownv1alpha1, logsdrilldownDefaultsv1alpha1]
+    kinds: [logsdrilldownv1alpha1, logsdrilldownDefaultsv1alpha1, logsdrilldownDefaultColumnsv0alpha1]
     // [OPTIONAL]
     // served indicates whether this particular version is served by the API server.
     // served should be set to false before a version is removed from the manifest entirely.
     // served defaults to true if not present.
-    served: true 
+    served: true
     // [OPTIONAL]
     // Codegen is a trait that tells the grafana-app-sdk, or other code generation tooling, how to process this kind.
     // If not present, default values within the codegen trait are used.
@@ -64,4 +64,4 @@ v1alpha1: {
             enabled: true
         }
     }
-}
+}

apps/logsdrilldown/kinds/v0alpha1/defaultcolumns.cue

@@ -0,0 +1,19 @@
+package v0alpha1
+
+#LogsDefaultColumnsLabel: {
+	key:   string
+	value: string
+}
+
+#LogsDefaultColumnsLabels: [...#LogsDefaultColumnsLabel]
+
+#LogsDefaultColumnsRecord: {
+	columns: [...string]
+	labels: #LogsDefaultColumnsLabels
+}
+
+#LogsDefaultColumnsRecords: [...#LogsDefaultColumnsRecord]
+
+LogsDefaultColumns: {
+	records: #LogsDefaultColumnsRecords
+}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldown_object_gen.go

@@ -25,6 +25,13 @@ type LogsDrilldown struct {
 	Status LogsDrilldownStatus `json:"status" yaml:"status"`
 }
 
+func NewLogsDrilldown() *LogsDrilldown {
+	return &LogsDrilldown{
+		Spec:   *NewLogsDrilldownSpec(),
+		Status: *NewLogsDrilldownStatus(),
+	}
+}
+
 func (o *LogsDrilldown) GetSpec() any {
 	return o.Spec
 }

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldown_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaLogsDrilldown = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldown{}, &LogsDrilldownList{}, resource.WithKind("LogsDrilldown"),
+	schemaLogsDrilldown = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", NewLogsDrilldown(), &LogsDrilldownList{}, resource.WithKind("LogsDrilldown"),
 		resource.WithPlural("logsdrilldowns"), resource.WithScope(resource.NamespacedScope))
 	kindLogsDrilldown = resource.Kind{
 		Schema: schemaLogsDrilldown,

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_client_gen.go

@@ -0,0 +1,99 @@
+package v1alpha1
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type LogsDrilldownDefaultColumnsClient struct {
+	client *resource.TypedClient[*LogsDrilldownDefaultColumns, *LogsDrilldownDefaultColumnsList]
+}
+
+func NewLogsDrilldownDefaultColumnsClient(client resource.Client) *LogsDrilldownDefaultColumnsClient {
+	return &LogsDrilldownDefaultColumnsClient{
+		client: resource.NewTypedClient[*LogsDrilldownDefaultColumns, *LogsDrilldownDefaultColumnsList](client, LogsDrilldownDefaultColumnsKind()),
+	}
+}
+
+func NewLogsDrilldownDefaultColumnsClientFromGenerator(generator resource.ClientGenerator) (*LogsDrilldownDefaultColumnsClient, error) {
+	c, err := generator.ClientFor(LogsDrilldownDefaultColumnsKind())
+	if err != nil {
+		return nil, err
+	}
+	return NewLogsDrilldownDefaultColumnsClient(c), nil
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Get(ctx context.Context, identifier resource.Identifier) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultColumnsList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultColumnsList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Create(ctx context.Context, obj *LogsDrilldownDefaultColumns, opts resource.CreateOptions) (*LogsDrilldownDefaultColumns, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = LogsDrilldownDefaultColumnsKind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Update(ctx context.Context, obj *LogsDrilldownDefaultColumns, opts resource.UpdateOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus LogsDrilldownDefaultColumnsStatus, opts resource.UpdateOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Update(ctx, &LogsDrilldownDefaultColumns{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       LogsDrilldownDefaultColumnsKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_codec_gen.go

@@ -0,0 +1,28 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// LogsDrilldownDefaultColumnsJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type LogsDrilldownDefaultColumnsJSONCodec struct{}
+
+// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
+func (*LogsDrilldownDefaultColumnsJSONCodec) Read(reader io.Reader, into resource.Object) error {
+	return json.NewDecoder(reader).Decode(into)
+}
+
+// Write writes JSON-encoded bytes into `writer` marshaled from `from`
+func (*LogsDrilldownDefaultColumnsJSONCodec) Write(writer io.Writer, from resource.Object) error {
+	return json.NewEncoder(writer).Encode(from)
+}
+
+// Interface compliance checks
+var _ resource.Codec = &LogsDrilldownDefaultColumnsJSONCodec{}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_metadata_gen.go

@@ -0,0 +1,31 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	time "time"
+)
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+type LogsDrilldownDefaultColumnsMetadata struct {
+	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
+	CreatedBy         string            `json:"createdBy"`
+	Uid               string            `json:"uid"`
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Generation        int64             `json:"generation"`
+	UpdatedBy         string            `json:"updatedBy"`
+	Labels            map[string]string `json:"labels"`
+}
+
+// NewLogsDrilldownDefaultColumnsMetadata creates a new LogsDrilldownDefaultColumnsMetadata object.
+func NewLogsDrilldownDefaultColumnsMetadata() *LogsDrilldownDefaultColumnsMetadata {
+	return &LogsDrilldownDefaultColumnsMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
+}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_object_gen.go

@@ -0,0 +1,326 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"fmt"
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"time"
+)
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumns struct {
+	metav1.TypeMeta   `json:",inline" yaml:",inline"`
+	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
+
+	// Spec is the spec of the LogsDrilldownDefaultColumns
+	Spec LogsDrilldownDefaultColumnsSpec `json:"spec" yaml:"spec"`
+
+	Status LogsDrilldownDefaultColumnsStatus `json:"status" yaml:"status"`
+}
+
+func NewLogsDrilldownDefaultColumns() *LogsDrilldownDefaultColumns {
+	return &LogsDrilldownDefaultColumns{
+		Spec:   *NewLogsDrilldownDefaultColumnsSpec(),
+		Status: *NewLogsDrilldownDefaultColumnsStatus(),
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSpec() any {
+	return o.Spec
+}
+
+func (o *LogsDrilldownDefaultColumns) SetSpec(spec any) error {
+	cast, ok := spec.(LogsDrilldownDefaultColumnsSpec)
+	if !ok {
+		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
+	}
+	o.Spec = cast
+	return nil
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSubresources() map[string]any {
+	return map[string]any{
+		"status": o.Status,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSubresource(name string) (any, bool) {
+	switch name {
+	case "status":
+		return o.Status, true
+	default:
+		return nil, false
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetSubresource(name string, value any) error {
+	switch name {
+	case "status":
+		cast, ok := value.(LogsDrilldownDefaultColumnsStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type LogsDrilldownDefaultColumnsStatus", value)
+		}
+		o.Status = cast
+		return nil
+	default:
+		return fmt.Errorf("subresource '%s' does not exist", name)
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
+	return resource.StaticMetadata{
+		Name:      o.ObjectMeta.Name,
+		Namespace: o.ObjectMeta.Namespace,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetStaticMetadata(metadata resource.StaticMetadata) {
+	o.Name = metadata.Name
+	o.Namespace = metadata.Namespace
+	o.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   metadata.Group,
+		Version: metadata.Version,
+		Kind:    metadata.Kind,
+	})
+}
+
+func (o *LogsDrilldownDefaultColumns) GetCommonMetadata() resource.CommonMetadata {
+	dt := o.DeletionTimestamp
+	var deletionTimestamp *time.Time
+	if dt != nil {
+		deletionTimestamp = &dt.Time
+	}
+	// Legacy ExtraFields support
+	extraFields := make(map[string]any)
+	if o.Annotations != nil {
+		extraFields["annotations"] = o.Annotations
+	}
+	if o.ManagedFields != nil {
+		extraFields["managedFields"] = o.ManagedFields
+	}
+	if o.OwnerReferences != nil {
+		extraFields["ownerReferences"] = o.OwnerReferences
+	}
+	return resource.CommonMetadata{
+		UID:               string(o.UID),
+		ResourceVersion:   o.ResourceVersion,
+		Generation:        o.Generation,
+		Labels:            o.Labels,
+		CreationTimestamp: o.CreationTimestamp.Time,
+		DeletionTimestamp: deletionTimestamp,
+		Finalizers:        o.Finalizers,
+		UpdateTimestamp:   o.GetUpdateTimestamp(),
+		CreatedBy:         o.GetCreatedBy(),
+		UpdatedBy:         o.GetUpdatedBy(),
+		ExtraFields:       extraFields,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetCommonMetadata(metadata resource.CommonMetadata) {
+	o.UID = types.UID(metadata.UID)
+	o.ResourceVersion = metadata.ResourceVersion
+	o.Generation = metadata.Generation
+	o.Labels = metadata.Labels
+	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
+	if metadata.DeletionTimestamp != nil {
+		dt := metav1.NewTime(*metadata.DeletionTimestamp)
+		o.DeletionTimestamp = &dt
+	} else {
+		o.DeletionTimestamp = nil
+	}
+	o.Finalizers = metadata.Finalizers
+	if o.Annotations == nil {
+		o.Annotations = make(map[string]string)
+	}
+	if !metadata.UpdateTimestamp.IsZero() {
+		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
+	}
+	if metadata.CreatedBy != "" {
+		o.SetCreatedBy(metadata.CreatedBy)
+	}
+	if metadata.UpdatedBy != "" {
+		o.SetUpdatedBy(metadata.UpdatedBy)
+	}
+	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
+	if metadata.ExtraFields != nil {
+		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
+			if cast, ok := annotations.(map[string]string); ok {
+				o.Annotations = cast
+			}
+		}
+		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
+			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
+				o.ManagedFields = cast
+			}
+		}
+		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
+			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
+				o.OwnerReferences = cast
+			}
+		}
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetCreatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
+}
+
+func (o *LogsDrilldownDefaultColumns) SetCreatedBy(createdBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
+}
+
+func (o *LogsDrilldownDefaultColumns) GetUpdateTimestamp() time.Time {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
+	return parsed
+}
+
+func (o *LogsDrilldownDefaultColumns) SetUpdateTimestamp(updateTimestamp time.Time) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
+}
+
+func (o *LogsDrilldownDefaultColumns) GetUpdatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
+}
+
+func (o *LogsDrilldownDefaultColumns) SetUpdatedBy(updatedBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
+}
+
+func (o *LogsDrilldownDefaultColumns) Copy() resource.Object {
+	return resource.CopyObject(o)
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopy() *LogsDrilldownDefaultColumns {
+	cpy := &LogsDrilldownDefaultColumns{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopyInto(dst *LogsDrilldownDefaultColumns) {
+	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
+	dst.TypeMeta.Kind = o.TypeMeta.Kind
+	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
+	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
+}
+
+// Interface compliance compile-time check
+var _ resource.Object = &LogsDrilldownDefaultColumns{}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsList struct {
+	metav1.TypeMeta `json:",inline" yaml:",inline"`
+	metav1.ListMeta `json:"metadata" yaml:"metadata"`
+	Items           []LogsDrilldownDefaultColumns `json:"items" yaml:"items"`
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaultColumnsList) Copy() resource.ListObject {
+	cpy := &LogsDrilldownDefaultColumnsList{
+		TypeMeta: o.TypeMeta,
+		Items:    make([]LogsDrilldownDefaultColumns, len(o.Items)),
+	}
+	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
+	for i := 0; i < len(o.Items); i++ {
+		if item, ok := o.Items[i].Copy().(*LogsDrilldownDefaultColumns); ok {
+			cpy.Items[i] = *item
+		}
+	}
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumnsList) GetItems() []resource.Object {
+	items := make([]resource.Object, len(o.Items))
+	for i := 0; i < len(o.Items); i++ {
+		items[i] = &o.Items[i]
+	}
+	return items
+}
+
+func (o *LogsDrilldownDefaultColumnsList) SetItems(items []resource.Object) {
+	o.Items = make([]LogsDrilldownDefaultColumns, len(items))
+	for i := 0; i < len(items); i++ {
+		o.Items[i] = *items[i].(*LogsDrilldownDefaultColumns)
+	}
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopy() *LogsDrilldownDefaultColumnsList {
+	cpy := &LogsDrilldownDefaultColumnsList{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopyInto(dst *LogsDrilldownDefaultColumnsList) {
+	resource.CopyObjectInto(dst, o)
+}
+
+// Interface compliance compile-time check
+var _ resource.ListObject = &LogsDrilldownDefaultColumnsList{}
+
+// Copy methods for all subresource types
+
+// DeepCopy creates a full deep copy of Spec
+func (s *LogsDrilldownDefaultColumnsSpec) DeepCopy() *LogsDrilldownDefaultColumnsSpec {
+	cpy := &LogsDrilldownDefaultColumnsSpec{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Spec into another Spec object
+func (s *LogsDrilldownDefaultColumnsSpec) DeepCopyInto(dst *LogsDrilldownDefaultColumnsSpec) {
+	resource.CopyObjectInto(dst, s)
+}
+
+// DeepCopy creates a full deep copy of LogsDrilldownDefaultColumnsStatus
+func (s *LogsDrilldownDefaultColumnsStatus) DeepCopy() *LogsDrilldownDefaultColumnsStatus {
+	cpy := &LogsDrilldownDefaultColumnsStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies LogsDrilldownDefaultColumnsStatus into another LogsDrilldownDefaultColumnsStatus object
+func (s *LogsDrilldownDefaultColumnsStatus) DeepCopyInto(dst *LogsDrilldownDefaultColumnsStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaLogsDrilldownDefaultColumns = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", NewLogsDrilldownDefaultColumns(), &LogsDrilldownDefaultColumnsList{}, resource.WithKind("LogsDrilldownDefaultColumns"),
+		resource.WithPlural("logsdrilldowndefaultcolumns"), resource.WithScope(resource.NamespacedScope))
+	kindLogsDrilldownDefaultColumns = resource.Kind{
+		Schema: schemaLogsDrilldownDefaultColumns,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &LogsDrilldownDefaultColumnsJSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func LogsDrilldownDefaultColumnsKind() resource.Kind {
+	return kindLogsDrilldownDefaultColumns
+}
+
+// Schema returns a resource.SimpleSchema representation of LogsDrilldownDefaultColumns
+func LogsDrilldownDefaultColumnsSchema() *resource.SimpleSchema {
+	return schemaLogsDrilldownDefaultColumns
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindLogsDrilldownDefaultColumns

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_spec_gen.go

@@ -0,0 +1,43 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsLogsDefaultColumnsRecords []LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord struct {
+	Columns []string                                            `json:"columns"`
+	Labels  LogsDrilldownDefaultColumnsLogsDefaultColumnsLabels `json:"labels"`
+}
+
+// NewLogsDrilldownDefaultColumnsLogsDefaultColumnsRecord creates a new LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord object.
+func NewLogsDrilldownDefaultColumnsLogsDefaultColumnsRecord() *LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord {
+	return &LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord{
+		Columns: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsLogsDefaultColumnsLabels []LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
+}
+
+// NewLogsDrilldownDefaultColumnsLogsDefaultColumnsLabel creates a new LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel object.
+func NewLogsDrilldownDefaultColumnsLogsDefaultColumnsLabel() *LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel {
+	return &LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel{}
+}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsSpec struct {
+	Records LogsDrilldownDefaultColumnsLogsDefaultColumnsRecords `json:"records"`
+}
+
+// NewLogsDrilldownDefaultColumnsSpec creates a new LogsDrilldownDefaultColumnsSpec object.
+func NewLogsDrilldownDefaultColumnsSpec() *LogsDrilldownDefaultColumnsSpec {
+	return &LogsDrilldownDefaultColumnsSpec{}
+}

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaultcolumns_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsstatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State LogsDrilldownDefaultColumnsStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewLogsDrilldownDefaultColumnsstatusOperatorState creates a new LogsDrilldownDefaultColumnsstatusOperatorState object.
+func NewLogsDrilldownDefaultColumnsstatusOperatorState() *LogsDrilldownDefaultColumnsstatusOperatorState {
+	return &LogsDrilldownDefaultColumnsstatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]LogsDrilldownDefaultColumnsstatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewLogsDrilldownDefaultColumnsStatus creates a new LogsDrilldownDefaultColumnsStatus object.
+func NewLogsDrilldownDefaultColumnsStatus() *LogsDrilldownDefaultColumnsStatus {
+	return &LogsDrilldownDefaultColumnsStatus{}
+}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsStatusOperatorStateState string
+
+const (
+	LogsDrilldownDefaultColumnsStatusOperatorStateStateSuccess    LogsDrilldownDefaultColumnsStatusOperatorStateState = "success"
+	LogsDrilldownDefaultColumnsStatusOperatorStateStateInProgress LogsDrilldownDefaultColumnsStatusOperatorStateState = "in_progress"
+	LogsDrilldownDefaultColumnsStatusOperatorStateStateFailed     LogsDrilldownDefaultColumnsStatusOperatorStateState = "failed"
+)

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaults_object_gen.go

@@ -25,6 +25,13 @@ type LogsDrilldownDefaults struct {
 	Status LogsDrilldownDefaultsStatus `json:"status" yaml:"status"`
 }
 
+func NewLogsDrilldownDefaults() *LogsDrilldownDefaults {
+	return &LogsDrilldownDefaults{
+		Spec:   *NewLogsDrilldownDefaultsSpec(),
+		Status: *NewLogsDrilldownDefaultsStatus(),
+	}
+}
+
 func (o *LogsDrilldownDefaults) GetSpec() any {
 	return o.Spec
 }

apps/logsdrilldown/pkg/apis/logsdrilldown/v1alpha1/logsdrilldowndefaults_schema_gen.go

@@ -10,7 +10,7 @@ import (
 
 // schema is unexported to prevent accidental overwrites
 var (
-	schemaLogsDrilldownDefaults = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldownDefaults{}, &LogsDrilldownDefaultsList{}, resource.WithKind("LogsDrilldownDefaults"),
+	schemaLogsDrilldownDefaults = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", NewLogsDrilldownDefaults(), &LogsDrilldownDefaultsList{}, resource.WithKind("LogsDrilldownDefaults"),
 		resource.WithPlural("logsdrilldowndefaults"), resource.WithScope(resource.NamespacedScope))
 	kindLogsDrilldownDefaults = resource.Kind{
 		Schema: schemaLogsDrilldownDefaults,

apps/logsdrilldown/pkg/apis/logsdrilldown_manifest.go

@@ -20,12 +20,15 @@ import (
 )
 
 var (
-	rawSchemaLogsDrilldownv1alpha1             = []byte(`{"LogsDrilldown":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
-	versionSchemaLogsDrilldownv1alpha1         app.VersionSchema
-	_                                          = json.Unmarshal(rawSchemaLogsDrilldownv1alpha1, &versionSchemaLogsDrilldownv1alpha1)
-	rawSchemaLogsDrilldownDefaultsv1alpha1     = []byte(`{"LogsDrilldownDefaults":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
-	versionSchemaLogsDrilldownDefaultsv1alpha1 app.VersionSchema
-	_                                          = json.Unmarshal(rawSchemaLogsDrilldownDefaultsv1alpha1, &versionSchemaLogsDrilldownDefaultsv1alpha1)
+	rawSchemaLogsDrilldownv1alpha1                   = []byte(`{"LogsDrilldown":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownv1alpha1               app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownv1alpha1, &versionSchemaLogsDrilldownv1alpha1)
+	rawSchemaLogsDrilldownDefaultsv1alpha1           = []byte(`{"LogsDrilldownDefaults":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownDefaultsv1alpha1       app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownDefaultsv1alpha1, &versionSchemaLogsDrilldownDefaultsv1alpha1)
+	rawSchemaLogsDrilldownDefaultColumnsv1alpha1     = []byte(`{"LogsDefaultColumnsLabel":{"additionalProperties":false,"properties":{"key":{"type":"string"},"value":{"type":"string"}},"required":["key","value"],"type":"object"},"LogsDefaultColumnsLabels":{"items":{"$ref":"#/components/schemas/LogsDefaultColumnsLabel"},"type":"array"},"LogsDefaultColumnsRecord":{"additionalProperties":false,"properties":{"columns":{"items":{"type":"string"},"type":"array"},"labels":{"$ref":"#/components/schemas/LogsDefaultColumnsLabels"}},"required":["columns","labels"],"type":"object"},"LogsDefaultColumnsRecords":{"items":{"$ref":"#/components/schemas/LogsDefaultColumnsRecord"},"type":"array"},"LogsDrilldownDefaultColumns":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"records":{"$ref":"#/components/schemas/LogsDefaultColumnsRecords"}},"required":["records"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownDefaultColumnsv1alpha1 app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownDefaultColumnsv1alpha1, &versionSchemaLogsDrilldownDefaultColumnsv1alpha1)
 )
 
 var appManifestData = app.ManifestData{
@@ -52,6 +55,14 @@ var appManifestData = app.ManifestData{
 					Conversion: false,
 					Schema:     &versionSchemaLogsDrilldownDefaultsv1alpha1,
 				},
+
+				{
+					Kind:       "LogsDrilldownDefaultColumns",
+					Plural:     "LogsDrilldownDefaultColumns",
+					Scope:      "Namespaced",
+					Conversion: false,
+					Schema:     &versionSchemaLogsDrilldownDefaultColumnsv1alpha1,
+				},
 			},
 			Routes: app.ManifestVersionRoutes{
 				Namespaced: map[string]spec3.PathProps{},
@@ -71,8 +82,9 @@ func RemoteManifest() app.Manifest {
 }
 
 var kindVersionToGoType = map[string]resource.Kind{
-	"LogsDrilldown/v1alpha1":         v1alpha1.LogsDrilldownKind(),
-	"LogsDrilldownDefaults/v1alpha1": v1alpha1.LogsDrilldownDefaultsKind(),
+	"LogsDrilldown/v1alpha1":               v1alpha1.LogsDrilldownKind(),
+	"LogsDrilldownDefaults/v1alpha1":       v1alpha1.LogsDrilldownDefaultsKind(),
+	"LogsDrilldownDefaultColumns/v1alpha1": v1alpha1.LogsDrilldownDefaultColumnsKind(),
 }
 
 // ManifestGoTypeAssociator returns the associated resource.Kind instance for a given Kind and Version, if one exists.

apps/logsdrilldown/pkg/app/app.go

@@ -31,6 +31,9 @@ func New(cfg app.Config) (app.App, error) {
 			{
 				Kind: logsdrilldownv1alpha1.LogsDrilldownDefaultsKind(),
 			},
+			{
+				Kind: logsdrilldownv1alpha1.LogsDrilldownDefaultColumnsKind(),
+			},
 		},
 	}
 

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/constants.go

@@ -0,0 +1,18 @@
+package v1alpha1
+
+import "k8s.io/apimachinery/pkg/runtime/schema"
+
+const (
+	// APIGroup is the API group used by all kinds in this package
+	APIGroup = "logsdrilldown.grafana.app"
+	// APIVersion is the API version used by all kinds in this package
+	APIVersion = "v1alpha1"
+)
+
+var (
+	// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package
+	GroupVersion = schema.GroupVersion{
+		Group:   APIGroup,
+		Version: APIVersion,
+	}
+)

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_client_gen.go

@@ -0,0 +1,99 @@
+package v1alpha1
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type LogsDrilldownClient struct {
+	client *resource.TypedClient[*LogsDrilldown, *LogsDrilldownList]
+}
+
+func NewLogsDrilldownClient(client resource.Client) *LogsDrilldownClient {
+	return &LogsDrilldownClient{
+		client: resource.NewTypedClient[*LogsDrilldown, *LogsDrilldownList](client, Kind()),
+	}
+}
+
+func NewLogsDrilldownClientFromGenerator(generator resource.ClientGenerator) (*LogsDrilldownClient, error) {
+	c, err := generator.ClientFor(Kind())
+	if err != nil {
+		return nil, err
+	}
+	return NewLogsDrilldownClient(c), nil
+}
+
+func (c *LogsDrilldownClient) Get(ctx context.Context, identifier resource.Identifier) (*LogsDrilldown, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *LogsDrilldownClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *LogsDrilldownClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *LogsDrilldownClient) Create(ctx context.Context, obj *LogsDrilldown, opts resource.CreateOptions) (*LogsDrilldown, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = Kind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownClient) Update(ctx context.Context, obj *LogsDrilldown, opts resource.UpdateOptions) (*LogsDrilldown, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*LogsDrilldown, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *LogsDrilldownClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus Status, opts resource.UpdateOptions) (*LogsDrilldown, error) {
+	return c.client.Update(ctx, &LogsDrilldown{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       Kind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *LogsDrilldownClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_codec_gen.go

@@ -0,0 +1,28 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// JSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type JSONCodec struct{}
+
+// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
+func (*JSONCodec) Read(reader io.Reader, into resource.Object) error {
+	return json.NewDecoder(reader).Decode(into)
+}
+
+// Write writes JSON-encoded bytes into `writer` marshaled from `from`
+func (*JSONCodec) Write(writer io.Writer, from resource.Object) error {
+	return json.NewEncoder(writer).Encode(from)
+}
+
+// Interface compliance checks
+var _ resource.Codec = &JSONCodec{}

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_metadata_gen.go

@@ -0,0 +1,31 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	time "time"
+)
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+type Metadata struct {
+	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
+	CreatedBy         string            `json:"createdBy"`
+	Uid               string            `json:"uid"`
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Generation        int64             `json:"generation"`
+	UpdatedBy         string            `json:"updatedBy"`
+	Labels            map[string]string `json:"labels"`
+}
+
+// NewMetadata creates a new Metadata object.
+func NewMetadata() *Metadata {
+	return &Metadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
+}

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_object_gen.go

@@ -0,0 +1,319 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"fmt"
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"time"
+)
+
+// +k8s:openapi-gen=true
+type LogsDrilldown struct {
+	metav1.TypeMeta   `json:",inline" yaml:",inline"`
+	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
+
+	// Spec is the spec of the LogsDrilldown
+	Spec Spec `json:"spec" yaml:"spec"`
+
+	Status Status `json:"status" yaml:"status"`
+}
+
+func (o *LogsDrilldown) GetSpec() any {
+	return o.Spec
+}
+
+func (o *LogsDrilldown) SetSpec(spec any) error {
+	cast, ok := spec.(Spec)
+	if !ok {
+		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
+	}
+	o.Spec = cast
+	return nil
+}
+
+func (o *LogsDrilldown) GetSubresources() map[string]any {
+	return map[string]any{
+		"status": o.Status,
+	}
+}
+
+func (o *LogsDrilldown) GetSubresource(name string) (any, bool) {
+	switch name {
+	case "status":
+		return o.Status, true
+	default:
+		return nil, false
+	}
+}
+
+func (o *LogsDrilldown) SetSubresource(name string, value any) error {
+	switch name {
+	case "status":
+		cast, ok := value.(Status)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type Status", value)
+		}
+		o.Status = cast
+		return nil
+	default:
+		return fmt.Errorf("subresource '%s' does not exist", name)
+	}
+}
+
+func (o *LogsDrilldown) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
+	return resource.StaticMetadata{
+		Name:      o.ObjectMeta.Name,
+		Namespace: o.ObjectMeta.Namespace,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
+	}
+}
+
+func (o *LogsDrilldown) SetStaticMetadata(metadata resource.StaticMetadata) {
+	o.Name = metadata.Name
+	o.Namespace = metadata.Namespace
+	o.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   metadata.Group,
+		Version: metadata.Version,
+		Kind:    metadata.Kind,
+	})
+}
+
+func (o *LogsDrilldown) GetCommonMetadata() resource.CommonMetadata {
+	dt := o.DeletionTimestamp
+	var deletionTimestamp *time.Time
+	if dt != nil {
+		deletionTimestamp = &dt.Time
+	}
+	// Legacy ExtraFields support
+	extraFields := make(map[string]any)
+	if o.Annotations != nil {
+		extraFields["annotations"] = o.Annotations
+	}
+	if o.ManagedFields != nil {
+		extraFields["managedFields"] = o.ManagedFields
+	}
+	if o.OwnerReferences != nil {
+		extraFields["ownerReferences"] = o.OwnerReferences
+	}
+	return resource.CommonMetadata{
+		UID:               string(o.UID),
+		ResourceVersion:   o.ResourceVersion,
+		Generation:        o.Generation,
+		Labels:            o.Labels,
+		CreationTimestamp: o.CreationTimestamp.Time,
+		DeletionTimestamp: deletionTimestamp,
+		Finalizers:        o.Finalizers,
+		UpdateTimestamp:   o.GetUpdateTimestamp(),
+		CreatedBy:         o.GetCreatedBy(),
+		UpdatedBy:         o.GetUpdatedBy(),
+		ExtraFields:       extraFields,
+	}
+}
+
+func (o *LogsDrilldown) SetCommonMetadata(metadata resource.CommonMetadata) {
+	o.UID = types.UID(metadata.UID)
+	o.ResourceVersion = metadata.ResourceVersion
+	o.Generation = metadata.Generation
+	o.Labels = metadata.Labels
+	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
+	if metadata.DeletionTimestamp != nil {
+		dt := metav1.NewTime(*metadata.DeletionTimestamp)
+		o.DeletionTimestamp = &dt
+	} else {
+		o.DeletionTimestamp = nil
+	}
+	o.Finalizers = metadata.Finalizers
+	if o.Annotations == nil {
+		o.Annotations = make(map[string]string)
+	}
+	if !metadata.UpdateTimestamp.IsZero() {
+		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
+	}
+	if metadata.CreatedBy != "" {
+		o.SetCreatedBy(metadata.CreatedBy)
+	}
+	if metadata.UpdatedBy != "" {
+		o.SetUpdatedBy(metadata.UpdatedBy)
+	}
+	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
+	if metadata.ExtraFields != nil {
+		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
+			if cast, ok := annotations.(map[string]string); ok {
+				o.Annotations = cast
+			}
+		}
+		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
+			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
+				o.ManagedFields = cast
+			}
+		}
+		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
+			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
+				o.OwnerReferences = cast
+			}
+		}
+	}
+}
+
+func (o *LogsDrilldown) GetCreatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
+}
+
+func (o *LogsDrilldown) SetCreatedBy(createdBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
+}
+
+func (o *LogsDrilldown) GetUpdateTimestamp() time.Time {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
+	return parsed
+}
+
+func (o *LogsDrilldown) SetUpdateTimestamp(updateTimestamp time.Time) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
+}
+
+func (o *LogsDrilldown) GetUpdatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
+}
+
+func (o *LogsDrilldown) SetUpdatedBy(updatedBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
+}
+
+func (o *LogsDrilldown) Copy() resource.Object {
+	return resource.CopyObject(o)
+}
+
+func (o *LogsDrilldown) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldown) DeepCopy() *LogsDrilldown {
+	cpy := &LogsDrilldown{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldown) DeepCopyInto(dst *LogsDrilldown) {
+	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
+	dst.TypeMeta.Kind = o.TypeMeta.Kind
+	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
+	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
+}
+
+// Interface compliance compile-time check
+var _ resource.Object = &LogsDrilldown{}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownList struct {
+	metav1.TypeMeta `json:",inline" yaml:",inline"`
+	metav1.ListMeta `json:"metadata" yaml:"metadata"`
+	Items           []LogsDrilldown `json:"items" yaml:"items"`
+}
+
+func (o *LogsDrilldownList) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownList) Copy() resource.ListObject {
+	cpy := &LogsDrilldownList{
+		TypeMeta: o.TypeMeta,
+		Items:    make([]LogsDrilldown, len(o.Items)),
+	}
+	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
+	for i := 0; i < len(o.Items); i++ {
+		if item, ok := o.Items[i].Copy().(*LogsDrilldown); ok {
+			cpy.Items[i] = *item
+		}
+	}
+	return cpy
+}
+
+func (o *LogsDrilldownList) GetItems() []resource.Object {
+	items := make([]resource.Object, len(o.Items))
+	for i := 0; i < len(o.Items); i++ {
+		items[i] = &o.Items[i]
+	}
+	return items
+}
+
+func (o *LogsDrilldownList) SetItems(items []resource.Object) {
+	o.Items = make([]LogsDrilldown, len(items))
+	for i := 0; i < len(items); i++ {
+		o.Items[i] = *items[i].(*LogsDrilldown)
+	}
+}
+
+func (o *LogsDrilldownList) DeepCopy() *LogsDrilldownList {
+	cpy := &LogsDrilldownList{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownList) DeepCopyInto(dst *LogsDrilldownList) {
+	resource.CopyObjectInto(dst, o)
+}
+
+// Interface compliance compile-time check
+var _ resource.ListObject = &LogsDrilldownList{}
+
+// Copy methods for all subresource types
+
+// DeepCopy creates a full deep copy of Spec
+func (s *Spec) DeepCopy() *Spec {
+	cpy := &Spec{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Spec into another Spec object
+func (s *Spec) DeepCopyInto(dst *Spec) {
+	resource.CopyObjectInto(dst, s)
+}
+
+// DeepCopy creates a full deep copy of Status
+func (s *Status) DeepCopy() *Status {
+	cpy := &Status{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Status into another Status object
+func (s *Status) DeepCopyInto(dst *Status) {
+	resource.CopyObjectInto(dst, s)
+}

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaLogsDrilldown = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldown{}, &LogsDrilldownList{}, resource.WithKind("LogsDrilldown"),
+		resource.WithPlural("logsdrilldowns"), resource.WithScope(resource.NamespacedScope))
+	kindLogsDrilldown = resource.Kind{
+		Schema: schemaLogsDrilldown,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &JSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func Kind() resource.Kind {
+	return kindLogsDrilldown
+}
+
+// Schema returns a resource.SimpleSchema representation of LogsDrilldown
+func Schema() *resource.SimpleSchema {
+	return schemaLogsDrilldown
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindLogsDrilldown

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_spec_gen.go

@@ -0,0 +1,18 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type Spec struct {
+	DefaultFields      []string `json:"defaultFields"`
+	PrettifyJSON       bool     `json:"prettifyJSON"`
+	WrapLogMessage     bool     `json:"wrapLogMessage"`
+	InterceptDismissed bool     `json:"interceptDismissed"`
+}
+
+// NewSpec creates a new Spec object.
+func NewSpec() *Spec {
+	return &Spec{
+		DefaultFields: []string{},
+	}
+}

apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1/logsdrilldown_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type StatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State StatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewStatusOperatorState creates a new StatusOperatorState object.
+func NewStatusOperatorState() *StatusOperatorState {
+	return &StatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type Status struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]StatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewStatus creates a new Status object.
+func NewStatus() *Status {
+	return &Status{}
+}
+
+// +k8s:openapi-gen=true
+type StatusOperatorStateState string
+
+const (
+	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
+	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
+	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
+)

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/constants.go

@@ -0,0 +1,18 @@
+package v1alpha1
+
+import "k8s.io/apimachinery/pkg/runtime/schema"
+
+const (
+	// APIGroup is the API group used by all kinds in this package
+	APIGroup = "logsdrilldown.grafana.app"
+	// APIVersion is the API version used by all kinds in this package
+	APIVersion = "v1alpha1"
+)
+
+var (
+	// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package
+	GroupVersion = schema.GroupVersion{
+		Group:   APIGroup,
+		Version: APIVersion,
+	}
+)

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_client_gen.go

@@ -0,0 +1,99 @@
+package v1alpha1
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type LogsDrilldownDefaultColumnsClient struct {
+	client *resource.TypedClient[*LogsDrilldownDefaultColumns, *LogsDrilldownDefaultColumnsList]
+}
+
+func NewLogsDrilldownDefaultColumnsClient(client resource.Client) *LogsDrilldownDefaultColumnsClient {
+	return &LogsDrilldownDefaultColumnsClient{
+		client: resource.NewTypedClient[*LogsDrilldownDefaultColumns, *LogsDrilldownDefaultColumnsList](client, Kind()),
+	}
+}
+
+func NewLogsDrilldownDefaultColumnsClientFromGenerator(generator resource.ClientGenerator) (*LogsDrilldownDefaultColumnsClient, error) {
+	c, err := generator.ClientFor(Kind())
+	if err != nil {
+		return nil, err
+	}
+	return NewLogsDrilldownDefaultColumnsClient(c), nil
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Get(ctx context.Context, identifier resource.Identifier) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultColumnsList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultColumnsList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Create(ctx context.Context, obj *LogsDrilldownDefaultColumns, opts resource.CreateOptions) (*LogsDrilldownDefaultColumns, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = Kind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Update(ctx context.Context, obj *LogsDrilldownDefaultColumns, opts resource.UpdateOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus Status, opts resource.UpdateOptions) (*LogsDrilldownDefaultColumns, error) {
+	return c.client.Update(ctx, &LogsDrilldownDefaultColumns{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       Kind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *LogsDrilldownDefaultColumnsClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_codec_gen.go

@@ -0,0 +1,28 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// JSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type JSONCodec struct{}
+
+// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
+func (*JSONCodec) Read(reader io.Reader, into resource.Object) error {
+	return json.NewDecoder(reader).Decode(into)
+}
+
+// Write writes JSON-encoded bytes into `writer` marshaled from `from`
+func (*JSONCodec) Write(writer io.Writer, from resource.Object) error {
+	return json.NewEncoder(writer).Encode(from)
+}
+
+// Interface compliance checks
+var _ resource.Codec = &JSONCodec{}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_metadata_gen.go

@@ -0,0 +1,31 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	time "time"
+)
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+type Metadata struct {
+	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
+	CreatedBy         string            `json:"createdBy"`
+	Uid               string            `json:"uid"`
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Generation        int64             `json:"generation"`
+	UpdatedBy         string            `json:"updatedBy"`
+	Labels            map[string]string `json:"labels"`
+}
+
+// NewMetadata creates a new Metadata object.
+func NewMetadata() *Metadata {
+	return &Metadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_object_gen.go

@@ -0,0 +1,319 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"fmt"
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"time"
+)
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumns struct {
+	metav1.TypeMeta   `json:",inline" yaml:",inline"`
+	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
+
+	// Spec is the spec of the LogsDrilldownDefaultColumns
+	Spec Spec `json:"spec" yaml:"spec"`
+
+	Status Status `json:"status" yaml:"status"`
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSpec() any {
+	return o.Spec
+}
+
+func (o *LogsDrilldownDefaultColumns) SetSpec(spec any) error {
+	cast, ok := spec.(Spec)
+	if !ok {
+		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
+	}
+	o.Spec = cast
+	return nil
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSubresources() map[string]any {
+	return map[string]any{
+		"status": o.Status,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetSubresource(name string) (any, bool) {
+	switch name {
+	case "status":
+		return o.Status, true
+	default:
+		return nil, false
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetSubresource(name string, value any) error {
+	switch name {
+	case "status":
+		cast, ok := value.(Status)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type Status", value)
+		}
+		o.Status = cast
+		return nil
+	default:
+		return fmt.Errorf("subresource '%s' does not exist", name)
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
+	return resource.StaticMetadata{
+		Name:      o.ObjectMeta.Name,
+		Namespace: o.ObjectMeta.Namespace,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetStaticMetadata(metadata resource.StaticMetadata) {
+	o.Name = metadata.Name
+	o.Namespace = metadata.Namespace
+	o.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   metadata.Group,
+		Version: metadata.Version,
+		Kind:    metadata.Kind,
+	})
+}
+
+func (o *LogsDrilldownDefaultColumns) GetCommonMetadata() resource.CommonMetadata {
+	dt := o.DeletionTimestamp
+	var deletionTimestamp *time.Time
+	if dt != nil {
+		deletionTimestamp = &dt.Time
+	}
+	// Legacy ExtraFields support
+	extraFields := make(map[string]any)
+	if o.Annotations != nil {
+		extraFields["annotations"] = o.Annotations
+	}
+	if o.ManagedFields != nil {
+		extraFields["managedFields"] = o.ManagedFields
+	}
+	if o.OwnerReferences != nil {
+		extraFields["ownerReferences"] = o.OwnerReferences
+	}
+	return resource.CommonMetadata{
+		UID:               string(o.UID),
+		ResourceVersion:   o.ResourceVersion,
+		Generation:        o.Generation,
+		Labels:            o.Labels,
+		CreationTimestamp: o.CreationTimestamp.Time,
+		DeletionTimestamp: deletionTimestamp,
+		Finalizers:        o.Finalizers,
+		UpdateTimestamp:   o.GetUpdateTimestamp(),
+		CreatedBy:         o.GetCreatedBy(),
+		UpdatedBy:         o.GetUpdatedBy(),
+		ExtraFields:       extraFields,
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) SetCommonMetadata(metadata resource.CommonMetadata) {
+	o.UID = types.UID(metadata.UID)
+	o.ResourceVersion = metadata.ResourceVersion
+	o.Generation = metadata.Generation
+	o.Labels = metadata.Labels
+	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
+	if metadata.DeletionTimestamp != nil {
+		dt := metav1.NewTime(*metadata.DeletionTimestamp)
+		o.DeletionTimestamp = &dt
+	} else {
+		o.DeletionTimestamp = nil
+	}
+	o.Finalizers = metadata.Finalizers
+	if o.Annotations == nil {
+		o.Annotations = make(map[string]string)
+	}
+	if !metadata.UpdateTimestamp.IsZero() {
+		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
+	}
+	if metadata.CreatedBy != "" {
+		o.SetCreatedBy(metadata.CreatedBy)
+	}
+	if metadata.UpdatedBy != "" {
+		o.SetUpdatedBy(metadata.UpdatedBy)
+	}
+	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
+	if metadata.ExtraFields != nil {
+		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
+			if cast, ok := annotations.(map[string]string); ok {
+				o.Annotations = cast
+			}
+		}
+		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
+			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
+				o.ManagedFields = cast
+			}
+		}
+		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
+			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
+				o.OwnerReferences = cast
+			}
+		}
+	}
+}
+
+func (o *LogsDrilldownDefaultColumns) GetCreatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
+}
+
+func (o *LogsDrilldownDefaultColumns) SetCreatedBy(createdBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
+}
+
+func (o *LogsDrilldownDefaultColumns) GetUpdateTimestamp() time.Time {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
+	return parsed
+}
+
+func (o *LogsDrilldownDefaultColumns) SetUpdateTimestamp(updateTimestamp time.Time) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
+}
+
+func (o *LogsDrilldownDefaultColumns) GetUpdatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
+}
+
+func (o *LogsDrilldownDefaultColumns) SetUpdatedBy(updatedBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
+}
+
+func (o *LogsDrilldownDefaultColumns) Copy() resource.Object {
+	return resource.CopyObject(o)
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopy() *LogsDrilldownDefaultColumns {
+	cpy := &LogsDrilldownDefaultColumns{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumns) DeepCopyInto(dst *LogsDrilldownDefaultColumns) {
+	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
+	dst.TypeMeta.Kind = o.TypeMeta.Kind
+	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
+	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
+}
+
+// Interface compliance compile-time check
+var _ resource.Object = &LogsDrilldownDefaultColumns{}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultColumnsList struct {
+	metav1.TypeMeta `json:",inline" yaml:",inline"`
+	metav1.ListMeta `json:"metadata" yaml:"metadata"`
+	Items           []LogsDrilldownDefaultColumns `json:"items" yaml:"items"`
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaultColumnsList) Copy() resource.ListObject {
+	cpy := &LogsDrilldownDefaultColumnsList{
+		TypeMeta: o.TypeMeta,
+		Items:    make([]LogsDrilldownDefaultColumns, len(o.Items)),
+	}
+	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
+	for i := 0; i < len(o.Items); i++ {
+		if item, ok := o.Items[i].Copy().(*LogsDrilldownDefaultColumns); ok {
+			cpy.Items[i] = *item
+		}
+	}
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumnsList) GetItems() []resource.Object {
+	items := make([]resource.Object, len(o.Items))
+	for i := 0; i < len(o.Items); i++ {
+		items[i] = &o.Items[i]
+	}
+	return items
+}
+
+func (o *LogsDrilldownDefaultColumnsList) SetItems(items []resource.Object) {
+	o.Items = make([]LogsDrilldownDefaultColumns, len(items))
+	for i := 0; i < len(items); i++ {
+		o.Items[i] = *items[i].(*LogsDrilldownDefaultColumns)
+	}
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopy() *LogsDrilldownDefaultColumnsList {
+	cpy := &LogsDrilldownDefaultColumnsList{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultColumnsList) DeepCopyInto(dst *LogsDrilldownDefaultColumnsList) {
+	resource.CopyObjectInto(dst, o)
+}
+
+// Interface compliance compile-time check
+var _ resource.ListObject = &LogsDrilldownDefaultColumnsList{}
+
+// Copy methods for all subresource types
+
+// DeepCopy creates a full deep copy of Spec
+func (s *Spec) DeepCopy() *Spec {
+	cpy := &Spec{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Spec into another Spec object
+func (s *Spec) DeepCopyInto(dst *Spec) {
+	resource.CopyObjectInto(dst, s)
+}
+
+// DeepCopy creates a full deep copy of Status
+func (s *Status) DeepCopy() *Status {
+	cpy := &Status{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Status into another Status object
+func (s *Status) DeepCopyInto(dst *Status) {
+	resource.CopyObjectInto(dst, s)
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaLogsDrilldownDefaultColumns = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldownDefaultColumns{}, &LogsDrilldownDefaultColumnsList{}, resource.WithKind("LogsDrilldownDefaultColumns"),
+		resource.WithPlural("logsdrilldowndefaultcolumns"), resource.WithScope(resource.NamespacedScope))
+	kindLogsDrilldownDefaultColumns = resource.Kind{
+		Schema: schemaLogsDrilldownDefaultColumns,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &JSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func Kind() resource.Kind {
+	return kindLogsDrilldownDefaultColumns
+}
+
+// Schema returns a resource.SimpleSchema representation of LogsDrilldownDefaultColumns
+func Schema() *resource.SimpleSchema {
+	return schemaLogsDrilldownDefaultColumns
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindLogsDrilldownDefaultColumns

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_spec_gen.go

@@ -0,0 +1,43 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type LogsDefaultColumnsRecords []LogsDefaultColumnsRecord
+
+// +k8s:openapi-gen=true
+type LogsDefaultColumnsRecord struct {
+	Columns []string                 `json:"columns"`
+	Labels  LogsDefaultColumnsLabels `json:"labels"`
+}
+
+// NewLogsDefaultColumnsRecord creates a new LogsDefaultColumnsRecord object.
+func NewLogsDefaultColumnsRecord() *LogsDefaultColumnsRecord {
+	return &LogsDefaultColumnsRecord{
+		Columns: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type LogsDefaultColumnsLabels []LogsDefaultColumnsLabel
+
+// +k8s:openapi-gen=true
+type LogsDefaultColumnsLabel struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
+}
+
+// NewLogsDefaultColumnsLabel creates a new LogsDefaultColumnsLabel object.
+func NewLogsDefaultColumnsLabel() *LogsDefaultColumnsLabel {
+	return &LogsDefaultColumnsLabel{}
+}
+
+// +k8s:openapi-gen=true
+type Spec struct {
+	Records LogsDefaultColumnsRecords `json:"records"`
+}
+
+// NewSpec creates a new Spec object.
+func NewSpec() *Spec {
+	return &Spec{}
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type StatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State StatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewStatusOperatorState creates a new StatusOperatorState object.
+func NewStatusOperatorState() *StatusOperatorState {
+	return &StatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type Status struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]StatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewStatus creates a new Status object.
+func NewStatus() *Status {
+	return &Status{}
+}
+
+// +k8s:openapi-gen=true
+type StatusOperatorStateState string
+
+const (
+	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
+	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
+	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
+)

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/constants.go

@@ -0,0 +1,18 @@
+package v1alpha1
+
+import "k8s.io/apimachinery/pkg/runtime/schema"
+
+const (
+	// APIGroup is the API group used by all kinds in this package
+	APIGroup = "logsdrilldown.grafana.app"
+	// APIVersion is the API version used by all kinds in this package
+	APIVersion = "v1alpha1"
+)
+
+var (
+	// GroupVersion is a schema.GroupVersion consisting of the Group and Version constants for this package
+	GroupVersion = schema.GroupVersion{
+		Group:   APIGroup,
+		Version: APIVersion,
+	}
+)

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_client_gen.go

@@ -0,0 +1,99 @@
+package v1alpha1
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type LogsDrilldownDefaultsClient struct {
+	client *resource.TypedClient[*LogsDrilldownDefaults, *LogsDrilldownDefaultsList]
+}
+
+func NewLogsDrilldownDefaultsClient(client resource.Client) *LogsDrilldownDefaultsClient {
+	return &LogsDrilldownDefaultsClient{
+		client: resource.NewTypedClient[*LogsDrilldownDefaults, *LogsDrilldownDefaultsList](client, Kind()),
+	}
+}
+
+func NewLogsDrilldownDefaultsClientFromGenerator(generator resource.ClientGenerator) (*LogsDrilldownDefaultsClient, error) {
+	c, err := generator.ClientFor(Kind())
+	if err != nil {
+		return nil, err
+	}
+	return NewLogsDrilldownDefaultsClient(c), nil
+}
+
+func (c *LogsDrilldownDefaultsClient) Get(ctx context.Context, identifier resource.Identifier) (*LogsDrilldownDefaults, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *LogsDrilldownDefaultsClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultsList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *LogsDrilldownDefaultsClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*LogsDrilldownDefaultsList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *LogsDrilldownDefaultsClient) Create(ctx context.Context, obj *LogsDrilldownDefaults, opts resource.CreateOptions) (*LogsDrilldownDefaults, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = Kind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultsClient) Update(ctx context.Context, obj *LogsDrilldownDefaults, opts resource.UpdateOptions) (*LogsDrilldownDefaults, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *LogsDrilldownDefaultsClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*LogsDrilldownDefaults, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *LogsDrilldownDefaultsClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus Status, opts resource.UpdateOptions) (*LogsDrilldownDefaults, error) {
+	return c.client.Update(ctx, &LogsDrilldownDefaults{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       Kind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *LogsDrilldownDefaultsClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_codec_gen.go

@@ -0,0 +1,28 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// JSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type JSONCodec struct{}
+
+// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
+func (*JSONCodec) Read(reader io.Reader, into resource.Object) error {
+	return json.NewDecoder(reader).Decode(into)
+}
+
+// Write writes JSON-encoded bytes into `writer` marshaled from `from`
+func (*JSONCodec) Write(writer io.Writer, from resource.Object) error {
+	return json.NewEncoder(writer).Encode(from)
+}
+
+// Interface compliance checks
+var _ resource.Codec = &JSONCodec{}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_metadata_gen.go

@@ -0,0 +1,31 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	time "time"
+)
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+type Metadata struct {
+	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
+	CreatedBy         string            `json:"createdBy"`
+	Uid               string            `json:"uid"`
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Generation        int64             `json:"generation"`
+	UpdatedBy         string            `json:"updatedBy"`
+	Labels            map[string]string `json:"labels"`
+}
+
+// NewMetadata creates a new Metadata object.
+func NewMetadata() *Metadata {
+	return &Metadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_object_gen.go

@@ -0,0 +1,319 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"fmt"
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"time"
+)
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaults struct {
+	metav1.TypeMeta   `json:",inline" yaml:",inline"`
+	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
+
+	// Spec is the spec of the LogsDrilldownDefaults
+	Spec Spec `json:"spec" yaml:"spec"`
+
+	Status Status `json:"status" yaml:"status"`
+}
+
+func (o *LogsDrilldownDefaults) GetSpec() any {
+	return o.Spec
+}
+
+func (o *LogsDrilldownDefaults) SetSpec(spec any) error {
+	cast, ok := spec.(Spec)
+	if !ok {
+		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
+	}
+	o.Spec = cast
+	return nil
+}
+
+func (o *LogsDrilldownDefaults) GetSubresources() map[string]any {
+	return map[string]any{
+		"status": o.Status,
+	}
+}
+
+func (o *LogsDrilldownDefaults) GetSubresource(name string) (any, bool) {
+	switch name {
+	case "status":
+		return o.Status, true
+	default:
+		return nil, false
+	}
+}
+
+func (o *LogsDrilldownDefaults) SetSubresource(name string, value any) error {
+	switch name {
+	case "status":
+		cast, ok := value.(Status)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type Status", value)
+		}
+		o.Status = cast
+		return nil
+	default:
+		return fmt.Errorf("subresource '%s' does not exist", name)
+	}
+}
+
+func (o *LogsDrilldownDefaults) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
+	return resource.StaticMetadata{
+		Name:      o.ObjectMeta.Name,
+		Namespace: o.ObjectMeta.Namespace,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
+	}
+}
+
+func (o *LogsDrilldownDefaults) SetStaticMetadata(metadata resource.StaticMetadata) {
+	o.Name = metadata.Name
+	o.Namespace = metadata.Namespace
+	o.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   metadata.Group,
+		Version: metadata.Version,
+		Kind:    metadata.Kind,
+	})
+}
+
+func (o *LogsDrilldownDefaults) GetCommonMetadata() resource.CommonMetadata {
+	dt := o.DeletionTimestamp
+	var deletionTimestamp *time.Time
+	if dt != nil {
+		deletionTimestamp = &dt.Time
+	}
+	// Legacy ExtraFields support
+	extraFields := make(map[string]any)
+	if o.Annotations != nil {
+		extraFields["annotations"] = o.Annotations
+	}
+	if o.ManagedFields != nil {
+		extraFields["managedFields"] = o.ManagedFields
+	}
+	if o.OwnerReferences != nil {
+		extraFields["ownerReferences"] = o.OwnerReferences
+	}
+	return resource.CommonMetadata{
+		UID:               string(o.UID),
+		ResourceVersion:   o.ResourceVersion,
+		Generation:        o.Generation,
+		Labels:            o.Labels,
+		CreationTimestamp: o.CreationTimestamp.Time,
+		DeletionTimestamp: deletionTimestamp,
+		Finalizers:        o.Finalizers,
+		UpdateTimestamp:   o.GetUpdateTimestamp(),
+		CreatedBy:         o.GetCreatedBy(),
+		UpdatedBy:         o.GetUpdatedBy(),
+		ExtraFields:       extraFields,
+	}
+}
+
+func (o *LogsDrilldownDefaults) SetCommonMetadata(metadata resource.CommonMetadata) {
+	o.UID = types.UID(metadata.UID)
+	o.ResourceVersion = metadata.ResourceVersion
+	o.Generation = metadata.Generation
+	o.Labels = metadata.Labels
+	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
+	if metadata.DeletionTimestamp != nil {
+		dt := metav1.NewTime(*metadata.DeletionTimestamp)
+		o.DeletionTimestamp = &dt
+	} else {
+		o.DeletionTimestamp = nil
+	}
+	o.Finalizers = metadata.Finalizers
+	if o.Annotations == nil {
+		o.Annotations = make(map[string]string)
+	}
+	if !metadata.UpdateTimestamp.IsZero() {
+		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
+	}
+	if metadata.CreatedBy != "" {
+		o.SetCreatedBy(metadata.CreatedBy)
+	}
+	if metadata.UpdatedBy != "" {
+		o.SetUpdatedBy(metadata.UpdatedBy)
+	}
+	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
+	if metadata.ExtraFields != nil {
+		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
+			if cast, ok := annotations.(map[string]string); ok {
+				o.Annotations = cast
+			}
+		}
+		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
+			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
+				o.ManagedFields = cast
+			}
+		}
+		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
+			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
+				o.OwnerReferences = cast
+			}
+		}
+	}
+}
+
+func (o *LogsDrilldownDefaults) GetCreatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
+}
+
+func (o *LogsDrilldownDefaults) SetCreatedBy(createdBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
+}
+
+func (o *LogsDrilldownDefaults) GetUpdateTimestamp() time.Time {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
+	return parsed
+}
+
+func (o *LogsDrilldownDefaults) SetUpdateTimestamp(updateTimestamp time.Time) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
+}
+
+func (o *LogsDrilldownDefaults) GetUpdatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
+}
+
+func (o *LogsDrilldownDefaults) SetUpdatedBy(updatedBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
+}
+
+func (o *LogsDrilldownDefaults) Copy() resource.Object {
+	return resource.CopyObject(o)
+}
+
+func (o *LogsDrilldownDefaults) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaults) DeepCopy() *LogsDrilldownDefaults {
+	cpy := &LogsDrilldownDefaults{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaults) DeepCopyInto(dst *LogsDrilldownDefaults) {
+	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
+	dst.TypeMeta.Kind = o.TypeMeta.Kind
+	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
+	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
+}
+
+// Interface compliance compile-time check
+var _ resource.Object = &LogsDrilldownDefaults{}
+
+// +k8s:openapi-gen=true
+type LogsDrilldownDefaultsList struct {
+	metav1.TypeMeta `json:",inline" yaml:",inline"`
+	metav1.ListMeta `json:"metadata" yaml:"metadata"`
+	Items           []LogsDrilldownDefaults `json:"items" yaml:"items"`
+}
+
+func (o *LogsDrilldownDefaultsList) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *LogsDrilldownDefaultsList) Copy() resource.ListObject {
+	cpy := &LogsDrilldownDefaultsList{
+		TypeMeta: o.TypeMeta,
+		Items:    make([]LogsDrilldownDefaults, len(o.Items)),
+	}
+	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
+	for i := 0; i < len(o.Items); i++ {
+		if item, ok := o.Items[i].Copy().(*LogsDrilldownDefaults); ok {
+			cpy.Items[i] = *item
+		}
+	}
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultsList) GetItems() []resource.Object {
+	items := make([]resource.Object, len(o.Items))
+	for i := 0; i < len(o.Items); i++ {
+		items[i] = &o.Items[i]
+	}
+	return items
+}
+
+func (o *LogsDrilldownDefaultsList) SetItems(items []resource.Object) {
+	o.Items = make([]LogsDrilldownDefaults, len(items))
+	for i := 0; i < len(items); i++ {
+		o.Items[i] = *items[i].(*LogsDrilldownDefaults)
+	}
+}
+
+func (o *LogsDrilldownDefaultsList) DeepCopy() *LogsDrilldownDefaultsList {
+	cpy := &LogsDrilldownDefaultsList{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *LogsDrilldownDefaultsList) DeepCopyInto(dst *LogsDrilldownDefaultsList) {
+	resource.CopyObjectInto(dst, o)
+}
+
+// Interface compliance compile-time check
+var _ resource.ListObject = &LogsDrilldownDefaultsList{}
+
+// Copy methods for all subresource types
+
+// DeepCopy creates a full deep copy of Spec
+func (s *Spec) DeepCopy() *Spec {
+	cpy := &Spec{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Spec into another Spec object
+func (s *Spec) DeepCopyInto(dst *Spec) {
+	resource.CopyObjectInto(dst, s)
+}
+
+// DeepCopy creates a full deep copy of Status
+func (s *Status) DeepCopy() *Status {
+	cpy := &Status{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Status into another Status object
+func (s *Status) DeepCopyInto(dst *Status) {
+	resource.CopyObjectInto(dst, s)
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v1alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaLogsDrilldownDefaults = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldownDefaults{}, &LogsDrilldownDefaultsList{}, resource.WithKind("LogsDrilldownDefaults"),
+		resource.WithPlural("logsdrilldowndefaults"), resource.WithScope(resource.NamespacedScope))
+	kindLogsDrilldownDefaults = resource.Kind{
+		Schema: schemaLogsDrilldownDefaults,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &JSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func Kind() resource.Kind {
+	return kindLogsDrilldownDefaults
+}
+
+// Schema returns a resource.SimpleSchema representation of LogsDrilldownDefaults
+func Schema() *resource.SimpleSchema {
+	return schemaLogsDrilldownDefaults
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindLogsDrilldownDefaults

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_spec_gen.go

@@ -0,0 +1,18 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type Spec struct {
+	DefaultFields      []string `json:"defaultFields"`
+	PrettifyJSON       bool     `json:"prettifyJSON"`
+	WrapLogMessage     bool     `json:"wrapLogMessage"`
+	InterceptDismissed bool     `json:"interceptDismissed"`
+}
+
+// NewSpec creates a new Spec object.
+func NewSpec() *Spec {
+	return &Spec{
+		DefaultFields: []string{},
+	}
+}

apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1/logsdrilldowndefaults_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type StatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State StatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewStatusOperatorState creates a new StatusOperatorState object.
+func NewStatusOperatorState() *StatusOperatorState {
+	return &StatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type Status struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]StatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewStatus creates a new Status object.
+func NewStatus() *Status {
+	return &Status{}
+}
+
+// +k8s:openapi-gen=true
+type StatusOperatorStateState string
+
+const (
+	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
+	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
+	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
+)

apps/logsdrilldown/pkg/generated/manifestdata/logsdrilldown_manifest.go

@@ -0,0 +1,150 @@
+//
+// This file is generated by grafana-app-sdk
+// DO NOT EDIT
+//
+
+package manifestdata
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana-app-sdk/app"
+	"github.com/grafana/grafana-app-sdk/resource"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/kube-openapi/pkg/spec3"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+
+	logsdrilldownv1alpha1 "github.com/grafana/grafana/apps/logsdrilldown/pkg/generated/logsdrilldown/v1alpha1"
+	logsdrilldowndefaultcolumnsv1alpha1 "github.com/grafana/grafana/apps/logsdrilldown/pkg/generated/logsdrilldowndefaultcolumns/v1alpha1"
+	logsdrilldowndefaultsv1alpha1 "github.com/grafana/grafana/apps/logsdrilldown/pkg/generated/logsdrilldowndefaults/v1alpha1"
+)
+
+var (
+	rawSchemaLogsDrilldownv1alpha1                   = []byte(`{"LogsDrilldown":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownv1alpha1               app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownv1alpha1, &versionSchemaLogsDrilldownv1alpha1)
+	rawSchemaLogsDrilldownDefaultsv1alpha1           = []byte(`{"LogsDrilldownDefaults":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"defaultFields":{"items":{"type":"string"},"type":"array"},"interceptDismissed":{"type":"boolean"},"prettifyJSON":{"type":"boolean"},"wrapLogMessage":{"type":"boolean"}},"required":["defaultFields","prettifyJSON","wrapLogMessage","interceptDismissed"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownDefaultsv1alpha1       app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownDefaultsv1alpha1, &versionSchemaLogsDrilldownDefaultsv1alpha1)
+	rawSchemaLogsDrilldownDefaultColumnsv1alpha1     = []byte(`{"LogsDefaultColumnsLabel":{"additionalProperties":false,"properties":{"key":{"type":"string"},"value":{"type":"string"}},"required":["key","value"],"type":"object"},"LogsDefaultColumnsLabels":{"items":{"$ref":"#/components/schemas/LogsDefaultColumnsLabel"},"type":"array"},"LogsDefaultColumnsRecord":{"additionalProperties":false,"properties":{"columns":{"items":{"type":"string"},"type":"array"},"labels":{"$ref":"#/components/schemas/LogsDefaultColumnsLabels"}},"required":["columns","labels"],"type":"object"},"LogsDefaultColumnsRecords":{"items":{"$ref":"#/components/schemas/LogsDefaultColumnsRecord"},"type":"array"},"LogsDrilldownDefaultColumns":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"records":{"$ref":"#/components/schemas/LogsDefaultColumnsRecords"}},"required":["records"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	versionSchemaLogsDrilldownDefaultColumnsv1alpha1 app.VersionSchema
+	_                                                = json.Unmarshal(rawSchemaLogsDrilldownDefaultColumnsv1alpha1, &versionSchemaLogsDrilldownDefaultColumnsv1alpha1)
+)
+
+var appManifestData = app.ManifestData{
+	AppName:          "logsdrilldown",
+	Group:            "logsdrilldown.grafana.app",
+	PreferredVersion: "v1alpha1",
+	Versions: []app.ManifestVersion{
+		{
+			Name:   "v1alpha1",
+			Served: true,
+			Kinds: []app.ManifestVersionKind{
+				{
+					Kind:       "LogsDrilldown",
+					Plural:     "LogsDrilldowns",
+					Scope:      "Namespaced",
+					Conversion: false,
+					Schema:     &versionSchemaLogsDrilldownv1alpha1,
+				},
+
+				{
+					Kind:       "LogsDrilldownDefaults",
+					Plural:     "LogsDrilldownDefaults",
+					Scope:      "Namespaced",
+					Conversion: false,
+					Schema:     &versionSchemaLogsDrilldownDefaultsv1alpha1,
+				},
+
+				{
+					Kind:       "LogsDrilldownDefaultColumns",
+					Plural:     "LogsDrilldownDefaultColumns",
+					Scope:      "Namespaced",
+					Conversion: false,
+					Schema:     &versionSchemaLogsDrilldownDefaultColumnsv1alpha1,
+				},
+			},
+			Routes: app.ManifestVersionRoutes{
+				Namespaced: map[string]spec3.PathProps{},
+				Cluster:    map[string]spec3.PathProps{},
+				Schemas:    map[string]spec.Schema{},
+			},
+		},
+	},
+}
+
+func LocalManifest() app.Manifest {
+	return app.NewEmbeddedManifest(appManifestData)
+}
+
+func RemoteManifest() app.Manifest {
+	return app.NewAPIServerManifest("logsdrilldown")
+}
+
+var kindVersionToGoType = map[string]resource.Kind{
+	"LogsDrilldown/v1alpha1":               logsdrilldownv1alpha1.Kind(),
+	"LogsDrilldownDefaults/v1alpha1":       logsdrilldowndefaultsv1alpha1.Kind(),
+	"LogsDrilldownDefaultColumns/v1alpha1": logsdrilldowndefaultcolumnsv1alpha1.Kind(),
+}
+
+// ManifestGoTypeAssociator returns the associated resource.Kind instance for a given Kind and Version, if one exists.
+// If there is no association for the provided Kind and Version, exists will return false.
+func ManifestGoTypeAssociator(kind, version string) (goType resource.Kind, exists bool) {
+	goType, exists = kindVersionToGoType[fmt.Sprintf("%s/%s", kind, version)]
+	return goType, exists
+}
+
+var customRouteToGoResponseType = map[string]any{}
+
+// ManifestCustomRouteResponsesAssociator returns the associated response go type for a given kind, version, custom route path, and method, if one exists.
+// kind may be empty for custom routes which are not kind subroutes. Leading slashes are removed from subroute paths.
+// If there is no association for the provided kind, version, custom route path, and method, exists will return false.
+// Resource routes (those without a kind) should prefix their route with "<namespace>/" if the route is namespaced (otherwise the route is assumed to be cluster-scope)
+func ManifestCustomRouteResponsesAssociator(kind, version, path, verb string) (goType any, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoResponseType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+var customRouteToGoParamsType = map[string]runtime.Object{}
+
+func ManifestCustomRouteQueryAssociator(kind, version, path, verb string) (goType runtime.Object, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoParamsType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+var customRouteToGoRequestBodyType = map[string]any{}
+
+func ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb string) (goType any, exists bool) {
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}
+	goType, exists = customRouteToGoRequestBodyType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
+	return goType, exists
+}
+
+type GoTypeAssociator struct{}
+
+func NewGoTypeAssociator() *GoTypeAssociator {
+	return &GoTypeAssociator{}
+}
+
+func (g *GoTypeAssociator) KindToGoType(kind, version string) (goType resource.Kind, exists bool) {
+	return ManifestGoTypeAssociator(kind, version)
+}
+func (g *GoTypeAssociator) CustomRouteReturnGoType(kind, version, path, verb string) (goType any, exists bool) {
+	return ManifestCustomRouteResponsesAssociator(kind, version, path, verb)
+}
+func (g *GoTypeAssociator) CustomRouteQueryGoType(kind, version, path, verb string) (goType runtime.Object, exists bool) {
+	return ManifestCustomRouteQueryAssociator(kind, version, path, verb)
+}
+func (g *GoTypeAssociator) CustomRouteRequestBodyGoType(kind, version, path, verb string) (goType any, exists bool) {
+	return ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb)
+}

apps/logsdrilldown/plugin/src/generated/logsdrilldowndefaultcolumns/v1alpha1/logsdrilldowndefaultcolumns_object_gen.ts

@@ -0,0 +1,49 @@
+/*
+ * This file was generated by grafana-app-sdk. DO NOT EDIT.
+ */
+import { Spec } from './types.spec.gen';
+import { Status } from './types.status.gen';
+
+export interface Metadata {
+    name: string;
+    namespace: string;
+    generateName?: string;
+    selfLink?: string;
+    uid?: string;
+    resourceVersion?: string;
+    generation?: number;
+    creationTimestamp?: string;
+    deletionTimestamp?: string;
+    deletionGracePeriodSeconds?: number;
+    labels?: Record<string, string>;
+    annotations?: Record<string, string>;
+    ownerReferences?: OwnerReference[];
+    finalizers?: string[];
+    managedFields?: ManagedFieldsEntry[];
+}
+
+export interface OwnerReference {
+    apiVersion: string;
+    kind: string;
+    name: string;
+    uid: string;
+    controller?: boolean;
+    blockOwnerDeletion?: boolean;
+}
+
+export interface ManagedFieldsEntry {
+    manager?: string;
+    operation?: string;
+    apiVersion?: string;
+    time?: string;
+    fieldsType?: string;
+    subresource?: string;
+}
+
+export interface LogsDrilldownDefaultColumns {
+    kind: string;
+    apiVersion: string;
+    metadata: Metadata;
+    spec: Spec;
+    status: Status;
+}

apps/logsdrilldown/plugin/src/generated/logsdrilldowndefaultcolumns/v1alpha1/types.metadata.gen.ts

@@ -0,0 +1,30 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+export interface Metadata {
+	updateTimestamp: string;
+	createdBy: string;
+	uid: string;
+	creationTimestamp: string;
+	deletionTimestamp?: string;
+	finalizers: string[];
+	resourceVersion: string;
+	generation: number;
+	updatedBy: string;
+	labels: Record<string, string>;
+}
+
+export const defaultMetadata = (): Metadata => ({
+	updateTimestamp: "",
+	createdBy: "",
+	uid: "",
+	creationTimestamp: "",
+	finalizers: [],
+	resourceVersion: "",
+	generation: 0,
+	updatedBy: "",
+	labels: {},
+});
+

apps/logsdrilldown/plugin/src/generated/logsdrilldowndefaultcolumns/v1alpha1/types.spec.gen.ts

@@ -0,0 +1,38 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+export type LogsDefaultColumnsRecords = LogsDefaultColumnsRecord[];
+
+export const defaultLogsDefaultColumnsRecords = (): LogsDefaultColumnsRecords => ([]);
+
+export interface LogsDefaultColumnsRecord {
+	columns: string[];
+	labels: LogsDefaultColumnsLabels;
+}
+
+export const defaultLogsDefaultColumnsRecord = (): LogsDefaultColumnsRecord => ({
+	columns: [],
+	labels: defaultLogsDefaultColumnsLabels(),
+});
+
+export type LogsDefaultColumnsLabels = LogsDefaultColumnsLabel[];
+
+export const defaultLogsDefaultColumnsLabels = (): LogsDefaultColumnsLabels => ([]);
+
+export interface LogsDefaultColumnsLabel {
+	key: string;
+	value: string;
+}
+
+export const defaultLogsDefaultColumnsLabel = (): LogsDefaultColumnsLabel => ({
+	key: "",
+	value: "",
+});
+
+export interface Spec {
+	records: LogsDefaultColumnsRecords;
+}
+
+export const defaultSpec = (): Spec => ({
+	records: defaultLogsDefaultColumnsRecords(),
+});
+

apps/logsdrilldown/plugin/src/generated/logsdrilldowndefaultcolumns/v1alpha1/types.status.gen.ts

@@ -0,0 +1,30 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+export interface OperatorState {
+	// lastEvaluation is the ResourceVersion last evaluated
+	lastEvaluation: string;
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	state: "success" | "in_progress" | "failed";
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	descriptiveState?: string;
+	// details contains any extra information that is operator-specific
+	details?: Record<string, any>;
+}
+
+export const defaultOperatorState = (): OperatorState => ({
+	lastEvaluation: "",
+	state: "success",
+});
+
+export interface Status {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	operatorStates?: Record<string, OperatorState>;
+	// additionalFields is reserved for future use
+	additionalFields?: Record<string, any>;
+}
+
+export const defaultStatus = (): Status => ({
+});
+

apps/plugins/go.mod

@@ -10,11 +10,9 @@ replace github.com/grafana/grafana/pkg/apiserver => ../../pkg/apiserver
 
 require (
 	github.com/emicklei/go-restful/v3 v3.13.0
-	github.com/grafana/authlib/types v0.0.0-20251119142549-be091cf2f4d4
 	github.com/grafana/grafana v0.0.0-00010101000000-000000000000
 	github.com/grafana/grafana-app-sdk v0.48.5
 	github.com/grafana/grafana-app-sdk/logging v0.48.3
-	github.com/grafana/grafana/pkg/apimachinery v0.0.0
 	github.com/stretchr/testify v1.11.1
 	k8s.io/apimachinery v0.34.2
 	k8s.io/apiserver v0.34.2
@@ -78,11 +76,13 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba // 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
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect
 	github.com/grafana/grafana-aws-sdk v1.3.0 // indirect
 	github.com/grafana/grafana-azure-sdk-go/v2 v2.3.1 // indirect
 	github.com/grafana/grafana-plugin-sdk-go v0.284.0 // indirect
+	github.com/grafana/grafana/pkg/apimachinery v0.0.0 // indirect
 	github.com/grafana/grafana/pkg/apiserver v0.0.0 // indirect
 	github.com/grafana/otel-profiling-go v0.5.1 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect

apps/plugins/pkg/app/app.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"fmt"
+	"sync"
 
 	"github.com/grafana/grafana-app-sdk/app"
 	"github.com/grafana/grafana-app-sdk/k8s"
@@ -16,7 +17,6 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 
-	authlib "github.com/grafana/authlib/types"
 	pluginsappapis "github.com/grafana/grafana/apps/plugins/pkg/apis"
 	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
 	"github.com/grafana/grafana/apps/plugins/pkg/app/meta"
@@ -69,6 +69,7 @@ type PluginAppConfig struct {
 }
 
 func ProvideAppInstaller(
+	authorizer authorizer.Authorizer,
 	metaProviderManager *meta.ProviderManager,
 ) (*PluginAppInstaller, error) {
 	specificConfig := &PluginAppConfig{
@@ -87,31 +88,30 @@ func ProvideAppInstaller(
 
 	appInstaller := &PluginAppInstaller{
 		AppInstaller: defaultInstaller,
+		authorizer:   authorizer,
 		metaManager:  metaProviderManager,
 		ready:        make(chan struct{}),
 	}
 	return appInstaller, nil
 }
 
-func (p *PluginAppInstaller) WithAccessChecker(access authlib.AccessChecker) *PluginAppInstaller {
-	p.access = access
-	return p
-}
-
 type PluginAppInstaller struct {
 	appsdkapiserver.AppInstaller
 	metaManager *meta.ProviderManager
-	access      authlib.AccessChecker
+	authorizer  authorizer.Authorizer
 
 	// restConfig is set during InitializeApp and used by the client factory
 	restConfig *restclient.Config
 	ready      chan struct{}
+	readyOnce  sync.Once
 }
 
 func (p *PluginAppInstaller) InitializeApp(restConfig restclient.Config) error {
 	if p.restConfig == nil {
 		p.restConfig = &restConfig
-		close(p.ready)
+		p.readyOnce.Do(func() {
+			close(p.ready)
+		})
 	}
 	return p.AppInstaller.InitializeApp(restConfig)
 }
@@ -149,34 +149,5 @@ func (p *PluginAppInstaller) InstallAPIs(
 }
 
 func (p *PluginAppInstaller) GetAuthorizer() authorizer.Authorizer {
-	if p.access == nil {
-		return nil
-	}
-
-	return authorizer.AuthorizerFunc(
-		func(ctx context.Context, a authorizer.Attributes) (decision authorizer.Decision, reason string, err error) {
-			info, ok := authlib.AuthInfoFrom(ctx)
-			if !ok {
-				return authorizer.DecisionDeny, "failed to get auth info", nil
-			}
-
-			res, err := p.access.Check(ctx, info, authlib.CheckRequest{
-				Verb:        a.GetVerb(),
-				Group:       a.GetAPIGroup(),
-				Resource:    a.GetResource(),
-				Name:        a.GetName(),
-				Namespace:   a.GetNamespace(),
-				Subresource: a.GetSubresource(),
-				Path:        a.GetPath(),
-			}, "")
-			if err != nil {
-				return authorizer.DecisionDeny, "failed to perform authorization", err
-			}
-
-			if !res.Allowed {
-				return authorizer.DecisionDeny, "permission denied", nil
-			}
-
-			return authorizer.DecisionAllow, "", nil
-		})
+	return p.authorizer
 }

apps/plugins/pkg/app/authorizer.go

@@ -1,32 +0,0 @@
-package app
-
-import (
-	"context"
-
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-
-	"github.com/grafana/grafana/pkg/apimachinery/identity"
-)
-
-func GetAuthorizer() authorizer.Authorizer {
-	return authorizer.AuthorizerFunc(func(
-		ctx context.Context, attr authorizer.Attributes,
-	) (authorized authorizer.Decision, reason string, err error) {
-		if !attr.IsResourceRequest() {
-			return authorizer.DecisionNoOpinion, "", nil
-		}
-
-		// require a user
-		u, err := identity.GetRequester(ctx)
-		if err != nil {
-			return authorizer.DecisionDeny, "valid user is required", err
-		}
-
-		// check if is admin
-		if u.HasRole(identity.RoleAdmin) {
-			return authorizer.DecisionAllow, "", nil
-		}
-
-		return authorizer.DecisionDeny, "forbidden", nil
-	})
-}

apps/plugins/pkg/app/meta/catalog.go

@@ -15,29 +15,29 @@ import (
 )
 
 const (
-	defaultCloudTTL = 1 * time.Hour
+	defaultCatalogTTL = 1 * time.Hour
 )
 
-// CloudProvider retrieves plugin metadata from the grafana.com API.
-type CloudProvider struct {
+// CatalogProvider retrieves plugin metadata from the grafana.com API.
+type CatalogProvider struct {
 	httpClient       *http.Client
 	grafanaComAPIURL string
 	log              logging.Logger
 	ttl              time.Duration
 }
 
-// NewCloudProvider creates a new CloudProvider that fetches metadata from grafana.com.
-func NewCloudProvider(grafanaComAPIURL string) *CloudProvider {
-	return NewCloudProviderWithTTL(grafanaComAPIURL, defaultCloudTTL)
+// NewCatalogProvider creates a new CatalogProvider that fetches metadata from grafana.com.
+func NewCatalogProvider(grafanaComAPIURL string) *CatalogProvider {
+	return NewCatalogProviderWithTTL(grafanaComAPIURL, defaultCatalogTTL)
 }
 
-// NewCloudProviderWithTTL creates a new CloudProvider with a custom TTL.
-func NewCloudProviderWithTTL(grafanaComAPIURL string, ttl time.Duration) *CloudProvider {
+// NewCatalogProviderWithTTL creates a new CatalogProvider with a custom TTL.
+func NewCatalogProviderWithTTL(grafanaComAPIURL string, ttl time.Duration) *CatalogProvider {
 	if grafanaComAPIURL == "" {
 		grafanaComAPIURL = "https://grafana.com/api/plugins"
 	}
 
-	return &CloudProvider{
+	return &CatalogProvider{
 		httpClient: &http.Client{
 			Timeout: 10 * time.Second,
 		},
@@ -49,7 +49,7 @@ func NewCloudProviderWithTTL(grafanaComAPIURL string, ttl time.Duration) *CloudP
 
 // GetMeta fetches plugin metadata from grafana.com API endpoint:
 // GET /api/plugins/{pluginId}/versions/{version}
-func (p *CloudProvider) GetMeta(ctx context.Context, pluginID, version string) (*Result, error) {
+func (p *CatalogProvider) GetMeta(ctx context.Context, pluginID, version string) (*Result, error) {
 	u, err := url.Parse(p.grafanaComAPIURL)
 	if err != nil {
 		return nil, fmt.Errorf("invalid grafana.com API URL: %w", err)

apps/plugins/pkg/app/meta/catalog_test.go

@@ -15,7 +15,7 @@ import (
 	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
 )
 
-func TestCloudProvider_GetMeta(t *testing.T) {
+func TestCatalogProvider_GetMeta(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("successfully fetches plugin metadata", func(t *testing.T) {
@@ -44,13 +44,13 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		}))
 		defer server.Close()
 
-		provider := NewCloudProvider(server.URL + "/api/plugins")
+		provider := NewCatalogProvider(server.URL + "/api/plugins")
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		require.NoError(t, err)
 		require.NotNil(t, result)
 		assert.Equal(t, expectedMeta, result.Meta)
-		assert.Equal(t, defaultCloudTTL, result.TTL)
+		assert.Equal(t, defaultCatalogTTL, result.TTL)
 	})
 
 	t.Run("returns ErrMetaNotFound for 404 status", func(t *testing.T) {
@@ -59,7 +59,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		}))
 		defer server.Close()
 
-		provider := NewCloudProvider(server.URL + "/api/plugins")
+		provider := NewCatalogProvider(server.URL + "/api/plugins")
 		result, err := provider.GetMeta(ctx, "nonexistent-plugin", "1.0.0")
 
 		assert.Error(t, err)
@@ -73,7 +73,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		}))
 		defer server.Close()
 
-		provider := NewCloudProvider(server.URL + "/api/plugins")
+		provider := NewCatalogProvider(server.URL + "/api/plugins")
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		assert.Error(t, err)
@@ -89,7 +89,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		}))
 		defer server.Close()
 
-		provider := NewCloudProvider(server.URL + "/api/plugins")
+		provider := NewCatalogProvider(server.URL + "/api/plugins")
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		assert.Error(t, err)
@@ -98,7 +98,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 	})
 
 	t.Run("returns error for invalid API URL", func(t *testing.T) {
-		provider := NewCloudProvider("://invalid-url")
+		provider := NewCatalogProvider("://invalid-url")
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		assert.Error(t, err)
@@ -127,7 +127,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		}))
 		defer server.Close()
 
-		provider := NewCloudProviderWithTTL(server.URL+"/api/plugins", customTTL)
+		provider := NewCatalogProviderWithTTL(server.URL+"/api/plugins", customTTL)
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		require.NoError(t, err)
@@ -145,7 +145,7 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
 
-		provider := NewCloudProvider(server.URL + "/api/plugins")
+		provider := NewCatalogProvider(server.URL + "/api/plugins")
 		result, err := provider.GetMeta(ctx, "test-plugin", "1.0.0")
 
 		assert.Error(t, err)
@@ -153,34 +153,34 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 	})
 }
 
-func TestNewCloudProvider(t *testing.T) {
+func TestNewCatalogProvider(t *testing.T) {
 	t.Run("creates provider with default TTL", func(t *testing.T) {
-		provider := NewCloudProvider("https://grafana.com/api/plugins")
-		assert.Equal(t, defaultCloudTTL, provider.ttl)
+		provider := NewCatalogProvider("https://grafana.com/api/plugins")
+		assert.Equal(t, defaultCatalogTTL, provider.ttl)
 		assert.NotNil(t, provider.httpClient)
 		assert.Equal(t, "https://grafana.com/api/plugins", provider.grafanaComAPIURL)
 	})
 
 	t.Run("uses default URL when empty", func(t *testing.T) {
-		provider := NewCloudProvider("")
+		provider := NewCatalogProvider("")
 		assert.Equal(t, "https://grafana.com/api/plugins", provider.grafanaComAPIURL)
 	})
 }
 
-func TestNewCloudProviderWithTTL(t *testing.T) {
+func TestNewCatalogProviderWithTTL(t *testing.T) {
 	t.Run("creates provider with custom TTL", func(t *testing.T) {
 		customTTL := 2 * time.Hour
-		provider := NewCloudProviderWithTTL("https://grafana.com/api/plugins", customTTL)
+		provider := NewCatalogProviderWithTTL("https://grafana.com/api/plugins", customTTL)
 		assert.Equal(t, customTTL, provider.ttl)
 	})
 
 	t.Run("accepts zero TTL", func(t *testing.T) {
-		provider := NewCloudProviderWithTTL("https://grafana.com/api/plugins", 0)
+		provider := NewCatalogProviderWithTTL("https://grafana.com/api/plugins", 0)
 		assert.Equal(t, time.Duration(0), provider.ttl)
 	})
 
 	t.Run("uses default URL when empty", func(t *testing.T) {
-		provider := NewCloudProviderWithTTL("", defaultCloudTTL)
+		provider := NewCatalogProviderWithTTL("", defaultCatalogTTL)
 		assert.Equal(t, "https://grafana.com/api/plugins", provider.grafanaComAPIURL)
 	})
 }

docs/sources/datasources/elasticsearch/configure-elasticsearch-data-source.md

@@ -174,6 +174,8 @@ You can also override this setting in a dashboard panel under its data source op
 Frozen indices are [deprecated in Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/frozen-indices.html) since v7.14.
 {{< /admonition >}}
 
+- **Default query mode** - Specifies which query mode the data source uses by default. Options are `Metrics`, `Logs`, `Raw data`, and `Raw document`. The default is `Metrics`.
+
 ### Logs
 
 In this section you can configure which fields the data source uses for log messages and log levels.

eslint-suppressions.json

@@ -669,7 +669,7 @@
   },
   "packages/grafana-ui/src/components/InteractiveTable/InteractiveTable.story.tsx": {
     "no-restricted-syntax": {
-      "count": 3
+      "count": 2
     }
   },
   "packages/grafana-ui/src/components/JSONFormatter/json_explorer/json_explorer.ts": {
@@ -886,11 +886,6 @@
       "count": 1
     }
   },
-  "packages/grafana-ui/src/components/VizLegend/VizLegend.story.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
   "packages/grafana-ui/src/components/VizLegend/types.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 2

go.work.sum

@@ -267,8 +267,6 @@ gioui.org v0.0.0-20210308172011-57750fc8a0a6 h1:K72hopUosKG3ntOPNG4OzzbuhxGuVf06
 git.sr.ht/~sbinet/gg v0.6.0 h1:RIzgkizAk+9r7uPzf/VfbJHBMKUr0F5hRFxTUGMnt38=
 git.sr.ht/~sbinet/gg v0.6.0/go.mod h1:uucygbfC9wVPQIfrmwM2et0imr8L7KQWywX0xpFMm94=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas=
@@ -604,8 +602,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/creasty/defaults v1.8.0 h1:z27FJxCAa0JKt3utc0sCImAEb+spPucmKoOdLHvHYKk=
 github.com/creasty/defaults v1.8.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
 github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo=
@@ -928,6 +924,7 @@ github.com/grafana/grafana/apps/preferences v0.0.0-20250805120145-0c5a00302924 h
 github.com/grafana/grafana/apps/preferences v0.0.0-20250805120145-0c5a00302924/go.mod h1:NQlHMO5fHhjexw71wVjv522532NRvFg5F4tcjUEktjs=
 github.com/grafana/grafana/apps/preferences v0.0.0-20250805123034-066163d71001 h1:y2AHkdji2I+zXv8rsSC8OjWEzJJjqW5OlmCsZR5+RuU=
 github.com/grafana/grafana/apps/preferences v0.0.0-20250805123034-066163d71001/go.mod h1:NQlHMO5fHhjexw71wVjv522532NRvFg5F4tcjUEktjs=
+github.com/grafana/grafana/apps/quotas v0.0.0-20251209171149-4b999cd94388/go.mod h1:M7bV60iRB61y0ISPG1HX/oNLZtlh0ZF22rUYwNkAKjo=
 github.com/grafana/grafana/pkg/aggregator v0.0.0-20250121113133-e747350fee2d/go.mod h1:1sq0guad+G4SUTlBgx7SXfhnzy7D86K/LcVOtiQCiMA=
 github.com/grafana/grafana/pkg/semconv v0.0.0-20250121113133-e747350fee2d/go.mod h1:tfLnBpPYgwrBMRz4EXqPCZJyCjEG4Ev37FSlXnocJ2c=
 github.com/grafana/grafana/pkg/storage/unified/apistore v0.0.0-20250121113133-e747350fee2d/go.mod h1:CXpwZ3Mkw6xVlGKc0SqUxqXCP3Uv182q6qAQnLaLxRg=
@@ -2078,7 +2075,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.
 google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA=
 google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
 google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk=
-google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822 h1:zWFRixYR5QlotL+Uv3YfsPRENIrQFXiGs+iwqel6fOQ=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY=
@@ -2108,7 +2104,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=

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

@@ -1,5 +1,10 @@
 import { api } from './baseAPI';
-export const addTagTypes = ['API Discovery', 'LogsDrilldownDefaults', 'LogsDrilldown'] as const;
+export const addTagTypes = [
+  'API Discovery',
+  'LogsDrilldownDefaultColumns',
+  'LogsDrilldownDefaults',
+  'LogsDrilldown',
+] as const;
 const injectedRtkApi = api
   .enhanceEndpoints({
     addTagTypes,
@@ -10,6 +15,183 @@ const injectedRtkApi = api
         query: () => ({ url: `/` }),
         providesTags: ['API Discovery'],
       }),
+      listLogsDrilldownDefaultColumns: build.query<
+        ListLogsDrilldownDefaultColumnsApiResponse,
+        ListLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns`,
+          params: {
+            pretty: queryArg.pretty,
+            allowWatchBookmarks: queryArg.allowWatchBookmarks,
+            continue: queryArg['continue'],
+            fieldSelector: queryArg.fieldSelector,
+            labelSelector: queryArg.labelSelector,
+            limit: queryArg.limit,
+            resourceVersion: queryArg.resourceVersion,
+            resourceVersionMatch: queryArg.resourceVersionMatch,
+            sendInitialEvents: queryArg.sendInitialEvents,
+            timeoutSeconds: queryArg.timeoutSeconds,
+            watch: queryArg.watch,
+          },
+        }),
+        providesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      createLogsDrilldownDefaultColumns: build.mutation<
+        CreateLogsDrilldownDefaultColumnsApiResponse,
+        CreateLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns`,
+          method: 'POST',
+          body: queryArg.logsDrilldownDefaultColumns,
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            fieldManager: queryArg.fieldManager,
+            fieldValidation: queryArg.fieldValidation,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      deletecollectionLogsDrilldownDefaultColumns: build.mutation<
+        DeletecollectionLogsDrilldownDefaultColumnsApiResponse,
+        DeletecollectionLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns`,
+          method: 'DELETE',
+          params: {
+            pretty: queryArg.pretty,
+            continue: queryArg['continue'],
+            dryRun: queryArg.dryRun,
+            fieldSelector: queryArg.fieldSelector,
+            gracePeriodSeconds: queryArg.gracePeriodSeconds,
+            ignoreStoreReadErrorWithClusterBreakingPotential: queryArg.ignoreStoreReadErrorWithClusterBreakingPotential,
+            labelSelector: queryArg.labelSelector,
+            limit: queryArg.limit,
+            orphanDependents: queryArg.orphanDependents,
+            propagationPolicy: queryArg.propagationPolicy,
+            resourceVersion: queryArg.resourceVersion,
+            resourceVersionMatch: queryArg.resourceVersionMatch,
+            sendInitialEvents: queryArg.sendInitialEvents,
+            timeoutSeconds: queryArg.timeoutSeconds,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      getLogsDrilldownDefaultColumns: build.query<
+        GetLogsDrilldownDefaultColumnsApiResponse,
+        GetLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}`,
+          params: {
+            pretty: queryArg.pretty,
+          },
+        }),
+        providesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      replaceLogsDrilldownDefaultColumns: build.mutation<
+        ReplaceLogsDrilldownDefaultColumnsApiResponse,
+        ReplaceLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}`,
+          method: 'PUT',
+          body: queryArg.logsDrilldownDefaultColumns,
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            fieldManager: queryArg.fieldManager,
+            fieldValidation: queryArg.fieldValidation,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      deleteLogsDrilldownDefaultColumns: build.mutation<
+        DeleteLogsDrilldownDefaultColumnsApiResponse,
+        DeleteLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}`,
+          method: 'DELETE',
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            gracePeriodSeconds: queryArg.gracePeriodSeconds,
+            ignoreStoreReadErrorWithClusterBreakingPotential: queryArg.ignoreStoreReadErrorWithClusterBreakingPotential,
+            orphanDependents: queryArg.orphanDependents,
+            propagationPolicy: queryArg.propagationPolicy,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      updateLogsDrilldownDefaultColumns: build.mutation<
+        UpdateLogsDrilldownDefaultColumnsApiResponse,
+        UpdateLogsDrilldownDefaultColumnsApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}`,
+          method: 'PATCH',
+          body: queryArg.patch,
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            fieldManager: queryArg.fieldManager,
+            fieldValidation: queryArg.fieldValidation,
+            force: queryArg.force,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      getLogsDrilldownDefaultColumnsStatus: build.query<
+        GetLogsDrilldownDefaultColumnsStatusApiResponse,
+        GetLogsDrilldownDefaultColumnsStatusApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}/status`,
+          params: {
+            pretty: queryArg.pretty,
+          },
+        }),
+        providesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      replaceLogsDrilldownDefaultColumnsStatus: build.mutation<
+        ReplaceLogsDrilldownDefaultColumnsStatusApiResponse,
+        ReplaceLogsDrilldownDefaultColumnsStatusApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}/status`,
+          method: 'PUT',
+          body: queryArg.logsDrilldownDefaultColumns,
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            fieldManager: queryArg.fieldManager,
+            fieldValidation: queryArg.fieldValidation,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
+      updateLogsDrilldownDefaultColumnsStatus: build.mutation<
+        UpdateLogsDrilldownDefaultColumnsStatusApiResponse,
+        UpdateLogsDrilldownDefaultColumnsStatusApiArg
+      >({
+        query: (queryArg) => ({
+          url: `/logsdrilldowndefaultcolumns/${queryArg.name}/status`,
+          method: 'PATCH',
+          body: queryArg.patch,
+          params: {
+            pretty: queryArg.pretty,
+            dryRun: queryArg.dryRun,
+            fieldManager: queryArg.fieldManager,
+            fieldValidation: queryArg.fieldValidation,
+            force: queryArg.force,
+          },
+        }),
+        invalidatesTags: ['LogsDrilldownDefaultColumns'],
+      }),
       listLogsDrilldownDefaults: build.query<ListLogsDrilldownDefaultsApiResponse, ListLogsDrilldownDefaultsApiArg>({
         query: (queryArg) => ({
           url: `/logsdrilldowndefaults`,
@@ -340,6 +522,218 @@ const injectedRtkApi = api
 export { injectedRtkApi as generatedAPI };
 export type GetApiResourcesApiResponse = /** status 200 OK */ ApiResourceList;
 export type GetApiResourcesApiArg = void;
+export type ListLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */ LogsDrilldownDefaultColumnsList;
+export type ListLogsDrilldownDefaultColumnsApiArg = {
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** allowWatchBookmarks requests watch events with type "BOOKMARK". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored. */
+  allowWatchBookmarks?: boolean;
+  /** The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the "next key".
+    
+    This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications. */
+  continue?: string;
+  /** A selector to restrict the list of returned objects by their fields. Defaults to everything. */
+  fieldSelector?: string;
+  /** A selector to restrict the list of returned objects by their labels. Defaults to everything. */
+  labelSelector?: string;
+  /** limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.
+    
+    The server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned. */
+  limit?: number;
+  /** resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.
+    
+    Defaults to unset */
+  resourceVersion?: string;
+  /** resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.
+    
+    Defaults to unset */
+  resourceVersionMatch?: string;
+  /** `sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic "Bookmark" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `"k8s.io/initial-events-end": "true"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.
+    
+    When `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan
+      is interpreted as "data at least as new as the provided `resourceVersion`"
+      and the bookmark event is send when the state is synced
+      to a `resourceVersion` at least as fresh as the one provided by the ListOptions.
+      If `resourceVersion` is unset, this is interpreted as "consistent read" and the
+      bookmark event is send when the state is synced at least to the moment
+      when request started being processed.
+    - `resourceVersionMatch` set to any other value or unset
+      Invalid error is returned.
+    
+    Defaults to true if `resourceVersion=""` or `resourceVersion="0"` (for backward compatibility reasons) and to false otherwise. */
+  sendInitialEvents?: boolean;
+  /** Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity. */
+  timeoutSeconds?: number;
+  /** Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. */
+  watch?: boolean;
+};
+export type CreateLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */
+  | LogsDrilldownDefaultColumns
+  | /** status 201 Created */ LogsDrilldownDefaultColumns
+  | /** status 202 Accepted */ LogsDrilldownDefaultColumns;
+export type CreateLogsDrilldownDefaultColumnsApiArg = {
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. */
+  fieldManager?: string;
+  /** fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered. */
+  fieldValidation?: string;
+  logsDrilldownDefaultColumns: LogsDrilldownDefaultColumns;
+};
+export type DeletecollectionLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */ Status;
+export type DeletecollectionLogsDrilldownDefaultColumnsApiArg = {
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the "next key".
+    
+    This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications. */
+  continue?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** A selector to restrict the list of returned objects by their fields. Defaults to everything. */
+  fieldSelector?: string;
+  /** The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately. */
+  gracePeriodSeconds?: number;
+  /** if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it */
+  ignoreStoreReadErrorWithClusterBreakingPotential?: boolean;
+  /** A selector to restrict the list of returned objects by their labels. Defaults to everything. */
+  labelSelector?: string;
+  /** limit is a maximum number of responses to return for a list call. If more items exist, the server will set the `continue` field on the list metadata to a value that can be used with the same initial query to retrieve the next set of results. Setting a limit may return fewer than the requested amount of items (up to zero items) in the event all requested objects are filtered out and clients should only use the presence of the continue field to determine whether more results are available. Servers may choose not to support the limit argument and will return all of the available results. If limit is specified and the continue field is empty, clients may assume that no more results are available. This field is not supported if watch is true.
+    
+    The server guarantees that the objects returned when using continue will be identical to issuing a single list call without a limit - that is, no objects created, modified, or deleted after the first request is issued will be included in any subsequent continued requests. This is sometimes referred to as a consistent snapshot, and ensures that a client that is using limit to receive smaller chunks of a very large result can ensure they see all possible objects. If objects are updated during a chunked list the version of the object that was present at the time the first list result was calculated is returned. */
+  limit?: number;
+  /** Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the "orphan" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both. */
+  orphanDependents?: boolean;
+  /** Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground. */
+  propagationPolicy?: string;
+  /** resourceVersion sets a constraint on what resource versions a request may be served from. See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.
+    
+    Defaults to unset */
+  resourceVersion?: string;
+  /** resourceVersionMatch determines how resourceVersion is applied to list calls. It is highly recommended that resourceVersionMatch be set for list calls where resourceVersion is set See https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions for details.
+    
+    Defaults to unset */
+  resourceVersionMatch?: string;
+  /** `sendInitialEvents=true` may be set together with `watch=true`. In that case, the watch stream will begin with synthetic events to produce the current state of objects in the collection. Once all such events have been sent, a synthetic "Bookmark" event  will be sent. The bookmark will report the ResourceVersion (RV) corresponding to the set of objects, and be marked with `"k8s.io/initial-events-end": "true"` annotation. Afterwards, the watch stream will proceed as usual, sending watch events corresponding to changes (subsequent to the RV) to objects watched.
+    
+    When `sendInitialEvents` option is set, we require `resourceVersionMatch` option to also be set. The semantic of the watch request is as following: - `resourceVersionMatch` = NotOlderThan
+      is interpreted as "data at least as new as the provided `resourceVersion`"
+      and the bookmark event is send when the state is synced
+      to a `resourceVersion` at least as fresh as the one provided by the ListOptions.
+      If `resourceVersion` is unset, this is interpreted as "consistent read" and the
+      bookmark event is send when the state is synced at least to the moment
+      when request started being processed.
+    - `resourceVersionMatch` set to any other value or unset
+      Invalid error is returned.
+    
+    Defaults to true if `resourceVersion=""` or `resourceVersion="0"` (for backward compatibility reasons) and to false otherwise. */
+  sendInitialEvents?: boolean;
+  /** Timeout for the list/watch call. This limits the duration of the call, regardless of any activity or inactivity. */
+  timeoutSeconds?: number;
+};
+export type GetLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */ LogsDrilldownDefaultColumns;
+export type GetLogsDrilldownDefaultColumnsApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+};
+export type ReplaceLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */
+  | LogsDrilldownDefaultColumns
+  | /** status 201 Created */ LogsDrilldownDefaultColumns;
+export type ReplaceLogsDrilldownDefaultColumnsApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. */
+  fieldManager?: string;
+  /** fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered. */
+  fieldValidation?: string;
+  logsDrilldownDefaultColumns: LogsDrilldownDefaultColumns;
+};
+export type DeleteLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */
+  | Status
+  | /** status 202 Accepted */ Status;
+export type DeleteLogsDrilldownDefaultColumnsApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately. */
+  gracePeriodSeconds?: number;
+  /** if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it */
+  ignoreStoreReadErrorWithClusterBreakingPotential?: boolean;
+  /** Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the "orphan" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both. */
+  orphanDependents?: boolean;
+  /** Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy. Acceptable values are: 'Orphan' - orphan the dependents; 'Background' - allow the garbage collector to delete the dependents in the background; 'Foreground' - a cascading policy that deletes all dependents in the foreground. */
+  propagationPolicy?: string;
+};
+export type UpdateLogsDrilldownDefaultColumnsApiResponse = /** status 200 OK */
+  | LogsDrilldownDefaultColumns
+  | /** status 201 Created */ LogsDrilldownDefaultColumns;
+export type UpdateLogsDrilldownDefaultColumnsApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch). */
+  fieldManager?: string;
+  /** fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered. */
+  fieldValidation?: string;
+  /** Force is going to "force" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests. */
+  force?: boolean;
+  patch: Patch;
+};
+export type GetLogsDrilldownDefaultColumnsStatusApiResponse = /** status 200 OK */ LogsDrilldownDefaultColumns;
+export type GetLogsDrilldownDefaultColumnsStatusApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+};
+export type ReplaceLogsDrilldownDefaultColumnsStatusApiResponse = /** status 200 OK */
+  | LogsDrilldownDefaultColumns
+  | /** status 201 Created */ LogsDrilldownDefaultColumns;
+export type ReplaceLogsDrilldownDefaultColumnsStatusApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. */
+  fieldManager?: string;
+  /** fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered. */
+  fieldValidation?: string;
+  logsDrilldownDefaultColumns: LogsDrilldownDefaultColumns;
+};
+export type UpdateLogsDrilldownDefaultColumnsStatusApiResponse = /** status 200 OK */
+  | LogsDrilldownDefaultColumns
+  | /** status 201 Created */ LogsDrilldownDefaultColumns;
+export type UpdateLogsDrilldownDefaultColumnsStatusApiArg = {
+  /** name of the LogsDrilldownDefaultColumns */
+  name: string;
+  /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
+  pretty?: string;
+  /** When present, indicates that modifications should not be persisted. An invalid or unrecognized dryRun directive will result in an error response and no further processing of the request. Valid values are: - All: all dry run stages will be processed */
+  dryRun?: string;
+  /** fieldManager is a name associated with the actor or entity that is making these changes. The value must be less than or 128 characters long, and only contain printable characters, as defined by https://golang.org/pkg/unicode/#IsPrint. This field is required for apply requests (application/apply-patch) but optional for non-apply patch types (JsonPatch, MergePatch, StrategicMergePatch). */
+  fieldManager?: string;
+  /** fieldValidation instructs the server on how to handle objects in the request (POST/PUT/PATCH) containing unknown or duplicate fields. Valid values are: - Ignore: This will ignore any unknown fields that are silently dropped from the object, and will ignore all but the last duplicate field that the decoder encounters. This is the default behavior prior to v1.23. - Warn: This will send a warning via the standard warning response header for each unknown field that is dropped from the object, and for each duplicate field that is encountered. The request will still succeed if there are no other errors, and will only persist the last of any duplicate fields. This is the default in v1.23+ - Strict: This will fail the request with a BadRequest error if any unknown fields would be dropped from the object, or if any duplicate fields are present. The error returned from the server will contain all unknown and duplicate fields encountered. */
+  fieldValidation?: string;
+  /** Force is going to "force" Apply requests. It means user will re-acquire conflicting fields owned by other people. Force flag must be unset for non-apply patch requests. */
+  force?: boolean;
+  patch: Patch;
+};
 export type ListLogsDrilldownDefaultsApiResponse = /** status 200 OK */ LogsDrilldownDefaultsList;
 export type ListLogsDrilldownDefaultsApiArg = {
   /** If 'true', then the output is pretty printed. Defaults to 'false' unless the user-agent indicates a browser or command-line HTTP tool (curl and wget). */
@@ -874,13 +1268,21 @@ export type ObjectMeta = {
     Populated by the system. Read-only. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids */
   uid?: string;
 };
-export type LogsDrilldownDefaultsSpec = {
-  defaultFields: string[];
-  interceptDismissed: boolean;
-  prettifyJSON: boolean;
-  wrapLogMessage: boolean;
+export type LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel = {
+  key: string;
+  value: string;
 };
-export type LogsDrilldownDefaultsOperatorState = {
+export type LogsDrilldownDefaultColumnsLogsDefaultColumnsLabels = LogsDrilldownDefaultColumnsLogsDefaultColumnsLabel[];
+export type LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord = {
+  columns: string[];
+  labels: LogsDrilldownDefaultColumnsLogsDefaultColumnsLabels;
+};
+export type LogsDrilldownDefaultColumnsLogsDefaultColumnsRecords =
+  LogsDrilldownDefaultColumnsLogsDefaultColumnsRecord[];
+export type LogsDrilldownDefaultColumnsSpec = {
+  records: LogsDrilldownDefaultColumnsLogsDefaultColumnsRecords;
+};
+export type LogsDrilldownDefaultColumnsOperatorState = {
   /** descriptiveState is an optional more descriptive state field which has no requirements on format */
   descriptiveState?: string;
   /** details contains any extra information that is operator-specific */
@@ -895,7 +1297,7 @@ export type LogsDrilldownDefaultsOperatorState = {
     It is limited to three possible states for machine evaluation. */
   state: 'success' | 'in_progress' | 'failed';
 };
-export type LogsDrilldownDefaultsStatus = {
+export type LogsDrilldownDefaultColumnsStatus = {
   /** additionalFields is reserved for future use */
   additionalFields?: {
     [key: string]: {
@@ -905,17 +1307,17 @@ export type LogsDrilldownDefaultsStatus = {
   /** operatorStates is a map of operator ID to operator state evaluations.
     Any operator which consumes this kind SHOULD add its state evaluation information to this field. */
   operatorStates?: {
-    [key: string]: LogsDrilldownDefaultsOperatorState;
+    [key: string]: LogsDrilldownDefaultColumnsOperatorState;
   };
 };
-export type LogsDrilldownDefaults = {
+export type LogsDrilldownDefaultColumns = {
   /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
   apiVersion: string;
   /** Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds */
   kind: string;
   metadata: ObjectMeta;
-  spec: LogsDrilldownDefaultsSpec;
-  status?: LogsDrilldownDefaultsStatus;
+  spec: LogsDrilldownDefaultColumnsSpec;
+  status?: LogsDrilldownDefaultColumnsStatus;
 };
 export type ListMeta = {
   /** continue may be set if the user set a limit on the number of items returned, and indicates that the server has more data available. The value is opaque and may be used to issue another request to the endpoint that served this list to retrieve the next set of available objects. Continuing a consistent list may not be possible if the server configuration has changed or more than a few minutes have passed. The resourceVersion field returned when using this continue value will be identical to the value in the first response, unless you have received this token from an error message. */
@@ -927,10 +1329,10 @@ export type ListMeta = {
   /** Deprecated: selfLink is a legacy read-only field that is no longer populated by the system. */
   selfLink?: string;
 };
-export type LogsDrilldownDefaultsList = {
+export type LogsDrilldownDefaultColumnsList = {
   /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
   apiVersion?: string;
-  items: LogsDrilldownDefaults[];
+  items: LogsDrilldownDefaultColumns[];
   /** Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds */
   kind?: string;
   metadata: ListMeta;
@@ -980,6 +1382,57 @@ export type Status = {
   status?: string;
 };
 export type Patch = object;
+export type LogsDrilldownDefaultsSpec = {
+  defaultFields: string[];
+  interceptDismissed: boolean;
+  prettifyJSON: boolean;
+  wrapLogMessage: boolean;
+};
+export type LogsDrilldownDefaultsOperatorState = {
+  /** descriptiveState is an optional more descriptive state field which has no requirements on format */
+  descriptiveState?: string;
+  /** details contains any extra information that is operator-specific */
+  details?: {
+    [key: string]: {
+      [key: string]: any;
+    };
+  };
+  /** lastEvaluation is the ResourceVersion last evaluated */
+  lastEvaluation: string;
+  /** state describes the state of the lastEvaluation.
+    It is limited to three possible states for machine evaluation. */
+  state: 'success' | 'in_progress' | 'failed';
+};
+export type LogsDrilldownDefaultsStatus = {
+  /** additionalFields is reserved for future use */
+  additionalFields?: {
+    [key: string]: {
+      [key: string]: any;
+    };
+  };
+  /** operatorStates is a map of operator ID to operator state evaluations.
+    Any operator which consumes this kind SHOULD add its state evaluation information to this field. */
+  operatorStates?: {
+    [key: string]: LogsDrilldownDefaultsOperatorState;
+  };
+};
+export type LogsDrilldownDefaults = {
+  /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
+  apiVersion: string;
+  /** Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds */
+  kind: string;
+  metadata: ObjectMeta;
+  spec: LogsDrilldownDefaultsSpec;
+  status?: LogsDrilldownDefaultsStatus;
+};
+export type LogsDrilldownDefaultsList = {
+  /** APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources */
+  apiVersion?: string;
+  items: LogsDrilldownDefaults[];
+  /** Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds */
+  kind?: string;
+  metadata: ListMeta;
+};
 export type LogsDrilldownSpec = {
   defaultFields: string[];
   interceptDismissed: boolean;
@@ -1034,6 +1487,19 @@ export type LogsDrilldownList = {
 export const {
   useGetApiResourcesQuery,
   useLazyGetApiResourcesQuery,
+  useListLogsDrilldownDefaultColumnsQuery,
+  useLazyListLogsDrilldownDefaultColumnsQuery,
+  useCreateLogsDrilldownDefaultColumnsMutation,
+  useDeletecollectionLogsDrilldownDefaultColumnsMutation,
+  useGetLogsDrilldownDefaultColumnsQuery,
+  useLazyGetLogsDrilldownDefaultColumnsQuery,
+  useReplaceLogsDrilldownDefaultColumnsMutation,
+  useDeleteLogsDrilldownDefaultColumnsMutation,
+  useUpdateLogsDrilldownDefaultColumnsMutation,
+  useGetLogsDrilldownDefaultColumnsStatusQuery,
+  useLazyGetLogsDrilldownDefaultColumnsStatusQuery,
+  useReplaceLogsDrilldownDefaultColumnsStatusMutation,
+  useUpdateLogsDrilldownDefaultColumnsStatusMutation,
   useListLogsDrilldownDefaultsQuery,
   useLazyListLogsDrilldownDefaultsQuery,
   useCreateLogsDrilldownDefaultsMutation,