Alerting: Remove Dummy kind form historian app.

This kind was only needed as a workaround, with the new app-sdk, and other fixes
in Grafana, we don't need it anymore.

apps/alerting/historian/kinds/manifest.cue

@@ -9,18 +9,7 @@ manifest: {
 	groupOverride: "historian.alerting.grafana.app"
 	versions: {
 		"v0alpha1": {
-			kinds: [dummyv0alpha1]
 			routes: v0alpha1.routes
 		}
 	}
 }
-
-dummyv0alpha1: {
-    kind: "Dummy"
-    schema: {
-        // Spec is the schema of our resource. The spec should include all the user-editable information for the kind.
-        spec: {
-            dummyField: int
-        }
-    }
-}

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/constants.go

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

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_client_gen.go

@@ -1,99 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type DummyClient struct {
-	client *resource.TypedClient[*Dummy, *DummyList]
-}
-
-func NewDummyClient(client resource.Client) *DummyClient {
-	return &DummyClient{
-		client: resource.NewTypedClient[*Dummy, *DummyList](client, DummyKind()),
-	}
-}
-
-func NewDummyClientFromGenerator(generator resource.ClientGenerator) (*DummyClient, error) {
-	c, err := generator.ClientFor(DummyKind())
-	if err != nil {
-		return nil, err
-	}
-	return NewDummyClient(c), nil
-}
-
-func (c *DummyClient) Get(ctx context.Context, identifier resource.Identifier) (*Dummy, error) {
-	return c.client.Get(ctx, identifier)
-}
-
-func (c *DummyClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*DummyList, error) {
-	return c.client.List(ctx, namespace, opts)
-}
-
-func (c *DummyClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*DummyList, 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 *DummyClient) Create(ctx context.Context, obj *Dummy, opts resource.CreateOptions) (*Dummy, error) {
-	// Make sure apiVersion and kind are set
-	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = DummyKind().Kind()
-	return c.client.Create(ctx, obj, opts)
-}
-
-func (c *DummyClient) Update(ctx context.Context, obj *Dummy, opts resource.UpdateOptions) (*Dummy, error) {
-	return c.client.Update(ctx, obj, opts)
-}
-
-func (c *DummyClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*Dummy, error) {
-	return c.client.Patch(ctx, identifier, req, opts)
-}
-
-func (c *DummyClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus DummyStatus, opts resource.UpdateOptions) (*Dummy, error) {
-	return c.client.Update(ctx, &Dummy{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       DummyKind().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 *DummyClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
-	return c.client.Delete(ctx, identifier, opts)
-}

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_codec_gen.go

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

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_metadata_gen.go

@@ -1,31 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-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 DummyMetadata 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"`
-}
-
-// NewDummyMetadata creates a new DummyMetadata object.
-func NewDummyMetadata() *DummyMetadata {
-	return &DummyMetadata{
-		Finalizers: []string{},
-		Labels:     map[string]string{},
-	}
-}

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_object_gen.go

@@ -1,319 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-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 Dummy struct {
-	metav1.TypeMeta   `json:",inline" yaml:",inline"`
-	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
-
-	// Spec is the spec of the Dummy
-	Spec DummySpec `json:"spec" yaml:"spec"`
-
-	Status DummyStatus `json:"status" yaml:"status"`
-}
-
-func (o *Dummy) GetSpec() any {
-	return o.Spec
-}
-
-func (o *Dummy) SetSpec(spec any) error {
-	cast, ok := spec.(DummySpec)
-	if !ok {
-		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
-	}
-	o.Spec = cast
-	return nil
-}
-
-func (o *Dummy) GetSubresources() map[string]any {
-	return map[string]any{
-		"status": o.Status,
-	}
-}
-
-func (o *Dummy) GetSubresource(name string) (any, bool) {
-	switch name {
-	case "status":
-		return o.Status, true
-	default:
-		return nil, false
-	}
-}
-
-func (o *Dummy) SetSubresource(name string, value any) error {
-	switch name {
-	case "status":
-		cast, ok := value.(DummyStatus)
-		if !ok {
-			return fmt.Errorf("cannot set status type %#v, not of type DummyStatus", value)
-		}
-		o.Status = cast
-		return nil
-	default:
-		return fmt.Errorf("subresource '%s' does not exist", name)
-	}
-}
-
-func (o *Dummy) 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 *Dummy) 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 *Dummy) 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 *Dummy) 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 *Dummy) GetCreatedBy() string {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
-}
-
-func (o *Dummy) SetCreatedBy(createdBy string) {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
-}
-
-func (o *Dummy) 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 *Dummy) 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 *Dummy) GetUpdatedBy() string {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
-}
-
-func (o *Dummy) SetUpdatedBy(updatedBy string) {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
-}
-
-func (o *Dummy) Copy() resource.Object {
-	return resource.CopyObject(o)
-}
-
-func (o *Dummy) DeepCopyObject() runtime.Object {
-	return o.Copy()
-}
-
-func (o *Dummy) DeepCopy() *Dummy {
-	cpy := &Dummy{}
-	o.DeepCopyInto(cpy)
-	return cpy
-}
-
-func (o *Dummy) DeepCopyInto(dst *Dummy) {
-	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 = &Dummy{}
-
-// +k8s:openapi-gen=true
-type DummyList struct {
-	metav1.TypeMeta `json:",inline" yaml:",inline"`
-	metav1.ListMeta `json:"metadata" yaml:"metadata"`
-	Items           []Dummy `json:"items" yaml:"items"`
-}
-
-func (o *DummyList) DeepCopyObject() runtime.Object {
-	return o.Copy()
-}
-
-func (o *DummyList) Copy() resource.ListObject {
-	cpy := &DummyList{
-		TypeMeta: o.TypeMeta,
-		Items:    make([]Dummy, len(o.Items)),
-	}
-	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
-	for i := 0; i < len(o.Items); i++ {
-		if item, ok := o.Items[i].Copy().(*Dummy); ok {
-			cpy.Items[i] = *item
-		}
-	}
-	return cpy
-}
-
-func (o *DummyList) 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 *DummyList) SetItems(items []resource.Object) {
-	o.Items = make([]Dummy, len(items))
-	for i := 0; i < len(items); i++ {
-		o.Items[i] = *items[i].(*Dummy)
-	}
-}
-
-func (o *DummyList) DeepCopy() *DummyList {
-	cpy := &DummyList{}
-	o.DeepCopyInto(cpy)
-	return cpy
-}
-
-func (o *DummyList) DeepCopyInto(dst *DummyList) {
-	resource.CopyObjectInto(dst, o)
-}
-
-// Interface compliance compile-time check
-var _ resource.ListObject = &DummyList{}
-
-// Copy methods for all subresource types
-
-// DeepCopy creates a full deep copy of Spec
-func (s *DummySpec) DeepCopy() *DummySpec {
-	cpy := &DummySpec{}
-	s.DeepCopyInto(cpy)
-	return cpy
-}
-
-// DeepCopyInto deep copies Spec into another Spec object
-func (s *DummySpec) DeepCopyInto(dst *DummySpec) {
-	resource.CopyObjectInto(dst, s)
-}
-
-// DeepCopy creates a full deep copy of DummyStatus
-func (s *DummyStatus) DeepCopy() *DummyStatus {
-	cpy := &DummyStatus{}
-	s.DeepCopyInto(cpy)
-	return cpy
-}
-
-// DeepCopyInto deep copies DummyStatus into another DummyStatus object
-func (s *DummyStatus) DeepCopyInto(dst *DummyStatus) {
-	resource.CopyObjectInto(dst, s)
-}

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_schema_gen.go

@@ -1,34 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"github.com/grafana/grafana-app-sdk/resource"
-)
-
-// schema is unexported to prevent accidental overwrites
-var (
-	schemaDummy = resource.NewSimpleSchema("historian.alerting.grafana.app", "v0alpha1", &Dummy{}, &DummyList{}, resource.WithKind("Dummy"),
-		resource.WithPlural("dummys"), resource.WithScope(resource.NamespacedScope))
-	kindDummy = resource.Kind{
-		Schema: schemaDummy,
-		Codecs: map[resource.KindEncoding]resource.Codec{
-			resource.KindEncodingJSON: &DummyJSONCodec{},
-		},
-	}
-)
-
-// Kind returns a resource.Kind for this Schema with a JSON codec
-func DummyKind() resource.Kind {
-	return kindDummy
-}
-
-// Schema returns a resource.SimpleSchema representation of Dummy
-func DummySchema() *resource.SimpleSchema {
-	return schemaDummy
-}
-
-// Interface compliance checks
-var _ resource.Schema = kindDummy

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_spec_gen.go

@@ -1,14 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-// Spec is the schema of our resource. The spec should include all the user-editable information for the kind.
-// +k8s:openapi-gen=true
-type DummySpec struct {
-	DummyField int64 `json:"dummyField"`
-}
-
-// NewDummySpec creates a new DummySpec object.
-func NewDummySpec() *DummySpec {
-	return &DummySpec{}
-}

apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1/dummy_status_gen.go

@@ -1,44 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-// +k8s:openapi-gen=true
-type DummystatusOperatorState 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 DummyStatusOperatorStateState `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"`
-}
-
-// NewDummystatusOperatorState creates a new DummystatusOperatorState object.
-func NewDummystatusOperatorState() *DummystatusOperatorState {
-	return &DummystatusOperatorState{}
-}
-
-// +k8s:openapi-gen=true
-type DummyStatus 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]DummystatusOperatorState `json:"operatorStates,omitempty"`
-	// additionalFields is reserved for future use
-	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
-}
-
-// NewDummyStatus creates a new DummyStatus object.
-func NewDummyStatus() *DummyStatus {
-	return &DummyStatus{}
-}
-
-// +k8s:openapi-gen=true
-type DummyStatusOperatorStateState string
-
-const (
-	DummyStatusOperatorStateStateSuccess    DummyStatusOperatorStateState = "success"
-	DummyStatusOperatorStateStateInProgress DummyStatusOperatorStateState = "in_progress"
-	DummyStatusOperatorStateStateFailed     DummyStatusOperatorStateState = "failed"
-)

apps/alerting/historian/pkg/apis/alertinghistorian_manifest.go

@@ -6,7 +6,6 @@
 package apis
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -19,12 +18,6 @@ import (
 	v0alpha1 "github.com/grafana/grafana/apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1"
 )
 
-var (
-	rawSchemaDummyv0alpha1     = []byte(`{"Dummy":{"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,"description":"Spec is the schema of our resource. The spec should include all the user-editable information for the kind.","properties":{"dummyField":{"type":"integer"}},"required":["dummyField"],"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"}}`)
-	versionSchemaDummyv0alpha1 app.VersionSchema
-	_                          = json.Unmarshal(rawSchemaDummyv0alpha1, &versionSchemaDummyv0alpha1)
-)
-
 var appManifestData = app.ManifestData{
 	AppName:          "alerting-historian",
 	Group:            "historian.alerting.grafana.app",
@@ -33,15 +26,7 @@ var appManifestData = app.ManifestData{
 		{
 			Name:   "v0alpha1",
 			Served: true,
-			Kinds: []app.ManifestVersionKind{
-				{
-					Kind:       "Dummy",
-					Plural:     "Dummys",
-					Scope:      "Namespaced",
-					Conversion: false,
-					Schema:     &versionSchemaDummyv0alpha1,
-				},
-			},
+			Kinds:  []app.ManifestVersionKind{},
 			Routes: app.ManifestVersionRoutes{
 				Namespaced: map[string]spec3.PathProps{
 					"/alertstate/history": {
@@ -181,6 +166,13 @@ var appManifestData = app.ManifestData{
 																		"entries": {
 																			SchemaProps: spec.SchemaProps{
 																				Type: []string{"array"},
+																				Items: &spec.SchemaOrArray{
+																					Schema: &spec.Schema{
+																						SchemaProps: spec.SchemaProps{
+
+																							Ref: spec.MustCreateRef("#/components/schemas/createNotificationqueryNotificationEntry"),
+																						}},
+																				},
 																			},
 																		},
 																	},
@@ -235,6 +227,13 @@ var appManifestData = app.ManifestData{
 					"createNotificationqueryMatchers": {
 						SchemaProps: spec.SchemaProps{
 							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+
+										Ref: spec.MustCreateRef("#/components/schemas/createNotificationqueryMatcher"),
+									}},
+							},
 						},
 					},
 					"createNotificationqueryNotificationEntry": {
@@ -245,6 +244,13 @@ var appManifestData = app.ManifestData{
 									SchemaProps: spec.SchemaProps{
 										Type:        []string{"array"},
 										Description: "Alerts are the alerts grouped into the notification.",
+										Items: &spec.SchemaOrArray{
+											Schema: &spec.Schema{
+												SchemaProps: spec.SchemaProps{
+
+													Ref: spec.MustCreateRef("#/components/schemas/createNotificationqueryNotificationEntryAlert"),
+												}},
+										},
 									},
 								},
 								"duration": {
@@ -420,9 +426,7 @@ func RemoteManifest() app.Manifest {
 	return app.NewAPIServerManifest("alerting-historian")
 }
 
-var kindVersionToGoType = map[string]resource.Kind{
-	"Dummy/v0alpha1": v0alpha1.DummyKind(),
-}
+var kindVersionToGoType = map[string]resource.Kind{}
 
 // ManifestGoTypeAssociator returns the associated resource.Kind instance for a given Kind and Version, if one exists.
 // If there is no association for the provided Kind and Version, exists will return false.

apps/alerting/historian/pkg/app/app.go

@@ -12,7 +12,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/grafana/grafana/apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1"
 	"github.com/grafana/grafana/apps/alerting/historian/pkg/app/config"
 	"github.com/grafana/grafana/apps/alerting/historian/pkg/app/notification"
 )
@@ -47,12 +46,6 @@ func New(cfg app.Config) (app.App, error) {
 				}: notificationHandler.QueryHandler,
 			},
 		},
-		// TODO: Remove when SDK is fixed.
-		ManagedKinds: []simple.AppManagedKind{
-			{
-				Kind: v0alpha1.DummyKind(),
-			},
-		},
 	}
 
 	a, err := simple.NewApp(simpleConfig)