Address some minor comments

Merge remote-tracking branch 'origin/main' into provisioning/implement-export
chore: prune unused eslint suppressions
2025-12-09 13:37:50 +01:00 · 2025-12-09 12:37:51 +01:00 · 2025-12-03 13:22:07 +01:00 · 2025-12-03 13:03:28 +01:00 · 2025-12-03 12:40:15 +01:00 · 2025-12-03 12:33:39 +01:00
410 changed files with 5289 additions and 11723 deletions
@@ -85,7 +85,6 @@
 # Git Sync frontend owned by frontend team as a whole.

 /apps/alerting/ @grafana/alerting-backend
-/apps/quotas/ @grafana/grafana-search-and-storage
 /apps/dashboard/ @grafana/grafana-app-platform-squad @grafana/dashboards-squad
 /apps/folder/ @grafana/grafana-app-platform-squad
 /apps/playlist/ @grafana/grafana-app-platform-squad
@@ -1226,13 +1226,5 @@
    "addToProject": {
      "url": "https://github.com/orgs/grafana/projects/69"
    }
-  },
-  {
-    "type": "label",
-    "name": "area/suggestions",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
  }
 ]
@@ -469,15 +469,5 @@
    "addToProject": {
      "url": "https://github.com/orgs/grafana/projects/190"
    }
-  },
-  {
-    "type": "changedfiles",
-    "matches": [
-      "public/app/features/panel/suggestions/**/*",
-      "public/app/plugins/panel/**/suggestions.ts",
-      "packages/grafana-data/src/types/suggestions*"
-    ],
-    "action": "updateLabel",
-    "addLabel": "area/suggestions"
  }
 ]
@@ -85,7 +85,6 @@ area/scenes
 area/search
 area/security
 area/streaming
-area/suggestions
 area/templating/repeating
 area/tooltip
 area/transformations
@@ -33,16 +33,6 @@ jobs:
            GCOM_TOKEN=ephemeral-instances-bot:gcom-token
            REGISTRY=ephemeral-instances-bot:registry
            GCP_SA_ACCOUNT_KEY_BASE64=ephemeral-instances-bot:sa-key
-          # Secrets placed in the ci/common/<path> path in Vault
-          common_secrets: |
-            DOCKERHUB_USERNAME=dockerhub:username
-            DOCKERHUB_PASSWORD=dockerhub:password
-
-      - name: Log in to Docker Hub to avoid unauthenticated image pull rate-limiting
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
-        with:
-          username: ${{ env.DOCKERHUB_USERNAME }}
-          password: ${{ env.DOCKERHUB_PASSWORD }}

      - name: Generate a GitHub app installation token
        id: generate_token
@@ -14,7 +14,7 @@ ARG JS_SRC=js-builder

 # Dependabot cannot update dependencies listed in ARGs
 # By using FROM instructions we can delegate dependency updates to dependabot
-FROM alpine:3.23.0 AS alpine-base
+FROM alpine:3.22.2 AS alpine-base
 FROM ubuntu:22.04 AS ubuntu-base
 FROM golang:1.25.5-alpine AS go-builder-base
 FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base
@@ -93,7 +93,6 @@ COPY pkg/storage/unified/apistore pkg/storage/unified/apistore
 COPY pkg/semconv pkg/semconv
 COPY pkg/aggregator pkg/aggregator
 COPY apps/playlist apps/playlist
-COPY apps/quotas apps/quotas
 COPY apps/plugins apps/plugins
 COPY apps/shorturl apps/shorturl
 COPY apps/annotation apps/annotation
@@ -224,8 +224,6 @@ github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba h1:psKWNETD5nGxmF
 github.com/grafana/alerting v0.0.0-20251204145817-de8c2bbf9eba/go.mod h1:l7v67cgP7x72ajB9UPZlumdrHqNztpKoqQ52cU8T3LU=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 h1:jSojuc7njleS3UOz223WDlXOinmuLAIPI0z2vtq8EgI=
 github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4/go.mod h1:VahT+GtfQIM+o8ht2StR6J9g+Ef+C2Vokh5uuSmOD/4=
-github.com/grafana/grafana-app-sdk v0.48.5 h1:MS8l9fTZz+VbTfgApn09jw27GxhQ6fNOWGhC4ydvZmM=
-github.com/grafana/grafana-app-sdk v0.48.5/go.mod h1:HJsMOSBmt/D/Ihs1SvagOwmXKi0coBMVHlfvdd+qe9Y=
 github.com/grafana/grafana-app-sdk/logging v0.48.3 h1:72NUpGNiJXCNQz/on++YSsl38xuVYYBKv5kKQaOClX4=
 github.com/grafana/grafana-app-sdk/logging v0.48.3/go.mod h1:Gh/nBWnspK3oDNWtiM5qUF/fardHzOIEez+SPI3JeHA=
 github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000 h1:/5LKSYgLmAhwA4m6iGUD4w1YkydEWWjazn9qxCFT8W0=
@@ -768,10 +768,6 @@ VariableRefresh: *"never" | "onDashboardLoad" | "onTimeRangeChanged"
 // Accepted values are `dontHide` (show label and value), `hideLabel` (show value only), `hideVariable` (show nothing).
 VariableHide: *"dontHide" | "hideLabel" | "hideVariable"

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-VariableRegexApplyTo: *"value" | "text"
-
 // Determine the origin of the adhoc variable filter
 FilterOrigin: "dashboard"

@@ -807,7 +803,6 @@ QueryVariableSpec: {
 	datasource?:  DataSourceRef
 	query:        DataQueryKind
 	regex:        string | *""
-	regexApplyTo?: VariableRegexApplyTo
 	sort:         VariableSort
 	definition?:  string
 	options: [...VariableOption] | *[]
@@ -772,10 +772,6 @@ VariableRefresh: *"never" | "onDashboardLoad" | "onTimeRangeChanged"
 // Accepted values are `dontHide` (show label and value), `hideLabel` (show value only), `hideVariable` (show nothing), `inControlsMenu` (show in a drop-down menu).
 VariableHide: *"dontHide" | "hideLabel" | "hideVariable" | "inControlsMenu"

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-VariableRegexApplyTo: *"value" | "text"
-
 // Determine the origin of the adhoc variable filter
 FilterOrigin: "dashboard"

@@ -810,7 +806,6 @@ QueryVariableSpec: {
 	description?: string
 	query:        DataQueryKind
 	regex:        string | *""
-	regexApplyTo?: VariableRegexApplyTo
 	sort:         VariableSort
 	definition?:  string
 	options: [...VariableOption] | *[]
@@ -222,8 +222,6 @@ lineage: schemas: [{
 			// Optional field, if you want to extract part of a series name or metric node segment.
 			// Named capture groups can be used to separate the display text and value.
 			regex?: string
-      // Determine whether regex applies to variable value or display text
-      regexApplyTo?: #VariableRegexApplyTo
 			// Additional static options for query variable
 			staticOptions?: [...#VariableOption]
 			// Ordering of static options in relation to options returned from data source for query variable
@@ -251,10 +249,6 @@ lineage: schemas: [{
 		// Accepted values are 0 (show label and value), 1 (show value only), 2 (show nothing), 3 (show under the controls dropdown menu).
 		#VariableHide: 0 | 1 | 2 | 3 @cuetsy(kind="enum",memberNames="dontHide|hideLabel|hideVariable|inControlsMenu") @grafana(TSVeneer="type")

-		// Determine whether regex applies to variable value or display text
-		// Accepted values are "value" (apply to value used in queries) or "text" (apply to display text shown to users)
-		#VariableRegexApplyTo: "value" | "text" @cuetsy(kind="type")
-
 		// Sort variable options
 		// Accepted values are:
 		// `0`: No sorting
@@ -222,8 +222,6 @@ lineage: schemas: [{
 			// Optional field, if you want to extract part of a series name or metric node segment.
 			// Named capture groups can be used to separate the display text and value.
 			regex?: string
-      // Determine whether regex applies to variable value or display text
-      regexApplyTo?: #VariableRegexApplyTo
 			// Additional static options for query variable
 			staticOptions?: [...#VariableOption]
 			// Ordering of static options in relation to options returned from data source for query variable
@@ -251,10 +249,6 @@ lineage: schemas: [{
 		// Accepted values are 0 (show label and value), 1 (show value only), 2 (show nothing), 3 (show under the controls dropdown menu).
 		#VariableHide: 0 | 1 | 2 | 3 @cuetsy(kind="enum",memberNames="dontHide|hideLabel|hideVariable|inControlsMenu") @grafana(TSVeneer="type")

-		// Determine whether regex applies to variable value or display text
-		// Accepted values are "value" (apply to value used in queries) or "text" (apply to display text shown to users)
-		#VariableRegexApplyTo: "value" | "text" @cuetsy(kind="type")
-
 		// Sort variable options
 		// Accepted values are:
 		// `0`: No sorting
@@ -772,10 +772,6 @@ VariableRefresh: *"never" | "onDashboardLoad" | "onTimeRangeChanged"
 // Accepted values are `dontHide` (show label and value), `hideLabel` (show value only), `hideVariable` (show nothing).
 VariableHide: *"dontHide" | "hideLabel" | "hideVariable"

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-VariableRegexApplyTo: *"value" | "text"
-
 // Determine the origin of the adhoc variable filter
 FilterOrigin: "dashboard"

@@ -811,7 +807,6 @@ QueryVariableSpec: {
 	datasource?:  DataSourceRef
 	query:        DataQueryKind
 	regex:        string | *""
-	regexApplyTo?: VariableRegexApplyTo
 	sort:         VariableSort
 	definition?:  string
 	options: [...VariableOption] | *[]
@@ -1364,7 +1364,6 @@ type DashboardQueryVariableSpec struct {
 	Datasource         *DashboardDataSourceRef                       `json:"datasource,omitempty"`
 	Query              DashboardDataQueryKind                        `json:"query"`
 	Regex              string                                        `json:"regex"`
-	RegexApplyTo       *DashboardVariableRegexApplyTo                `json:"regexApplyTo,omitempty"`
 	Sort               DashboardVariableSort                         `json:"sort"`
 	Definition         *string                                       `json:"definition,omitempty"`
 	Options            []DashboardVariableOption                     `json:"options"`
@@ -1394,7 +1393,6 @@ func NewDashboardQueryVariableSpec() *DashboardQueryVariableSpec {
 		SkipUrlSync:      false,
 		Query:            *NewDashboardDataQueryKind(),
 		Regex:            "",
-		RegexApplyTo:     (func(input DashboardVariableRegexApplyTo) *DashboardVariableRegexApplyTo { return &input })(DashboardVariableRegexApplyToValue),
 		Options:          []DashboardVariableOption{},
 		Multi:            false,
 		IncludeAll:       false,
@@ -1445,16 +1443,6 @@ const (
 	DashboardVariableRefreshOnTimeRangeChanged DashboardVariableRefresh = "onTimeRangeChanged"
 )

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-// +k8s:openapi-gen=true
-type DashboardVariableRegexApplyTo string
-
-const (
-	DashboardVariableRegexApplyToValue DashboardVariableRegexApplyTo = "value"
-	DashboardVariableRegexApplyToText  DashboardVariableRegexApplyTo = "text"
-)
-
 // Sort variable options
 // Accepted values are:
 // `disabled`: No sorting
@@ -3646,12 +3646,6 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardQueryVariableSpec(ref common.Re
 							Format:  "",
 						},
 					},
-					"regexApplyTo": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
 					"sort": {
 						SchemaProps: spec.SchemaProps{
 							Default: "",
@@ -776,10 +776,6 @@ VariableRefresh: *"never" | "onDashboardLoad" | "onTimeRangeChanged"
 // Accepted values are `dontHide` (show label and value), `hideLabel` (show value only), `hideVariable` (show nothing), `inControlsMenu` (show in a drop-down menu).
 VariableHide: *"dontHide" | "hideLabel" | "hideVariable" | "inControlsMenu"

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-VariableRegexApplyTo: *"value" | "text"
-
 // Determine the origin of the adhoc variable filter
 FilterOrigin: "dashboard"

@@ -814,7 +810,6 @@ QueryVariableSpec: {
 	description?: string
 	query:        DataQueryKind
 	regex:        string | *""
-	regexApplyTo?: VariableRegexApplyTo
 	sort:         VariableSort
 	definition?:  string
 	options: [...VariableOption] | *[]
@@ -1367,7 +1367,6 @@ type DashboardQueryVariableSpec struct {
 	Description        *string                                       `json:"description,omitempty"`
 	Query              DashboardDataQueryKind                        `json:"query"`
 	Regex              string                                        `json:"regex"`
-	RegexApplyTo       *DashboardVariableRegexApplyTo                `json:"regexApplyTo,omitempty"`
 	Sort               DashboardVariableSort                         `json:"sort"`
 	Definition         *string                                       `json:"definition,omitempty"`
 	Options            []DashboardVariableOption                     `json:"options"`
@@ -1397,7 +1396,6 @@ func NewDashboardQueryVariableSpec() *DashboardQueryVariableSpec {
 		SkipUrlSync:      false,
 		Query:            *NewDashboardDataQueryKind(),
 		Regex:            "",
-		RegexApplyTo:     (func(input DashboardVariableRegexApplyTo) *DashboardVariableRegexApplyTo { return &input })(DashboardVariableRegexApplyToValue),
 		Options:          []DashboardVariableOption{},
 		Multi:            false,
 		IncludeAll:       false,
@@ -1449,16 +1447,6 @@ const (
 	DashboardVariableRefreshOnTimeRangeChanged DashboardVariableRefresh = "onTimeRangeChanged"
 )

-// Determine whether regex applies to variable value or display text
-// Accepted values are `value` (apply to value used in queries) or `text` (apply to display text shown to users)
-// +k8s:openapi-gen=true
-type DashboardVariableRegexApplyTo string
-
-const (
-	DashboardVariableRegexApplyToValue DashboardVariableRegexApplyTo = "value"
-	DashboardVariableRegexApplyToText  DashboardVariableRegexApplyTo = "text"
-)
-
 // Sort variable options
 // Accepted values are:
 // `disabled`: No sorting
@@ -3656,12 +3656,6 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardQueryVariableSpec(ref common.Ref
 							Format:  "",
 						},
 					},
-					"regexApplyTo": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
 					"sort": {
 						SchemaProps: spec.SchemaProps{
 							Default: "",
@@ -12,6 +12,13 @@ import (
 )

 func RegisterConversions(s *runtime.Scheme, dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider) error {
+	// Wrap the provider once with 10s 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.
+	dsIndexProvider = schemaversion.WrapIndexProviderWithCache(dsIndexProvider)
+	// Wrap library element provider with caching as well
+	leIndexProvider = schemaversion.WrapLibraryElementProviderWithCache(leIndexProvider)
+
 	// v0 conversions
 	if err := s.AddConversionFunc((*dashv0.Dashboard)(nil), (*dashv1.Dashboard)(nil),
 		withConversionMetrics(dashv0.APIVERSION, dashv1.APIVERSION, func(a, b interface{}, scope conversion.Scope) error {
@@ -55,13 +62,13 @@ func RegisterConversions(s *runtime.Scheme, dsIndexProvider schemaversion.DataSo
 	// v2alpha1 conversions
 	if err := s.AddConversionFunc((*dashv2alpha1.Dashboard)(nil), (*dashv0.Dashboard)(nil),
 		withConversionMetrics(dashv2alpha1.APIVERSION, dashv0.APIVERSION, func(a, b interface{}, scope conversion.Scope) error {
-			return Convert_V2alpha1_to_V0(a.(*dashv2alpha1.Dashboard), b.(*dashv0.Dashboard), scope)
+			return Convert_V2alpha1_to_V0(a.(*dashv2alpha1.Dashboard), b.(*dashv0.Dashboard), scope, dsIndexProvider)
 		})); err != nil {
 		return err
 	}
 	if err := s.AddConversionFunc((*dashv2alpha1.Dashboard)(nil), (*dashv1.Dashboard)(nil),
 		withConversionMetrics(dashv2alpha1.APIVERSION, dashv1.APIVERSION, func(a, b interface{}, scope conversion.Scope) error {
-			return Convert_V2alpha1_to_V1beta1(a.(*dashv2alpha1.Dashboard), b.(*dashv1.Dashboard), scope)
+			return Convert_V2alpha1_to_V1beta1(a.(*dashv2alpha1.Dashboard), b.(*dashv1.Dashboard), scope, dsIndexProvider)
 		})); err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@
          "regex": "",
          "skipUrlSync": false,
          "refresh": 1
-      },
+        },
        {
          "name": "query_var",
          "type": "query",
@@ -81,7 +81,6 @@
          "allValue": ".*",
          "multi": true,
          "regex": "/.*9090.*/",
-          "regexApplyTo": "text",
          "skipUrlSync": false,
          "refresh": 2,
          "sort": 1,
@@ -108,7 +107,7 @@
            },
            {
              "selected": false,
-              "text": "staging",
+              "text": "staging", 
              "value": "staging"
            },
            {
@@ -336,7 +335,6 @@
          "allValue": "*",
          "multi": true,
          "regex": "/host[0-9]+/",
-          "regexApplyTo": "value",
          "skipUrlSync": false,
          "refresh": 1,
          "sort": 2,
@@ -356,4 +354,4 @@
    },
    "links": []
  }
-}
+} 
@@ -94,7 +94,6 @@
          "query": "label_values(up, instance)",
          "refresh": 2,
          "regex": "/.*9090.*/",
-          "regexApplyTo": "text",
          "skipUrlSync": false,
          "sort": 1,
          "tagValuesQuery": "",
@@ -363,7 +362,6 @@
          },
          "refresh": 1,
          "regex": "/host[0-9]+/",
-          "regexApplyTo": "value",
          "skipUrlSync": false,
          "sort": 2,
          "tagValuesQuery": "",
@@ -110,7 +110,6 @@
            }
          },
          "regex": "/.*9090.*/",
-          "regexApplyTo": "text",
          "sort": "alphabeticalAsc",
          "definition": "label_values(up, instance)",
          "options": [
@@ -402,7 +401,6 @@
            }
          },
          "regex": "/host[0-9]+/",
-          "regexApplyTo": "value",
          "sort": "alphabeticalDesc",
          "definition": "terms field:@host size:100",
          "options": [],
@@ -111,7 +111,6 @@
            }
          },
          "regex": "/.*9090.*/",
-          "regexApplyTo": "text",
          "sort": "alphabeticalAsc",
          "definition": "label_values(up, instance)",
          "options": [
@@ -405,7 +404,6 @@
            }
          },
          "regex": "/host[0-9]+/",
-          "regexApplyTo": "value",
          "sort": "alphabeticalDesc",
          "definition": "terms field:@host size:100",
          "options": [],
@@ -229,16 +229,6 @@ func getBoolField(m map[string]interface{}, key string, defaultValue bool) bool
 	return defaultValue
 }

-func getUnionField[T ~string](m map[string]interface{}, key string) *T {
-	if val, ok := m[key]; ok {
-		if str, ok := val.(string); ok && str != "" {
-			result := T(str)
-			return &result
-		}
-	}
-	return nil
-}
-
 // Helper function to create int64 pointer
 func int64Ptr(i int64) *int64 {
 	return &i
@@ -1205,7 +1195,6 @@ func buildQueryVariable(ctx context.Context, varMap map[string]interface{}, comm
 			Refresh:          transformVariableRefreshToEnum(varMap["refresh"]),
 			Sort:             transformVariableSortToEnum(varMap["sort"]),
 			Regex:            schemaversion.GetStringValue(varMap, "regex"),
-			RegexApplyTo:     getUnionField[dashv2alpha1.DashboardVariableRegexApplyTo](varMap, "regexApplyTo"),
 			Query:            buildDataQueryKindForVariable(varMap["query"], datasourceType),
 			AllowCustomValue: getBoolField(varMap, "allowCustomValue", true),
 		},
@@ -11,10 +11,10 @@ import (
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 )

-func Convert_V2alpha1_to_V0(in *dashv2alpha1.Dashboard, out *dashv0.Dashboard, scope conversion.Scope) error {
+func Convert_V2alpha1_to_V0(in *dashv2alpha1.Dashboard, out *dashv0.Dashboard, scope conversion.Scope, dsIndexProvider schemaversion.DataSourceIndexProvider) error {
 	// Convert v2alpha1 → v1beta1 first, then v1beta1 → v0
 	v1beta1 := &dashv1.Dashboard{}
-	if err := ConvertDashboard_V2alpha1_to_V1beta1(in, v1beta1, scope); err != nil {
+	if err := ConvertDashboard_V2alpha1_to_V1beta1(in, v1beta1, scope, dsIndexProvider); err != nil {
 		out.ObjectMeta = in.ObjectMeta
 		out.APIVersion = dashv0.APIVERSION
 		out.Kind = in.Kind
@@ -53,13 +53,13 @@ func Convert_V2alpha1_to_V0(in *dashv2alpha1.Dashboard, out *dashv0.Dashboard, s
 	return nil
 }

-func Convert_V2alpha1_to_V1beta1(in *dashv2alpha1.Dashboard, out *dashv1.Dashboard, scope conversion.Scope) error {
+func Convert_V2alpha1_to_V1beta1(in *dashv2alpha1.Dashboard, out *dashv1.Dashboard, scope conversion.Scope, dsIndexProvider schemaversion.DataSourceIndexProvider) error {
 	out.ObjectMeta = in.ObjectMeta
 	out.APIVersion = dashv1.APIVERSION
 	out.Kind = in.Kind

 	// Convert the spec
-	if err := ConvertDashboard_V2alpha1_to_V1beta1(in, out, scope); err != nil {
+	if err := ConvertDashboard_V2alpha1_to_V1beta1(in, out, scope, dsIndexProvider); err != nil {
 		out.Status = dashv1.DashboardStatus{
 			Conversion: &dashv1.DashboardConversionStatus{
 				StoredVersion: ptr.To(dashv2alpha1.VERSION),
@@ -179,7 +179,7 @@ func Convert_V2beta1_to_V1beta1(in *dashv2beta1.Dashboard, out *dashv1.Dashboard
 	// Convert v2alpha1 → v1beta1
 	// Note: ConvertDashboard_V2alpha1_to_V1beta1 will set out.ObjectMeta from v2alpha1,
 	// but we've already set it from the original input, so it will be preserved
-	if err := ConvertDashboard_V2alpha1_to_V1beta1(v2alpha1, out, scope); err != nil {
+	if err := ConvertDashboard_V2alpha1_to_V1beta1(v2alpha1, out, scope, dsIndexProvider); err != nil {
 		out.Status = dashv1.DashboardStatus{
 			Conversion: &dashv1.DashboardConversionStatus{
 				StoredVersion: ptr.To(dashv2beta1.VERSION),
@@ -39,7 +39,7 @@ func TestV2alpha1ConversionErrorHandling(t *testing.T) {
 		}
 		target := &dashv1.Dashboard{}

-		err := Convert_V2alpha1_to_V1beta1(source, target, nil)
+		err := Convert_V2alpha1_to_V1beta1(source, target, nil, dsProvider)

 		// Convert_V2alpha1_to_V1beta1 doesn't return error, just sets status
 		require.NoError(t, err, "Convert_V2alpha1_to_V1beta1 doesn't return error")
@@ -1,12 +1,14 @@
 package conversion

 import (
+	"context"
 	"fmt"

+	"k8s.io/apimachinery/pkg/conversion"
+
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
-	"k8s.io/apimachinery/pkg/conversion"
 )

 // ConvertDashboard_V2alpha1_to_V1beta1 converts a v2alpha1 dashboard to v1beta1 format.
@@ -14,13 +16,19 @@ import (
 // that represents the v1 dashboard JSON format.
 // The dsIndexProvider is used to resolve default datasources when queries/variables/annotations
 // don't have explicit datasource references.
-func ConvertDashboard_V2alpha1_to_V1beta1(in *dashv2alpha1.Dashboard, out *dashv1.Dashboard, scope conversion.Scope) error {
+func ConvertDashboard_V2alpha1_to_V1beta1(in *dashv2alpha1.Dashboard, out *dashv1.Dashboard, scope conversion.Scope, dsIndexProvider schemaversion.DataSourceIndexProvider) error {
 	out.ObjectMeta = in.ObjectMeta
 	out.APIVersion = dashv1.APIVERSION
 	out.Kind = in.Kind // Preserve the Kind from input (should be "Dashboard")

+	// Get datasource index for resolving default datasources
+	var dsIndex *schemaversion.DatasourceIndex
+	if dsIndexProvider != nil {
+		dsIndex = dsIndexProvider.Index(context.Background())
+	}
+
 	// Convert the spec to v1beta1 unstructured format
-	dashboardJSON, err := convertDashboardSpec_V2alpha1_to_V1beta1(&in.Spec)
+	dashboardJSON, err := convertDashboardSpec_V2alpha1_to_V1beta1(&in.Spec, dsIndex)
 	if err != nil {
 		return fmt.Errorf("failed to convert dashboard spec: %w", err)
 	}
@@ -31,7 +39,7 @@ func ConvertDashboard_V2alpha1_to_V1beta1(in *dashv2alpha1.Dashboard, out *dashv
 	return nil
 }

-func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec) (map[string]interface{}, error) {
+func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	dashboard := make(map[string]interface{})

 	// Convert basic fields
@@ -67,7 +75,7 @@ func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec) (m
 	}

 	// Convert panels from elements and layout
-	panels, err := convertPanelsFromElementsAndLayout(in.Elements, in.Layout)
+	panels, err := convertPanelsFromElementsAndLayout(in.Elements, in.Layout, dsIndex)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert panels: %w", err)
 	}
@@ -82,7 +90,7 @@ func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec) (m
 	}

 	// Convert variables
-	variables := convertVariablesToV1(in.Variables)
+	variables := convertVariablesToV1(in.Variables, dsIndex)
 	if len(variables) > 0 {
 		dashboard["templating"] = map[string]interface{}{
 			"list": variables,
@@ -90,7 +98,7 @@ func convertDashboardSpec_V2alpha1_to_V1beta1(in *dashv2alpha1.DashboardSpec) (m
 	}

 	// Convert annotations - always include even if empty to prevent DashboardModel from adding built-in
-	annotations := convertAnnotationsToV1(in.Annotations)
+	annotations := convertAnnotationsToV1(in.Annotations, dsIndex)
 	dashboard["annotations"] = map[string]interface{}{
 		"list": annotations,
 	}
@@ -228,28 +236,28 @@ func countTotalPanels(panels []interface{}) int {
 //   - RowsLayout: Rows become row panels; nested structures are flattened
 //   - AutoGridLayout: Calculates gridPos based on column count and row height
 //   - TabsLayout: Tabs become expanded row panels; content is flattened
-func convertPanelsFromElementsAndLayout(elements map[string]dashv2alpha1.DashboardElement, layout dashv2alpha1.DashboardGridLayoutKindOrRowsLayoutKindOrAutoGridLayoutKindOrTabsLayoutKind) ([]interface{}, error) {
+func convertPanelsFromElementsAndLayout(elements map[string]dashv2alpha1.DashboardElement, layout dashv2alpha1.DashboardGridLayoutKindOrRowsLayoutKindOrAutoGridLayoutKindOrTabsLayoutKind, dsIndex *schemaversion.DatasourceIndex) ([]interface{}, error) {
 	if layout.GridLayoutKind != nil {
-		return convertGridLayoutToPanels(elements, layout.GridLayoutKind)
+		return convertGridLayoutToPanels(elements, layout.GridLayoutKind, dsIndex)
 	}

 	if layout.RowsLayoutKind != nil {
-		return convertRowsLayoutToPanels(elements, layout.RowsLayoutKind)
+		return convertRowsLayoutToPanels(elements, layout.RowsLayoutKind, dsIndex)
 	}

 	if layout.AutoGridLayoutKind != nil {
-		return convertAutoGridLayoutToPanels(elements, layout.AutoGridLayoutKind)
+		return convertAutoGridLayoutToPanels(elements, layout.AutoGridLayoutKind, dsIndex)
 	}

 	if layout.TabsLayoutKind != nil {
-		return convertTabsLayoutToPanels(elements, layout.TabsLayoutKind)
+		return convertTabsLayoutToPanels(elements, layout.TabsLayoutKind, dsIndex)
 	}

 	// No layout specified, return empty panels
 	return []interface{}{}, nil
 }

-func convertGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, gridLayout *dashv2alpha1.DashboardGridLayoutKind) ([]interface{}, error) {
+func convertGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, gridLayout *dashv2alpha1.DashboardGridLayoutKind, dsIndex *schemaversion.DatasourceIndex) ([]interface{}, error) {
 	panels := make([]interface{}, 0, len(gridLayout.Spec.Items))

 	for _, item := range gridLayout.Spec.Items {
@@ -258,7 +266,7 @@ func convertGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement
 			return nil, fmt.Errorf("panel with uid %s not found in the dashboard elements", item.Spec.Element.Name)
 		}

-		panel, err := convertPanelFromElement(&element, &item)
+		panel, err := convertPanelFromElement(&element, &item, dsIndex)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 		}
@@ -271,21 +279,21 @@ func convertGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement
 // convertRowsLayoutToPanels converts a RowsLayout to V1 panels.
 // All nested structures (rows within rows, tabs within rows) are flattened to the root level.
 // Each row becomes a row panel, and nested content is added sequentially after it.
-func convertRowsLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, rowsLayout *dashv2alpha1.DashboardRowsLayoutKind) ([]interface{}, error) {
-	return convertNestedLayoutToPanels(elements, rowsLayout, nil, 0)
+func convertRowsLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, rowsLayout *dashv2alpha1.DashboardRowsLayoutKind, dsIndex *schemaversion.DatasourceIndex) ([]interface{}, error) {
+	return convertNestedLayoutToPanels(elements, rowsLayout, nil, dsIndex, 0)
 }

 // convertNestedLayoutToPanels handles arbitrary nesting of RowsLayout and TabsLayout.
 // It processes each row/tab in order, tracking Y position to ensure panels don't overlap.
 // The function recursively flattens nested structures to produce a flat V1 panel array.
-func convertNestedLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, rowsLayout *dashv2alpha1.DashboardRowsLayoutKind, tabsLayout *dashv2alpha1.DashboardTabsLayoutKind, yOffset int64) ([]interface{}, error) {
+func convertNestedLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, rowsLayout *dashv2alpha1.DashboardRowsLayoutKind, tabsLayout *dashv2alpha1.DashboardTabsLayoutKind, dsIndex *schemaversion.DatasourceIndex, yOffset int64) ([]interface{}, error) {
 	panels := make([]interface{}, 0)
 	currentY := yOffset

 	// Process RowsLayout
 	if rowsLayout != nil {
 		for _, row := range rowsLayout.Spec.Rows {
-			rowPanels, newY, err := processRowItem(elements, &row, currentY)
+			rowPanels, newY, err := processRowItem(elements, &row, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -297,7 +305,7 @@ func convertNestedLayoutToPanels(elements map[string]dashv2alpha1.DashboardEleme
 	// Process TabsLayout (tabs are converted to rows)
 	if tabsLayout != nil {
 		for _, tab := range tabsLayout.Spec.Tabs {
-			tabPanels, newY, err := processTabItem(elements, &tab, currentY)
+			tabPanels, newY, err := processTabItem(elements, &tab, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -316,7 +324,7 @@ func convertNestedLayoutToPanels(elements map[string]dashv2alpha1.DashboardEleme
 //   - Collapsed row: Panels stored inside row.panels with absolute Y positions
 //   - Expanded row: Panels added to top level after the row panel
 //   - Nested layouts: Parent row is preserved; nested content is flattened after it
-func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dashv2alpha1.DashboardRowsLayoutRowKind, startY int64) ([]interface{}, int64, error) {
+func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dashv2alpha1.DashboardRowsLayoutRowKind, dsIndex *schemaversion.DatasourceIndex, startY int64) ([]interface{}, int64, error) {
 	panels := make([]interface{}, 0)
 	currentY := startY

@@ -346,7 +354,7 @@ func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dash
 		}

 		// Then process nested rows
-		nestedPanels, err := convertNestedLayoutToPanels(elements, row.Spec.Layout.RowsLayoutKind, nil, currentY)
+		nestedPanels, err := convertNestedLayoutToPanels(elements, row.Spec.Layout.RowsLayoutKind, nil, dsIndex, currentY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -379,7 +387,7 @@ func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dash
 		}

 		// Then process nested tabs
-		nestedPanels, err := convertNestedLayoutToPanels(elements, nil, row.Spec.Layout.TabsLayoutKind, currentY)
+		nestedPanels, err := convertNestedLayoutToPanels(elements, nil, row.Spec.Layout.TabsLayoutKind, dsIndex, currentY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -421,7 +429,7 @@ func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dash

 		// Add collapsed panels if row is collapsed (panels use absolute Y positions)
 		if isCollapsed {
-			collapsedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, currentY+1)
+			collapsedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, dsIndex, currentY+1)
 			if err != nil {
 				return nil, 0, err
 			}
@@ -436,7 +444,7 @@ func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dash

 	// Add panels from row layout (only for expanded rows or hidden header rows)
 	if !isCollapsed || isHiddenHeader {
-		rowPanels, newY, err := extractExpandedPanels(elements, &row.Spec.Layout, currentY, isHiddenHeader, startY)
+		rowPanels, newY, err := extractExpandedPanels(elements, &row.Spec.Layout, dsIndex, currentY, isHiddenHeader, startY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -451,7 +459,7 @@ func processRowItem(elements map[string]dashv2alpha1.DashboardElement, row *dash
 // Each tab becomes an expanded row panel (collapsed=false) with an empty panels array.
 // The tab's content is flattened and added to the top level after the row panel.
 // Nested layouts within the tab are recursively processed.
-func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dashv2alpha1.DashboardTabsLayoutTabKind, startY int64) ([]interface{}, int64, error) {
+func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dashv2alpha1.DashboardTabsLayoutTabKind, dsIndex *schemaversion.DatasourceIndex, startY int64) ([]interface{}, int64, error) {
 	panels := make([]interface{}, 0)
 	currentY := startY

@@ -479,7 +487,7 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 	// Handle nested layouts inside the tab
 	if tab.Spec.Layout.RowsLayoutKind != nil {
 		// Nested RowsLayout inside tab
-		nestedPanels, err := convertNestedLayoutToPanels(elements, tab.Spec.Layout.RowsLayoutKind, nil, currentY)
+		nestedPanels, err := convertNestedLayoutToPanels(elements, tab.Spec.Layout.RowsLayoutKind, nil, dsIndex, currentY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -487,7 +495,7 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 		currentY = getMaxYFromPanels(nestedPanels, currentY)
 	} else if tab.Spec.Layout.TabsLayoutKind != nil {
 		// Nested TabsLayout inside tab
-		nestedPanels, err := convertNestedLayoutToPanels(elements, nil, tab.Spec.Layout.TabsLayoutKind, currentY)
+		nestedPanels, err := convertNestedLayoutToPanels(elements, nil, tab.Spec.Layout.TabsLayoutKind, dsIndex, currentY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -504,7 +512,7 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 			adjustedItem := item
 			adjustedItem.Spec.Y = item.Spec.Y + currentY

-			panel, err := convertPanelFromElement(&element, &adjustedItem)
+			panel, err := convertPanelFromElement(&element, &adjustedItem, dsIndex)
 			if err != nil {
 				return nil, 0, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 			}
@@ -517,7 +525,7 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 		}
 	} else if tab.Spec.Layout.AutoGridLayoutKind != nil {
 		// AutoGridLayout inside tab - convert with Y offset
-		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, tab.Spec.Layout.AutoGridLayoutKind, currentY)
+		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, tab.Spec.Layout.AutoGridLayoutKind, dsIndex, currentY)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -532,7 +540,7 @@ func processTabItem(elements map[string]dashv2alpha1.DashboardElement, tab *dash
 // Panels are positioned with absolute Y coordinates (baseY + relative Y).
 // This matches V1 behavior where collapsed row panels store their children
 // with Y positions as if the row were expanded at that location.
-func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrAutoGridLayoutKindOrTabsLayoutKindOrRowsLayoutKind, baseY int64) ([]interface{}, error) {
+func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrAutoGridLayoutKindOrTabsLayoutKindOrRowsLayoutKind, dsIndex *schemaversion.DatasourceIndex, baseY int64) ([]interface{}, error) {
 	panels := make([]interface{}, 0)

 	if layout.GridLayoutKind != nil {
@@ -544,7 +552,7 @@ func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.Dashbo
 			// Create a copy with adjusted Y position
 			adjustedItem := item
 			adjustedItem.Spec.Y = item.Spec.Y + baseY
-			panel, err := convertPanelFromElement(&element, &adjustedItem)
+			panel, err := convertPanelFromElement(&element, &adjustedItem, dsIndex)
 			if err != nil {
 				return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 			}
@@ -553,7 +561,7 @@ func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.Dashbo
 	}
 	// Handle AutoGridLayout for collapsed rows with Y offset
 	if layout.AutoGridLayoutKind != nil {
-		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, baseY)
+		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, dsIndex, baseY)
 		if err != nil {
 			return nil, err
 		}
@@ -563,7 +571,7 @@ func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.Dashbo
 	if layout.RowsLayoutKind != nil {
 		currentY := baseY
 		for _, row := range layout.RowsLayoutKind.Spec.Rows {
-			nestedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, currentY)
+			nestedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -574,7 +582,7 @@ func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.Dashbo
 	if layout.TabsLayoutKind != nil {
 		currentY := baseY
 		for _, tab := range layout.TabsLayoutKind.Spec.Tabs {
-			nestedPanels, err := extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements, &tab.Spec.Layout, currentY)
+			nestedPanels, err := extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements, &tab.Spec.Layout, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -588,7 +596,7 @@ func extractCollapsedPanelsWithAbsoluteY(elements map[string]dashv2alpha1.Dashbo

 // extractCollapsedPanelsFromTabLayoutWithAbsoluteY extracts panels from a tab layout with absolute Y.
 // Similar to extractCollapsedPanelsWithAbsoluteY but handles the tab-specific layout type.
-func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrRowsLayoutKindOrAutoGridLayoutKindOrTabsLayoutKind, baseY int64) ([]interface{}, error) {
+func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrRowsLayoutKindOrAutoGridLayoutKindOrTabsLayoutKind, dsIndex *schemaversion.DatasourceIndex, baseY int64) ([]interface{}, error) {
 	panels := make([]interface{}, 0)

 	if layout.GridLayoutKind != nil {
@@ -599,7 +607,7 @@ func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2
 			}
 			adjustedItem := item
 			adjustedItem.Spec.Y = item.Spec.Y + baseY
-			panel, err := convertPanelFromElement(&element, &adjustedItem)
+			panel, err := convertPanelFromElement(&element, &adjustedItem, dsIndex)
 			if err != nil {
 				return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 			}
@@ -607,7 +615,7 @@ func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2
 		}
 	}
 	if layout.AutoGridLayoutKind != nil {
-		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, baseY)
+		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, dsIndex, baseY)
 		if err != nil {
 			return nil, err
 		}
@@ -616,7 +624,7 @@ func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2
 	if layout.RowsLayoutKind != nil {
 		currentY := baseY
 		for _, row := range layout.RowsLayoutKind.Spec.Rows {
-			nestedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, currentY)
+			nestedPanels, err := extractCollapsedPanelsWithAbsoluteY(elements, &row.Spec.Layout, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -627,7 +635,7 @@ func extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements map[string]dashv2
 	if layout.TabsLayoutKind != nil {
 		currentY := baseY
 		for _, tab := range layout.TabsLayoutKind.Spec.Tabs {
-			nestedPanels, err := extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements, &tab.Spec.Layout, currentY)
+			nestedPanels, err := extractCollapsedPanelsFromTabLayoutWithAbsoluteY(elements, &tab.Spec.Layout, dsIndex, currentY)
 			if err != nil {
 				return nil, err
 			}
@@ -671,7 +679,7 @@ func getLayoutHeightFromTab(layout *dashv2alpha1.DashboardGridLayoutKindOrRowsLa
 //   - Explicit row: Add (currentY - 1) to relative Y for absolute positioning
 //
 // Returns the panels and the new Y position for the next row.
-func extractExpandedPanels(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrAutoGridLayoutKindOrTabsLayoutKindOrRowsLayoutKind, currentY int64, isHiddenHeader bool, startY int64) ([]interface{}, int64, error) {
+func extractExpandedPanels(elements map[string]dashv2alpha1.DashboardElement, layout *dashv2alpha1.DashboardGridLayoutKindOrAutoGridLayoutKindOrTabsLayoutKindOrRowsLayoutKind, dsIndex *schemaversion.DatasourceIndex, currentY int64, isHiddenHeader bool, startY int64) ([]interface{}, int64, error) {
 	panels := make([]interface{}, 0)
 	// For hidden headers, don't track Y changes (matches original behavior)
 	maxY := startY
@@ -692,7 +700,7 @@ func extractExpandedPanels(elements map[string]dashv2alpha1.DashboardElement, la
 			}
 			// For hidden headers: don't adjust Y, keep item.Spec.Y as-is

-			panel, err := convertPanelFromElement(&element, &adjustedItem)
+			panel, err := convertPanelFromElement(&element, &adjustedItem, dsIndex)
 			if err != nil {
 				return nil, 0, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 			}
@@ -717,7 +725,7 @@ func extractExpandedPanels(elements map[string]dashv2alpha1.DashboardElement, la
 			yOffset = currentY - 1
 		}

-		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, yOffset)
+		autoGridPanels, err := convertAutoGridLayoutToPanelsWithOffset(elements, layout.AutoGridLayoutKind, dsIndex, yOffset)
 		if err != nil {
 			return nil, 0, err
 		}
@@ -780,7 +788,7 @@ func getLayoutHeight(layout *dashv2alpha1.DashboardGridLayoutKindOrAutoGridLayou
 // convertAutoGridLayoutToPanelsWithOffset converts AutoGridLayout with a Y offset.
 // Same as convertAutoGridLayoutToPanels but starts at yOffset instead of 0.
 // Used when AutoGridLayout appears inside rows or tabs.
-func convertAutoGridLayoutToPanelsWithOffset(elements map[string]dashv2alpha1.DashboardElement, autoGridLayout *dashv2alpha1.DashboardAutoGridLayoutKind, yOffset int64) ([]interface{}, error) {
+func convertAutoGridLayoutToPanelsWithOffset(elements map[string]dashv2alpha1.DashboardElement, autoGridLayout *dashv2alpha1.DashboardAutoGridLayoutKind, dsIndex *schemaversion.DatasourceIndex, yOffset int64) ([]interface{}, error) {
 	panels := make([]interface{}, 0, len(autoGridLayout.Spec.Items))

 	const (
@@ -842,7 +850,7 @@ func convertAutoGridLayoutToPanelsWithOffset(elements map[string]dashv2alpha1.Da
 			},
 		}

-		panel, err := convertPanelFromElement(&element, &gridItem)
+		panel, err := convertPanelFromElement(&element, &gridItem, dsIndex)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 		}
@@ -868,7 +876,7 @@ func convertAutoGridLayoutToPanelsWithOffset(elements map[string]dashv2alpha1.Da
 //
 // Width: 24 / maxColumnCount (default 3 columns = 8 units wide)
 // Height: Predefined grid units per mode (see pixelsToGridUnits for custom)
-func convertAutoGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, autoGridLayout *dashv2alpha1.DashboardAutoGridLayoutKind) ([]interface{}, error) {
+func convertAutoGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, autoGridLayout *dashv2alpha1.DashboardAutoGridLayoutKind, dsIndex *schemaversion.DatasourceIndex) ([]interface{}, error) {
 	panels := make([]interface{}, 0, len(autoGridLayout.Spec.Items))

 	const (
@@ -955,7 +963,7 @@ func convertAutoGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardEle
 			}
 		}

-		panel, err := convertPanelFromElement(&element, &gridItem)
+		panel, err := convertPanelFromElement(&element, &gridItem, dsIndex)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert panel %s: %w", item.Spec.Element.Name, err)
 		}
@@ -976,11 +984,11 @@ func convertAutoGridLayoutToPanels(elements map[string]dashv2alpha1.DashboardEle
 // V1 has no native tab concept, so tabs are converted to expanded row panels.
 // Each tab becomes a row panel (collapsed=false, panels=[]) with its content
 // flattened to the top level. Tab order is preserved in the output.
-func convertTabsLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, tabsLayout *dashv2alpha1.DashboardTabsLayoutKind) ([]interface{}, error) {
-	return convertNestedLayoutToPanels(elements, nil, tabsLayout, 0)
+func convertTabsLayoutToPanels(elements map[string]dashv2alpha1.DashboardElement, tabsLayout *dashv2alpha1.DashboardTabsLayoutKind, dsIndex *schemaversion.DatasourceIndex) ([]interface{}, error) {
+	return convertNestedLayoutToPanels(elements, nil, tabsLayout, dsIndex, 0)
 }

-func convertPanelFromElement(element *dashv2alpha1.DashboardElement, layoutItem *dashv2alpha1.DashboardGridLayoutItemKind) (map[string]interface{}, error) {
+func convertPanelFromElement(element *dashv2alpha1.DashboardElement, layoutItem *dashv2alpha1.DashboardGridLayoutItemKind, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	panel := make(map[string]interface{})

 	// Set grid position
@@ -1009,7 +1017,7 @@ func convertPanelFromElement(element *dashv2alpha1.DashboardElement, layoutItem
 	}

 	if element.PanelKind != nil {
-		return convertPanelKindToV1(element.PanelKind, panel)
+		return convertPanelKindToV1(element.PanelKind, panel, dsIndex)
 	}

 	if element.LibraryPanelKind != nil {
@@ -1019,7 +1027,7 @@ func convertPanelFromElement(element *dashv2alpha1.DashboardElement, layoutItem
 	return nil, fmt.Errorf("element has neither PanelKind nor LibraryPanelKind")
 }

-func convertPanelKindToV1(panelKind *dashv2alpha1.DashboardPanelKind, panel map[string]interface{}) (map[string]interface{}, error) {
+func convertPanelKindToV1(panelKind *dashv2alpha1.DashboardPanelKind, panel map[string]interface{}, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	spec := panelKind.Spec

 	panel["id"] = int(spec.Id)
@@ -1061,14 +1069,14 @@ func convertPanelKindToV1(panelKind *dashv2alpha1.DashboardPanelKind, panel map[
 	// Convert queries (targets)
 	targets := make([]map[string]interface{}, 0, len(spec.Data.Spec.Queries))
 	for _, query := range spec.Data.Spec.Queries {
-		target := convertPanelQueryToV1(&query)
+		target := convertPanelQueryToV1(&query, dsIndex)
 		targets = append(targets, target)
 	}
 	panel["targets"] = targets

 	// Detect mixed datasource - set panel.datasource to "mixed" if queries use different datasources
 	// This matches the frontend behavior in getPanelDataSource (layoutSerializers/utils.ts)
-	if mixedDS := detectMixedDatasource(spec.Data.Spec.Queries); mixedDS != nil {
+	if mixedDS := detectMixedDatasource(spec.Data.Spec.Queries, dsIndex); mixedDS != nil {
 		panel["datasource"] = mixedDS
 	}

@@ -1117,7 +1125,7 @@ func convertPanelKindToV1(panelKind *dashv2alpha1.DashboardPanelKind, panel map[
 	return panel, nil
 }

-func convertPanelQueryToV1(query *dashv2alpha1.DashboardPanelQueryKind) map[string]interface{} {
+func convertPanelQueryToV1(query *dashv2alpha1.DashboardPanelQueryKind, dsIndex *schemaversion.DatasourceIndex) map[string]interface{} {
 	target := make(map[string]interface{})

 	// Copy query spec (excluding refId, hide, datasource which are handled separately)
@@ -1142,7 +1150,7 @@ func convertPanelQueryToV1(query *dashv2alpha1.DashboardPanelQueryKind) map[stri
 	}

 	// Resolve datasource based on V2 input (reuse shared function)
-	datasource := getDataSourceForQuery(query.Spec.Datasource, query.Spec.Query.Kind)
+	datasource := getDataSourceForQuery(query.Spec.Datasource, query.Spec.Query.Kind, nil)
 	if datasource != nil {
 		target["datasource"] = datasource
 	}
@@ -1156,7 +1164,7 @@ func convertPanelQueryToV1(query *dashv2alpha1.DashboardPanelQueryKind) map[stri
 // - Else if queryKind (type) is non-empty → return {type} only
 // - Else → return nil (no datasource)
 // Used for variables and annotations. Panel queries use convertPanelQueryToV1Target.
-func getDataSourceForQuery(explicitDS *dashv2alpha1.DashboardDataSourceRef, queryKind string) map[string]interface{} {
+func getDataSourceForQuery(explicitDS *dashv2alpha1.DashboardDataSourceRef, queryKind string, _ *schemaversion.DatasourceIndex) map[string]interface{} {
 	// Case 1: Explicit datasource with UID provided
 	if explicitDS != nil && explicitDS.Uid != nil && *explicitDS.Uid != "" {
 		datasource := map[string]interface{}{
@@ -1187,7 +1195,7 @@ func getDataSourceForQuery(explicitDS *dashv2alpha1.DashboardDataSourceRef, quer
 // Compares based on V2 input without runtime resolution:
 // - If query has explicit datasource.uid → use that UID and type
 // - Else → use query.Kind as type (empty UID)
-func detectMixedDatasource(queries []dashv2alpha1.DashboardPanelQueryKind) map[string]interface{} {
+func detectMixedDatasource(queries []dashv2alpha1.DashboardPanelQueryKind, _ *schemaversion.DatasourceIndex) map[string]interface{} {
 	if len(queries) == 0 {
 		return nil
 	}
@@ -1246,7 +1254,7 @@ func convertLibraryPanelKindToV1(libPanelKind *dashv2alpha1.DashboardLibraryPane
 	return panel, nil
 }

-func convertVariablesToV1(variables []dashv2alpha1.DashboardVariableKind) []map[string]interface{} {
+func convertVariablesToV1(variables []dashv2alpha1.DashboardVariableKind, dsIndex *schemaversion.DatasourceIndex) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0, len(variables))

 	for _, variable := range variables {
@@ -1254,7 +1262,7 @@ func convertVariablesToV1(variables []dashv2alpha1.DashboardVariableKind) []map[
 		var err error

 		if variable.QueryVariableKind != nil {
-			varMap, err = convertQueryVariableToV1(variable.QueryVariableKind)
+			varMap, err = convertQueryVariableToV1(variable.QueryVariableKind, dsIndex)
 		} else if variable.DatasourceVariableKind != nil {
 			varMap, err = convertDatasourceVariableToV1(variable.DatasourceVariableKind)
 		} else if variable.CustomVariableKind != nil {
@@ -1266,9 +1274,9 @@ func convertVariablesToV1(variables []dashv2alpha1.DashboardVariableKind) []map[
 		} else if variable.TextVariableKind != nil {
 			varMap, err = convertTextVariableToV1(variable.TextVariableKind)
 		} else if variable.GroupByVariableKind != nil {
-			varMap, err = convertGroupByVariableToV1(variable.GroupByVariableKind)
+			varMap, err = convertGroupByVariableToV1(variable.GroupByVariableKind, dsIndex)
 		} else if variable.AdhocVariableKind != nil {
-			varMap, err = convertAdhocVariableToV1(variable.AdhocVariableKind)
+			varMap, err = convertAdhocVariableToV1(variable.AdhocVariableKind, dsIndex)
 		} else if variable.SwitchVariableKind != nil {
 			varMap, err = convertSwitchVariableToV1(variable.SwitchVariableKind)
 		}
@@ -1281,7 +1289,7 @@ func convertVariablesToV1(variables []dashv2alpha1.DashboardVariableKind) []map[
 	return result
 }

-func convertQueryVariableToV1(variable *dashv2alpha1.DashboardQueryVariableKind) (map[string]interface{}, error) {
+func convertQueryVariableToV1(variable *dashv2alpha1.DashboardQueryVariableKind, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	spec := variable.Spec
 	varMap := map[string]interface{}{
 		"name":        spec.Name,
@@ -1312,9 +1320,6 @@ func convertQueryVariableToV1(variable *dashv2alpha1.DashboardQueryVariableKind)
 	if spec.Definition != nil {
 		varMap["definition"] = *spec.Definition
 	}
-	if spec.RegexApplyTo != nil {
-		varMap["regexApplyTo"] = string(*spec.RegexApplyTo)
-	}
 	varMap["allowCustomValue"] = spec.AllowCustomValue

 	// Convert query - handle LEGACY_STRING_VALUE_KEY
@@ -1331,7 +1336,7 @@ func convertQueryVariableToV1(variable *dashv2alpha1.DashboardQueryVariableKind)
 	}

 	// Resolve datasource - use explicit datasource or resolve from query kind (datasource type)/default
-	datasource := getDataSourceForQuery(spec.Datasource, spec.Query.Kind)
+	datasource := getDataSourceForQuery(spec.Datasource, spec.Query.Kind, dsIndex)
 	if datasource != nil {
 		varMap["datasource"] = datasource
 	}
@@ -1481,7 +1486,7 @@ func convertTextVariableToV1(variable *dashv2alpha1.DashboardTextVariableKind) (
 	return varMap, nil
 }

-func convertGroupByVariableToV1(variable *dashv2alpha1.DashboardGroupByVariableKind) (map[string]interface{}, error) {
+func convertGroupByVariableToV1(variable *dashv2alpha1.DashboardGroupByVariableKind, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	spec := variable.Spec
 	varMap := map[string]interface{}{
 		"name":        spec.Name,
@@ -1504,7 +1509,7 @@ func convertGroupByVariableToV1(variable *dashv2alpha1.DashboardGroupByVariableK
 	}

 	// Resolve datasource - GroupBy variables don't have a query kind, so use empty string (will fall back to default)
-	datasource := getDataSourceForQuery(spec.Datasource, "")
+	datasource := getDataSourceForQuery(spec.Datasource, "", dsIndex)
 	if datasource != nil {
 		varMap["datasource"] = datasource
 	}
@@ -1512,7 +1517,7 @@ func convertGroupByVariableToV1(variable *dashv2alpha1.DashboardGroupByVariableK
 	return varMap, nil
 }

-func convertAdhocVariableToV1(variable *dashv2alpha1.DashboardAdhocVariableKind) (map[string]interface{}, error) {
+func convertAdhocVariableToV1(variable *dashv2alpha1.DashboardAdhocVariableKind, dsIndex *schemaversion.DatasourceIndex) (map[string]interface{}, error) {
 	spec := variable.Spec
 	varMap := map[string]interface{}{
 		"name":        spec.Name,
@@ -1531,7 +1536,7 @@ func convertAdhocVariableToV1(variable *dashv2alpha1.DashboardAdhocVariableKind)
 	varMap["allowCustomValue"] = spec.AllowCustomValue

 	// Resolve datasource - Adhoc variables don't have a query kind, so use empty string (will fall back to default)
-	datasource := getDataSourceForQuery(spec.Datasource, "")
+	datasource := getDataSourceForQuery(spec.Datasource, "", dsIndex)
 	if datasource != nil {
 		varMap["datasource"] = datasource
 	}
@@ -1658,7 +1663,7 @@ func convertSwitchVariableToV1(variable *dashv2alpha1.DashboardSwitchVariableKin
 	return varMap, nil
 }

-func convertAnnotationsToV1(annotations []dashv2alpha1.DashboardAnnotationQueryKind) []map[string]interface{} {
+func convertAnnotationsToV1(annotations []dashv2alpha1.DashboardAnnotationQueryKind, dsIndex *schemaversion.DatasourceIndex) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0, len(annotations))

 	for _, annotation := range annotations {
@@ -1681,7 +1686,7 @@ func convertAnnotationsToV1(annotations []dashv2alpha1.DashboardAnnotationQueryK
 		if annotation.Spec.Query != nil {
 			queryKind = annotation.Spec.Query.Kind
 		}
-		datasource := getDataSourceForQuery(annotation.Spec.Datasource, queryKind)
+		datasource := getDataSourceForQuery(annotation.Spec.Datasource, queryKind, dsIndex)
 		if datasource != nil {
 			annotationMap["datasource"] = datasource
 		}
@@ -767,7 +767,6 @@ func convertQueryVariableSpec_V2alpha1_to_V2beta1(in *dashv2alpha1.DashboardQuer
 	out.SkipUrlSync = in.SkipUrlSync
 	out.Description = in.Description
 	out.Regex = in.Regex
-	out.RegexApplyTo = (*dashv2beta1.DashboardVariableRegexApplyTo)(in.RegexApplyTo)
 	out.Sort = dashv2beta1.DashboardVariableSort(in.Sort)
 	out.Definition = in.Definition
 	out.Options = convertVariableOptions_V2alpha1_to_V2beta1(in.Options)
@@ -806,7 +806,6 @@ func convertQueryVariableSpec_V2beta1_to_V2alpha1(in *dashv2beta1.DashboardQuery
 	out.SkipUrlSync = in.SkipUrlSync
 	out.Description = in.Description
 	out.Regex = in.Regex
-	out.RegexApplyTo = (*dashv2alpha1.DashboardVariableRegexApplyTo)(in.RegexApplyTo)
 	out.Sort = dashv2alpha1.DashboardVariableSort(in.Sort)
 	out.Definition = in.Definition
 	out.Options = convertVariableOptions_V2beta1_to_V2alpha1(in.Options)
@@ -61,13 +61,9 @@ type migrator struct {

 func (m *migrator) init(dsIndexProvider schemaversion.DataSourceIndexProvider, leIndexProvider schemaversion.LibraryElementIndexProvider) {
 	initOnce.Do(func() {
-		// Wrap the provider once with 10s 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)
-		// Wrap library element provider with caching as well
-		m.leIndexProvider = schemaversion.WrapLibraryElementProviderWithCache(leIndexProvider)
-		m.migrations = schemaversion.GetMigrations(m.dsIndexProvider, m.leIndexProvider)
+		m.dsIndexProvider = dsIndexProvider
+		m.leIndexProvider = leIndexProvider
+		m.migrations = schemaversion.GetMigrations(dsIndexProvider, leIndexProvider)
 		close(m.ready)
 	})
 }
@@ -34,7 +34,7 @@ manifest: {

 v0alpha1: {
    kinds: [examplev0alpha1]
-    // This is explicitly set to false to keep the example app disabled by default.
+    // This is explicitly set to false to keep the example app disabled by default. 
    // It can be enabled via conf overrides, or by setting this value to true and regenerating.
    served: false
 }
@@ -48,14 +48,14 @@ v1alpha1: {
    // 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.
-    // This is explicitly set to false to keep the example app disabled by default.
+    // This is explicitly set to false to keep the example app disabled by default. 
    // It can be enabled via conf overrides, or by setting this value to true and regenerating.
    served: false
    // routes contains resource routes for the version, which are split into 'namespaced' and 'cluster' scoped routes.
    // This allows you to add additional non-storage- and non-kind- based handlers for your app.
    // These should only be used if the behavior cannot be accomplished by reconciliation on storage events or subresource routes on a kind.
    routes: {
-        // namespaced contains namespace-scoped resource routes for the version,
+        // namespaced contains namespace-scoped resource routes for the version, 
        // which are exposed as HTTP handlers on '<version>/namespaces/<namespace>/<route>'.
        namespaced: {
            "/something": {
@@ -72,7 +72,7 @@ v1alpha1: {
                }
            }
        }
-        // cluster contains cluster-scoped resource routes for the version,
+        // cluster contains cluster-scoped resource routes for the version, 
        // which are exposed as HTTP handlers on '<version>/<route>'.
        cluster: {
            "/other": {
@@ -113,4 +113,4 @@ v1alpha1: {
            enabled: true
        }
    }
-}
+}
@@ -499,8 +499,8 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
-github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
 github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
@@ -853,8 +853,6 @@ github.com/grafana/grafana-plugin-sdk-go v0.284.0 h1:1bK7eWsnPBLUWDcWJWe218Ik5ad
 github.com/grafana/grafana-plugin-sdk-go v0.284.0/go.mod h1:lHPniaSxq3SL5MxDIPy04TYB1jnTp/ivkYO+xn5Rz3E=
 github.com/grafana/grafana/apps/example v0.0.0-20251027162426-edef69fdc82b h1:6Bo65etvjQ4tStkaA5+N3A3ENbO4UAWj53TxF6g2Hdk=
 github.com/grafana/grafana/apps/example v0.0.0-20251027162426-edef69fdc82b/go.mod h1:6+wASOCN8LWt6FJ8dc0oODUBIEY5XHaE6ABi8g0mR+k=
-github.com/grafana/grafana/apps/quotas v0.0.0-20251209183543-1013d74f13f2 h1:rDPMdshj3QMvpXn+wK4T8awF9n2sd8i4YRiGqX2xTvg=
-github.com/grafana/grafana/apps/quotas v0.0.0-20251209183543-1013d74f13f2/go.mod h1:M7bV60iRB61y0ISPG1HX/oNLZtlh0ZF22rUYwNkAKjo=
 github.com/grafana/grafana/pkg/promlib v0.0.8 h1:VUWsqttdf0wMI4j9OX9oNrykguQpZcruudDAFpJJVw0=
 github.com/grafana/grafana/pkg/promlib v0.0.8/go.mod h1:U1ezG/MGaEPoThqsr3lymMPN5yIPdVTJnDZ+wcXT+ao=
 github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 h1:A65jWgLk4Re28gIuZcpC0aTh71JZ0ey89hKGE9h543s=
@@ -1418,8 +1416,8 @@ github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah
 github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
 github.com/shadowspore/fossil-delta v0.0.0-20241213113458-1d797d70cbe3 h1:/4/IJi5iyTdh6mqOUaASW148HQpujYiHl0Wl78dSOSc=
 github.com/shadowspore/fossil-delta v0.0.0-20241213113458-1d797d70cbe3/go.mod h1:aJIMhRsunltJR926EB2MUg8qHemFQDreSB33pyto2Ps=
-github.com/shirou/gopsutil/v4 v4.25.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
-github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
+github.com/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs=
+github.com/shirou/gopsutil/v4 v4.25.6/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
@@ -23,12 +23,6 @@ type CoreRole struct {
 	Spec CoreRoleSpec `json:"spec" yaml:"spec"`
 }

-func NewCoreRole() *CoreRole {
-	return &CoreRole{
-		Spec: *NewCoreRoleSpec(),
-	}
-}
-
 func (o *CoreRole) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaCoreRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewCoreRole(), &CoreRoleList{}, resource.WithKind("CoreRole"),
+	schemaCoreRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &CoreRole{}, &CoreRoleList{}, resource.WithKind("CoreRole"),
 		resource.WithPlural("coreroles"), resource.WithScope(resource.NamespacedScope))
 	kindCoreRole = resource.Kind{
 		Schema: schemaCoreRole,
@@ -23,12 +23,6 @@ type ExternalGroupMapping struct {
 	Spec ExternalGroupMappingSpec `json:"spec" yaml:"spec"`
 }

-func NewExternalGroupMapping() *ExternalGroupMapping {
-	return &ExternalGroupMapping{
-		Spec: *NewExternalGroupMappingSpec(),
-	}
-}
-
 func (o *ExternalGroupMapping) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaExternalGroupMapping = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewExternalGroupMapping(), &ExternalGroupMappingList{}, resource.WithKind("ExternalGroupMapping"),
+	schemaExternalGroupMapping = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ExternalGroupMapping{}, &ExternalGroupMappingList{}, resource.WithKind("ExternalGroupMapping"),
 		resource.WithPlural("externalgroupmappings"), resource.WithScope(resource.NamespacedScope))
 	kindExternalGroupMapping = resource.Kind{
 		Schema: schemaExternalGroupMapping,
@@ -23,12 +23,6 @@ type GlobalRole struct {
 	Spec GlobalRoleSpec `json:"spec" yaml:"spec"`
 }

-func NewGlobalRole() *GlobalRole {
-	return &GlobalRole{
-		Spec: *NewGlobalRoleSpec(),
-	}
-}
-
 func (o *GlobalRole) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaGlobalRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewGlobalRole(), &GlobalRoleList{}, resource.WithKind("GlobalRole"),
+	schemaGlobalRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &GlobalRole{}, &GlobalRoleList{}, resource.WithKind("GlobalRole"),
 		resource.WithPlural("globalroles"), resource.WithScope(resource.NamespacedScope))
 	kindGlobalRole = resource.Kind{
 		Schema: schemaGlobalRole,
@@ -23,12 +23,6 @@ type GlobalRoleBinding struct {
 	Spec GlobalRoleBindingSpec `json:"spec" yaml:"spec"`
 }

-func NewGlobalRoleBinding() *GlobalRoleBinding {
-	return &GlobalRoleBinding{
-		Spec: *NewGlobalRoleBindingSpec(),
-	}
-}
-
 func (o *GlobalRoleBinding) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaGlobalRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewGlobalRoleBinding(), &GlobalRoleBindingList{}, resource.WithKind("GlobalRoleBinding"),
+	schemaGlobalRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &GlobalRoleBinding{}, &GlobalRoleBindingList{}, resource.WithKind("GlobalRoleBinding"),
 		resource.WithPlural("globalrolebindings"), resource.WithScope(resource.NamespacedScope))
 	kindGlobalRoleBinding = resource.Kind{
 		Schema: schemaGlobalRoleBinding,
@@ -23,12 +23,6 @@ type ResourcePermission struct {
 	Spec ResourcePermissionSpec `json:"spec" yaml:"spec"`
 }

-func NewResourcePermission() *ResourcePermission {
-	return &ResourcePermission{
-		Spec: *NewResourcePermissionSpec(),
-	}
-}
-
 func (o *ResourcePermission) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaResourcePermission = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewResourcePermission(), &ResourcePermissionList{}, resource.WithKind("ResourcePermission"),
+	schemaResourcePermission = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ResourcePermission{}, &ResourcePermissionList{}, resource.WithKind("ResourcePermission"),
 		resource.WithPlural("resourcepermissions"), resource.WithScope(resource.NamespacedScope))
 	kindResourcePermission = resource.Kind{
 		Schema: schemaResourcePermission,
@@ -23,12 +23,6 @@ type Role struct {
 	Spec RoleSpec `json:"spec" yaml:"spec"`
 }

-func NewRole() *Role {
-	return &Role{
-		Spec: *NewRoleSpec(),
-	}
-}
-
 func (o *Role) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewRole(), &RoleList{}, resource.WithKind("Role"),
+	schemaRole = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &Role{}, &RoleList{}, resource.WithKind("Role"),
 		resource.WithPlural("roles"), resource.WithScope(resource.NamespacedScope))
 	kindRole = resource.Kind{
 		Schema: schemaRole,
@@ -23,12 +23,6 @@ type RoleBinding struct {
 	Spec RoleBindingSpec `json:"spec" yaml:"spec"`
 }

-func NewRoleBinding() *RoleBinding {
-	return &RoleBinding{
-		Spec: *NewRoleBindingSpec(),
-	}
-}
-
 func (o *RoleBinding) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewRoleBinding(), &RoleBindingList{}, resource.WithKind("RoleBinding"),
+	schemaRoleBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &RoleBinding{}, &RoleBindingList{}, resource.WithKind("RoleBinding"),
 		resource.WithPlural("rolebindings"), resource.WithScope(resource.NamespacedScope))
 	kindRoleBinding = resource.Kind{
 		Schema: schemaRoleBinding,
@@ -23,12 +23,6 @@ type ServiceAccount struct {
 	Spec ServiceAccountSpec `json:"spec" yaml:"spec"`
 }

-func NewServiceAccount() *ServiceAccount {
-	return &ServiceAccount{
-		Spec: *NewServiceAccountSpec(),
-	}
-}
-
 func (o *ServiceAccount) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaServiceAccount = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewServiceAccount(), &ServiceAccountList{}, resource.WithKind("ServiceAccount"),
+	schemaServiceAccount = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &ServiceAccount{}, &ServiceAccountList{}, resource.WithKind("ServiceAccount"),
 		resource.WithPlural("serviceaccounts"), resource.WithScope(resource.NamespacedScope))
 	kindServiceAccount = resource.Kind{
 		Schema: schemaServiceAccount,
@@ -23,12 +23,6 @@ type Team struct {
 	Spec TeamSpec `json:"spec" yaml:"spec"`
 }

-func NewTeam() *Team {
-	return &Team{
-		Spec: *NewTeamSpec(),
-	}
-}
-
 func (o *Team) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaTeam = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewTeam(), &TeamList{}, resource.WithKind("Team"),
+	schemaTeam = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &Team{}, &TeamList{}, resource.WithKind("Team"),
 		resource.WithPlural("teams"), resource.WithScope(resource.NamespacedScope))
 	kindTeam = resource.Kind{
 		Schema: schemaTeam,
@@ -23,12 +23,6 @@ type TeamBinding struct {
 	Spec TeamBindingSpec `json:"spec" yaml:"spec"`
 }

-func NewTeamBinding() *TeamBinding {
-	return &TeamBinding{
-		Spec: *NewTeamBindingSpec(),
-	}
-}
-
 func (o *TeamBinding) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaTeamBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewTeamBinding(), &TeamBindingList{}, resource.WithKind("TeamBinding"),
+	schemaTeamBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &TeamBinding{}, &TeamBindingList{}, resource.WithKind("TeamBinding"),
 		resource.WithPlural("teambindings"), resource.WithScope(resource.NamespacedScope))
 	kindTeamBinding = resource.Kind{
 		Schema: schemaTeamBinding,
@@ -23,12 +23,6 @@ type User struct {
 	Spec UserSpec `json:"spec" yaml:"spec"`
 }

-func NewUser() *User {
-	return &User{
-		Spec: *NewUserSpec(),
-	}
-}
-
 func (o *User) GetSpec() any {
 	return o.Spec
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaUser = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewUser(), &UserList{}, resource.WithKind("User"),
+	schemaUser = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", &User{}, &UserList{}, resource.WithKind("User"),
 		resource.WithPlural("users"), resource.WithScope(resource.NamespacedScope))
 	kindUser = resource.Kind{
 		Schema: schemaUser,
@@ -1,3 +1,8 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+
 package v0alpha1

 import (
@@ -109,13 +109,6 @@ 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": {
@@ -207,13 +200,6 @@ 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": {
@@ -1,10 +1,5 @@
 include ../sdk.mk

-.PHONY: generate # Run Grafana App SDK code generation
+.PHONY: generate
 generate: install-app-sdk update-app-sdk
-	@$(APP_SDK_BIN) generate \
-		--source=./kinds/ \
-		--gogenpath=./pkg/apis \
-		--grouping=group \
-		--genoperatorstate=false \
-		--defencoding=none
+	@$(APP_SDK_BIN) generate -g ./pkg/apis --grouping=group --postprocess --defencoding=none --useoldmanifestkinds
@@ -1,18 +1,39 @@
 package investigations

-investigationV0alpha1: {
+// This is our Investigation definition, which contains metadata about the kind, and the kind's schema
+investigation: {
 	kind:       "Investigation"
+	group:      "investigations.grafana.app"
+	apiResource: {
+		groupOverride: "investigations.grafana.app"
+	}
 	pluralName: "Investigations"
-	schema: {
-		spec: {
-			title:         string
-			createdByProfile: #Person
-			hasCustomName: bool
-			isFavorite:    bool
-			overviewNote:  string
-			overviewNoteUpdatedAt: string
-			collectables: [...#Collectable] // +listType=atomic
-			viewMode:      #ViewMode
+	current:    "v0alpha1"
+	versions: {
+		"v0alpha1": {
+			codegen: {
+				frontend: true
+				backend:  true
+				options: {
+					generateObjectMeta: true
+					generateClient:     true
+					k8sLike:           true
+					package:           "github.com/grafana/grafana/apps/investigations"
+				}
+			}
+			schema: {
+				// spec is the schema of our resource
+				spec: {
+					title:         string
+					createdByProfile: #Person
+					hasCustomName: bool
+					isFavorite:    bool
+					overviewNote:  string
+					overviewNoteUpdatedAt: string
+					collectables: [...#Collectable] // +listType=atomic
+					viewMode:      #ViewMode
+				}
+			}
 		}
 	}
 }
@@ -1,18 +1,37 @@
 package investigations

-investigationIndexV0alpha1:{
+investigationIndex: {
 	kind:       "InvestigationIndex"
+	group:      "investigations.grafana.app"
+	apiResource: {
+		groupOverride: "investigations.grafana.app"
+	}
 	pluralName: "InvestigationIndexes"
-	schema: {
-		spec: {
-			// Title of the index, e.g. 'Favorites' or 'My Investigations'
-			title: string
+	current:    "v0alpha1"
+	versions: {
+		"v0alpha1": {
+			codegen: {
+				frontend: true
+				backend:  true
+				options: {
+					generateObjectMeta: true
+					generateClient:     true
+					k8sLike:           true
+					package:           "github.com/grafana/grafana/apps/investigations"
+				}
+			}
+			schema: {
+				spec: {
+					// Title of the index, e.g. 'Favorites' or 'My Investigations'
+					title: string

-			// The Person who owns this investigation index
-			owner: #Person
+					// The Person who owns this investigation index
+					owner: #Person

-			// Array of investigation summaries
-			investigationSummaries: [...#InvestigationSummary] // +listType=atomic
+					// Array of investigation summaries
+					investigationSummaries: [...#InvestigationSummary] // +listType=atomic
+				}
+			}
 		}
 	}
 }
@@ -3,16 +3,8 @@ package investigations
 manifest: {
 	appName:       "investigations"
 	groupOverride: "investigations.grafana.app"
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: {enabled: false}
-				go: {enabled: true}
-			}
-			kinds: [
-				investigationV0alpha1,
-				investigationIndexV0alpha1,
-			]
-		}
-	}
-}
+	kinds: [
+		investigation,
+		investigationIndex,
+	]
+}
@@ -4,6 +4,7 @@ import (
 	"context"

 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

 type InvestigationClient struct {
@@ -75,6 +76,24 @@ func (c *InvestigationClient) Patch(ctx context.Context, identifier resource.Ide
 	return c.client.Patch(ctx, identifier, req, opts)
 }

+func (c *InvestigationClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus InvestigationStatus, opts resource.UpdateOptions) (*Investigation, error) {
+	return c.client.Update(ctx, &Investigation{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       InvestigationKind().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 *InvestigationClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }
@@ -21,6 +21,8 @@ type Investigation struct {

 	// Spec is the spec of the Investigation
 	Spec InvestigationSpec `json:"spec" yaml:"spec"`
+
+	Status InvestigationStatus `json:"status" yaml:"status"`
 }

 func (o *Investigation) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *Investigation) SetSpec(spec any) error {
 }

 func (o *Investigation) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }

 func (o *Investigation) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *Investigation) GetSubresource(name string) (any, bool) {

 func (o *Investigation) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(InvestigationStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type InvestigationStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *Investigation) DeepCopyInto(dst *Investigation) {
 	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
@@ -291,3 +305,15 @@ func (s *InvestigationSpec) DeepCopy() *InvestigationSpec {
 func (s *InvestigationSpec) DeepCopyInto(dst *InvestigationSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of InvestigationStatus
+func (s *InvestigationStatus) DeepCopy() *InvestigationStatus {
+	cpy := &InvestigationStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies InvestigationStatus into another InvestigationStatus object
+func (s *InvestigationStatus) DeepCopyInto(dst *InvestigationStatus) {
+	resource.CopyObjectInto(dst, s)
+}
@@ -84,6 +84,7 @@ func NewInvestigationViewMode() *InvestigationViewMode {
 	return &InvestigationViewMode{}
 }

+// spec is the schema of our resource
 // +k8s:openapi-gen=true
 type InvestigationSpec struct {
 	Title                 string              `json:"title"`
@@ -1,44 +1,44 @@
 // Code generated - EDITING IS FUTILE. DO NOT EDIT.

-package v1alpha1
+package v0alpha1

 // +k8s:openapi-gen=true
-type StatusOperatorState struct {
+type InvestigationstatusOperatorState 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"`
+	State InvestigationStatusOperatorStateState `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{}
+// NewInvestigationstatusOperatorState creates a new InvestigationstatusOperatorState object.
+func NewInvestigationstatusOperatorState() *InvestigationstatusOperatorState {
+	return &InvestigationstatusOperatorState{}
 }

 // +k8s:openapi-gen=true
-type Status struct {
+type InvestigationStatus 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"`
+	OperatorStates map[string]InvestigationstatusOperatorState `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{}
+// NewInvestigationStatus creates a new InvestigationStatus object.
+func NewInvestigationStatus() *InvestigationStatus {
+	return &InvestigationStatus{}
 }

 // +k8s:openapi-gen=true
-type StatusOperatorStateState string
+type InvestigationStatusOperatorStateState string

 const (
-	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
-	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
-	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
+	InvestigationStatusOperatorStateStateSuccess    InvestigationStatusOperatorStateState = "success"
+	InvestigationStatusOperatorStateStateInProgress InvestigationStatusOperatorStateState = "in_progress"
+	InvestigationStatusOperatorStateStateFailed     InvestigationStatusOperatorStateState = "failed"
 )
@@ -4,6 +4,7 @@ import (
 	"context"

 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

 type InvestigationIndexClient struct {
@@ -75,6 +76,24 @@ func (c *InvestigationIndexClient) Patch(ctx context.Context, identifier resourc
 	return c.client.Patch(ctx, identifier, req, opts)
 }

+func (c *InvestigationIndexClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus InvestigationIndexStatus, opts resource.UpdateOptions) (*InvestigationIndex, error) {
+	return c.client.Update(ctx, &InvestigationIndex{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       InvestigationIndexKind().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 *InvestigationIndexClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }
@@ -21,6 +21,8 @@ type InvestigationIndex struct {

 	// Spec is the spec of the InvestigationIndex
 	Spec InvestigationIndexSpec `json:"spec" yaml:"spec"`
+
+	Status InvestigationIndexStatus `json:"status" yaml:"status"`
 }

 func (o *InvestigationIndex) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *InvestigationIndex) SetSpec(spec any) error {
 }

 func (o *InvestigationIndex) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }

 func (o *InvestigationIndex) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *InvestigationIndex) GetSubresource(name string) (any, bool) {

 func (o *InvestigationIndex) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(InvestigationIndexStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type InvestigationIndexStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *InvestigationIndex) DeepCopyInto(dst *InvestigationIndex) {
 	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
@@ -291,3 +305,15 @@ func (s *InvestigationIndexSpec) DeepCopy() *InvestigationIndexSpec {
 func (s *InvestigationIndexSpec) DeepCopyInto(dst *InvestigationIndexSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of InvestigationIndexStatus
+func (s *InvestigationIndexStatus) DeepCopy() *InvestigationIndexStatus {
+	cpy := &InvestigationIndexStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies InvestigationIndexStatus into another InvestigationIndexStatus object
+func (s *InvestigationIndexStatus) DeepCopyInto(dst *InvestigationIndexStatus) {
+	resource.CopyObjectInto(dst, s)
+}
@@ -20,10 +20,10 @@ import (
 )

 var (
-	rawSchemaInvestigationv0alpha1          = []byte(`{"Collectable":{"additionalProperties":false,"description":"Collectable represents an item collected during investigation","properties":{"createdAt":{"type":"string"},"datasource":{"$ref":"#/components/schemas/DatasourceRef"},"fieldConfig":{"type":"string"},"id":{"type":"string"},"logoPath":{"type":"string"},"note":{"type":"string"},"noteUpdatedAt":{"type":"string"},"origin":{"type":"string"},"queries":{"description":"+listType=atomic","items":{"type":"string"},"type":"array"},"timeRange":{"$ref":"#/components/schemas/TimeRange"},"title":{"type":"string"},"type":{"type":"string"},"url":{"type":"string"}},"required":["id","createdAt","title","origin","type","queries","timeRange","datasource","url","note","noteUpdatedAt","fieldConfig"],"type":"object"},"DatasourceRef":{"additionalProperties":false,"description":"DatasourceRef is a reference to a datasource","properties":{"uid":{"type":"string"}},"required":["uid"],"type":"object"},"Investigation":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"Person":{"additionalProperties":false,"description":"Person represents a user profile with basic information","properties":{"gravatarUrl":{"description":"URL to user's Gravatar image","type":"string"},"name":{"description":"Display name of the user","type":"string"},"uid":{"description":"Unique identifier for the user","type":"string"}},"required":["uid","name","gravatarUrl"],"type":"object"},"TimeRange":{"additionalProperties":false,"description":"TimeRange represents a time range with both absolute and relative values","properties":{"from":{"type":"string"},"raw":{"additionalProperties":false,"properties":{"from":{"type":"string"},"to":{"type":"string"}},"required":["from","to"],"type":"object"},"to":{"type":"string"}},"required":["from","to","raw"],"type":"object"},"ViewMode":{"additionalProperties":false,"properties":{"mode":{"enum":["compact","full"],"type":"string"},"showComments":{"type":"boolean"},"showTooltips":{"type":"boolean"}},"required":["mode","showComments","showTooltips"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"collectables":{"description":"+listType=atomic","items":{"$ref":"#/components/schemas/Collectable"},"type":"array"},"createdByProfile":{"$ref":"#/components/schemas/Person"},"hasCustomName":{"type":"boolean"},"isFavorite":{"type":"boolean"},"overviewNote":{"type":"string"},"overviewNoteUpdatedAt":{"type":"string"},"title":{"type":"string"},"viewMode":{"$ref":"#/components/schemas/ViewMode"}},"required":["title","createdByProfile","hasCustomName","isFavorite","overviewNote","overviewNoteUpdatedAt","collectables","viewMode"],"type":"object"}}`)
+	rawSchemaInvestigationv0alpha1          = []byte(`{"Collectable":{"additionalProperties":false,"description":"Collectable represents an item collected during investigation","properties":{"createdAt":{"type":"string"},"datasource":{"$ref":"#/components/schemas/DatasourceRef"},"fieldConfig":{"type":"string"},"id":{"type":"string"},"logoPath":{"type":"string"},"note":{"type":"string"},"noteUpdatedAt":{"type":"string"},"origin":{"type":"string"},"queries":{"description":"+listType=atomic","items":{"type":"string"},"type":"array"},"timeRange":{"$ref":"#/components/schemas/TimeRange"},"title":{"type":"string"},"type":{"type":"string"},"url":{"type":"string"}},"required":["id","createdAt","title","origin","type","queries","timeRange","datasource","url","note","noteUpdatedAt","fieldConfig"],"type":"object"},"DatasourceRef":{"additionalProperties":false,"description":"DatasourceRef is a reference to a datasource","properties":{"uid":{"type":"string"}},"required":["uid"],"type":"object"},"Investigation":{"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"},"Person":{"additionalProperties":false,"description":"Person represents a user profile with basic information","properties":{"gravatarUrl":{"description":"URL to user's Gravatar image","type":"string"},"name":{"description":"Display name of the user","type":"string"},"uid":{"description":"Unique identifier for the user","type":"string"}},"required":["uid","name","gravatarUrl"],"type":"object"},"TimeRange":{"additionalProperties":false,"description":"TimeRange represents a time range with both absolute and relative values","properties":{"from":{"type":"string"},"raw":{"additionalProperties":false,"properties":{"from":{"type":"string"},"to":{"type":"string"}},"required":["from","to"],"type":"object"},"to":{"type":"string"}},"required":["from","to","raw"],"type":"object"},"ViewMode":{"additionalProperties":false,"properties":{"mode":{"enum":["compact","full"],"type":"string"},"showComments":{"type":"boolean"},"showTooltips":{"type":"boolean"}},"required":["mode","showComments","showTooltips"],"type":"object"},"spec":{"additionalProperties":false,"description":"spec is the schema of our resource","properties":{"collectables":{"description":"+listType=atomic","items":{"$ref":"#/components/schemas/Collectable"},"type":"array"},"createdByProfile":{"$ref":"#/components/schemas/Person"},"hasCustomName":{"type":"boolean"},"isFavorite":{"type":"boolean"},"overviewNote":{"type":"string"},"overviewNoteUpdatedAt":{"type":"string"},"title":{"type":"string"},"viewMode":{"$ref":"#/components/schemas/ViewMode"}},"required":["title","createdByProfile","hasCustomName","isFavorite","overviewNote","overviewNoteUpdatedAt","collectables","viewMode"],"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"}}`)
 	versionSchemaInvestigationv0alpha1      app.VersionSchema
 	_                                       = json.Unmarshal(rawSchemaInvestigationv0alpha1, &versionSchemaInvestigationv0alpha1)
-	rawSchemaInvestigationIndexv0alpha1     = []byte(`{"CollectableSummary":{"additionalProperties":false,"properties":{"id":{"type":"string"},"logoPath":{"type":"string"},"origin":{"type":"string"},"title":{"type":"string"}},"required":["id","title","logoPath","origin"],"type":"object"},"InvestigationIndex":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"InvestigationSummary":{"additionalProperties":false,"description":"Type definition for investigation summaries","properties":{"collectableSummaries":{"description":"+listType=atomic","items":{"$ref":"#/components/schemas/CollectableSummary"},"type":"array"},"createdByProfile":{"$ref":"#/components/schemas/Person"},"hasCustomName":{"type":"boolean"},"isFavorite":{"type":"boolean"},"overviewNote":{"type":"string"},"overviewNoteUpdatedAt":{"type":"string"},"title":{"type":"string"},"viewMode":{"$ref":"#/components/schemas/ViewMode"}},"required":["title","createdByProfile","hasCustomName","isFavorite","overviewNote","overviewNoteUpdatedAt","viewMode","collectableSummaries"],"type":"object"},"Person":{"additionalProperties":false,"description":"Person represents a user profile with basic information","properties":{"gravatarUrl":{"description":"URL to user's Gravatar image","type":"string"},"name":{"description":"Display name of the user","type":"string"},"uid":{"description":"Unique identifier for the user","type":"string"}},"required":["uid","name","gravatarUrl"],"type":"object"},"ViewMode":{"additionalProperties":false,"properties":{"mode":{"enum":["compact","full"],"type":"string"},"showComments":{"type":"boolean"},"showTooltips":{"type":"boolean"}},"required":["mode","showComments","showTooltips"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"investigationSummaries":{"description":"Array of investigation summaries\n+listType=atomic","items":{"$ref":"#/components/schemas/InvestigationSummary"},"type":"array"},"owner":{"$ref":"#/components/schemas/Person","description":"The Person who owns this investigation index"},"title":{"description":"Title of the index, e.g. 'Favorites' or 'My Investigations'","type":"string"}},"required":["title","owner","investigationSummaries"],"type":"object"}}`)
+	rawSchemaInvestigationIndexv0alpha1     = []byte(`{"CollectableSummary":{"additionalProperties":false,"properties":{"id":{"type":"string"},"logoPath":{"type":"string"},"origin":{"type":"string"},"title":{"type":"string"}},"required":["id","title","logoPath","origin"],"type":"object"},"InvestigationIndex":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"InvestigationSummary":{"additionalProperties":false,"description":"Type definition for investigation summaries","properties":{"collectableSummaries":{"description":"+listType=atomic","items":{"$ref":"#/components/schemas/CollectableSummary"},"type":"array"},"createdByProfile":{"$ref":"#/components/schemas/Person"},"hasCustomName":{"type":"boolean"},"isFavorite":{"type":"boolean"},"overviewNote":{"type":"string"},"overviewNoteUpdatedAt":{"type":"string"},"title":{"type":"string"},"viewMode":{"$ref":"#/components/schemas/ViewMode"}},"required":["title","createdByProfile","hasCustomName","isFavorite","overviewNote","overviewNoteUpdatedAt","viewMode","collectableSummaries"],"type":"object"},"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"},"Person":{"additionalProperties":false,"description":"Person represents a user profile with basic information","properties":{"gravatarUrl":{"description":"URL to user's Gravatar image","type":"string"},"name":{"description":"Display name of the user","type":"string"},"uid":{"description":"Unique identifier for the user","type":"string"}},"required":["uid","name","gravatarUrl"],"type":"object"},"ViewMode":{"additionalProperties":false,"properties":{"mode":{"enum":["compact","full"],"type":"string"},"showComments":{"type":"boolean"},"showTooltips":{"type":"boolean"}},"required":["mode","showComments","showTooltips"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"investigationSummaries":{"description":"Array of investigation summaries\n+listType=atomic","items":{"$ref":"#/components/schemas/InvestigationSummary"},"type":"array"},"owner":{"$ref":"#/components/schemas/Person","description":"The Person who owns this investigation index"},"title":{"description":"Title of the index, e.g. 'Favorites' or 'My Investigations'","type":"string"}},"required":["title","owner","investigationSummaries"],"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"}}`)
 	versionSchemaInvestigationIndexv0alpha1 app.VersionSchema
 	_                                       = json.Unmarshal(rawSchemaInvestigationIndexv0alpha1, &versionSchemaInvestigationIndexv0alpha1)
 )
@@ -1,319 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,92 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,107 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,92 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,9 +1,5 @@
 package kinds

-import (
-	"github.com/grafana/grafana/apps/logsdrilldown/kinds/v0alpha1"
-)
-
 LogsDrilldownSpecv1alpha1: {
 	defaultFields: [...string] | *[]
 	prettifyJSON: bool
@@ -25,12 +21,3 @@ logsdrilldownDefaultsv1alpha1: {
 		spec: LogsDrilldownSpecv1alpha1
 	}
 }
-
-// Default columns API
-logsdrilldownDefaultColumnsv0alpha1: {
-	kind: "LogsDrilldownDefaultColumns"
-	pluralName: "LogsDrilldownDefaultColumns"
-	schema: {
-		spec: v0alpha1.LogsDefaultColumns
-	}
-}
@@ -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, logsdrilldownDefaultColumnsv0alpha1]
+    kinds: [logsdrilldownv1alpha1, logsdrilldownDefaultsv1alpha1]
    // [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
        }
    }
-}
+}
@@ -1,19 +0,0 @@
-package v0alpha1
-
-#LogsDefaultColumnsLabel: {
-	key:   string
-	value: string
-}
-
-#LogsDefaultColumnsLabels: [...#LogsDefaultColumnsLabel]
-
-#LogsDefaultColumnsRecord: {
-	columns: [...string]
-	labels: #LogsDefaultColumnsLabels
-}
-
-#LogsDefaultColumnsRecords: [...#LogsDefaultColumnsRecord]
-
-LogsDefaultColumns: {
-	records: #LogsDefaultColumnsRecords
-}
@@ -25,13 +25,6 @@ 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
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaLogsDrilldown = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", NewLogsDrilldown(), &LogsDrilldownList{}, resource.WithKind("LogsDrilldown"),
+	schemaLogsDrilldown = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldown{}, &LogsDrilldownList{}, resource.WithKind("LogsDrilldown"),
 		resource.WithPlural("logsdrilldowns"), resource.WithScope(resource.NamespacedScope))
 	kindLogsDrilldown = resource.Kind{
 		Schema: schemaLogsDrilldown,
@@ -1,99 +0,0 @@
-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)
-}
@@ -1,28 +0,0 @@
-//
-// 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{}
@@ -1,31 +0,0 @@
-// 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{},
-	}
-}
@@ -1,326 +0,0 @@
-//
-// 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)
-}
@@ -1,34 +0,0 @@
-//
-// 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
@@ -1,43 +0,0 @@
-// 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{}
-}
@@ -1,44 +0,0 @@
-// 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"
-)
@@ -25,13 +25,6 @@ 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
 }
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaLogsDrilldownDefaults = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", NewLogsDrilldownDefaults(), &LogsDrilldownDefaultsList{}, resource.WithKind("LogsDrilldownDefaults"),
+	schemaLogsDrilldownDefaults = resource.NewSimpleSchema("logsdrilldown.grafana.app", "v1alpha1", &LogsDrilldownDefaults{}, &LogsDrilldownDefaultsList{}, resource.WithKind("LogsDrilldownDefaults"),
 		resource.WithPlural("logsdrilldowndefaults"), resource.WithScope(resource.NamespacedScope))
 	kindLogsDrilldownDefaults = resource.Kind{
 		Schema: schemaLogsDrilldownDefaults,
@@ -20,15 +20,12 @@ 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)
-	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)
+	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)
 )

 var appManifestData = app.ManifestData{
@@ -55,14 +52,6 @@ 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{},
@@ -82,9 +71,8 @@ func RemoteManifest() app.Manifest {
 }

 var kindVersionToGoType = map[string]resource.Kind{
-	"LogsDrilldown/v1alpha1":               v1alpha1.LogsDrilldownKind(),
-	"LogsDrilldownDefaults/v1alpha1":       v1alpha1.LogsDrilldownDefaultsKind(),
-	"LogsDrilldownDefaultColumns/v1alpha1": v1alpha1.LogsDrilldownDefaultColumnsKind(),
+	"LogsDrilldown/v1alpha1":         v1alpha1.LogsDrilldownKind(),
+	"LogsDrilldownDefaults/v1alpha1": v1alpha1.LogsDrilldownDefaultsKind(),
 }

 // ManifestGoTypeAssociator returns the associated resource.Kind instance for a given Kind and Version, if one exists.
@@ -31,9 +31,6 @@ func New(cfg app.Config) (app.App, error) {
 			{
 				Kind: logsdrilldownv1alpha1.LogsDrilldownDefaultsKind(),
 			},
-			{
-				Kind: logsdrilldownv1alpha1.LogsDrilldownDefaultColumnsKind(),
-			},
 		},
 	}

@@ -1,18 +0,0 @@
-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,
-	}
-)
@@ -1,99 +0,0 @@
-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)
-}
@@ -1,28 +0,0 @@
-//
-// 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{}
@@ -1,31 +0,0 @@
-// 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{},
-	}
-}
@@ -1,319 +0,0 @@
-//
-// 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)
-}
@@ -1,34 +0,0 @@
-//
-// 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
@@ -1,18 +0,0 @@
-// 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{},
-	}
-}
@@ -1,18 +0,0 @@
-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,
-	}
-)
@@ -1,99 +0,0 @@
-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)
-}
@@ -1,28 +0,0 @@
-//
-// 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{}
@@ -1,31 +0,0 @@
-// 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{},
-	}
-}
@@ -1,319 +0,0 @@
-//
-// 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)
-}
@@ -1,34 +0,0 @@
-//
-// 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
--- a/Show More
+++ b/Show More