Cloudwatch: make cloudwatchBatchQueries GA

2025-12-30 15:40:14 -05:00
38 changed files with 82 additions and 1367 deletions
@@ -36,6 +36,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `awsAsyncQueryCaching`                | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                            | Yes                |
 | `dashgpt`                             | Enable AI powered features in dashboards                                                                                                                      | Yes                |
 | `kubernetesDashboards`                | Use the kubernetes API in the frontend for dashboards                                                                                                         | Yes                |
+| `cloudWatchBatchQueries`              | Runs CloudWatch metrics queries as separate batches                                                                                                           | Yes                |
 | `annotationPermissionUpdate`          | Change the way annotation permissions work by scoping them to folders and dashboards.                                                                         | Yes                |
 | `dashboardSceneForViewers`            | Enables dashboard rendering using Scenes for viewer roles                                                                                                     | Yes                |
 | `dashboardSceneSolo`                  | Enables rendering dashboards using scenes for solo panels                                                                                                     | Yes                |
@@ -83,7 +84,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `enableDatagridEditing`           | Enables the edit functionality in the datagrid panel                                                   |
 | `reportingRetries`                | Enables rendering retries for the reporting feature                                                    |
 | `externalServiceAccounts`         | Automatic service account and token setup for plugins                                                  |
-| `cloudWatchBatchQueries`          | Runs CloudWatch metrics queries as separate batches                                                    |
 | `pdfTables`                       | Enables generating table data as PDF in reporting                                                      |
 | `canvasPanelPanZoom`              | Allow pan and zoom in canvas panel                                                                     |
 | `alertingSaveStateCompressed`     | Enables the compressed protobuf-based alert state storage. Default is enabled.                         |
@@ -305,6 +305,7 @@ export interface FeatureToggles {
  queryServiceFromUI?: boolean;
  /**
  * Runs CloudWatch metrics queries as separate batches
+  * @default true
  */
  cloudWatchBatchQueries?: boolean;
  /**
@@ -1,44 +0,0 @@
-package v0alpha1
-
-import (
-	"k8s.io/kube-openapi/pkg/spec3"
-	"k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-// Optional extensions for an explicit datasource type
-// NOTE: the properties from this structure will be populated by reading an app-sdk manifest.json
-type DataSourceOpenAPIExtension struct {
-	// When specified, this will replace the default spec
-	DataSourceSpec *spec.Schema `json:"spec,omitempty"`
-
-	// Define which secure values are required
-	SecureValues []SecureValueInfo `json:"secureValues"`
-
-	// Examples added to the POST command
-	Examples map[string]*spec3.Example `json:"examples,omitempty"`
-
-	// Additional Schemas added to the response
-	Schemas map[string]*spec.Schema `json:"schemas,omitempty"`
-
-	// TODO: define query types dynamically here (currently hardcoded)
-	// Queries *queryV0.QueryTypeDefinitionList `json:"queries,omitempty"`
-
-	// Resource routes -- the paths exposed under:
-	// {group}/{version}/namespaces/{ns}/datasource/{name}/resource/{route}
-	Routes map[string]*spec3.Path `json:"routes,omitempty"`
-
-	// Proxy routes -- the paths exposed under:
-	// {group}/{version}/namespaces/{ns}/datasource/{name}/proxy/{proxy}
-	Proxy map[string]*spec3.Path `json:"proxy,omitempty"`
-}
-
-type SecureValueInfo struct {
-	// The key
-	Key string `json:"string"`
-
-	// Description
-	Description string `json:"description,omitempty"`
-
-	// Required secure values
-	Required bool `json:"required,omitempty"`
-}
@@ -12,7 +12,6 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"reflect"
 )

 // returns the current implementation version
@@ -118,23 +117,6 @@ func (j *Json) Interface() any {
 	return j.data
 }

-// Check if the underlying data is empty
-func (j *Json) IsEmpty() bool {
-	if j.data == nil {
-		return true
-	}
-	v := reflect.ValueOf(j.data)
-	switch v.Kind() {
-	case reflect.Slice, reflect.Array, reflect.Map, reflect.String:
-		if v.Len() == 0 {
-			return true
-		}
-	default:
-		return false
-	}
-	return false
-}
-
 // Encode returns its marshaled data as `[]byte`
 func (j *Json) Encode() ([]byte, error) {
 	return j.MarshalJSON()
@@ -5,7 +5,6 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )

 func TestSimplejson(t *testing.T) {
@@ -273,45 +272,3 @@ func TestMustJson(t *testing.T) {
 		MustJson([]byte(`{`))
 	})
 }
-
-func TestEmpty(t *testing.T) {
-	testCases := []struct {
-		name  string
-		input any
-		empty bool
-	}{
-		{
-			name:  "empty map (any)",
-			input: map[string]any{},
-			empty: true,
-		}, {
-			name:  "empty map (string)",
-			input: map[string]string{},
-			empty: true,
-		}, {
-			name:  "empty array (any)",
-			input: []any{},
-			empty: true,
-		}, {
-			name:  "empty array (string)",
-			input: []string{},
-			empty: true,
-		}, {
-			name:  "empty string",
-			input: "",
-			empty: true,
-		}, {
-			name:  "non empty string",
-			input: "hello",
-		}, {
-			name:  "key value",
-			input: map[string]any{"key": "value"},
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			js := NewFromAny(tc.input)
-			require.Equal(t, tc.empty, js.IsEmpty())
-		})
-	}
-}
@@ -55,33 +55,19 @@ func (r *converter) asDataSource(ds *datasources.DataSource) (*datasourceV0.Data
 		SetBasicAuthUser(ds.BasicAuthUser).
 		SetWithCredentials(ds.WithCredentials).
 		SetIsDefault(ds.IsDefault).
-		SetReadOnly(ds.ReadOnly)
+		SetReadOnly(ds.ReadOnly).
+		SetJSONData(ds.JsonData)

-	if ds.JsonData != nil && !ds.JsonData.IsEmpty() {
-		obj.Spec.SetJSONData(ds.JsonData.Interface())
-	}
-
-	rv := int64(0)
 	if !ds.Created.IsZero() {
 		obj.CreationTimestamp = metav1.NewTime(ds.Created)
-		rv = ds.Created.UnixMilli()
 	}
-
-	// Only mark updated if the times have actually changed
 	if !ds.Updated.IsZero() {
-		rv = ds.Updated.UnixMilli()
-		delta := rv - obj.CreationTimestamp.UnixMilli()
-		if delta > 1500 {
-			obj.Annotations = map[string]string{
-				utils.AnnoKeyUpdatedTimestamp: ds.Updated.UTC().Format(time.RFC3339),
-			}
+		obj.ResourceVersion = fmt.Sprintf("%d", ds.Updated.UnixMilli())
+		obj.Annotations = map[string]string{
+			utils.AnnoKeyUpdatedTimestamp: ds.Updated.Format(time.RFC3339),
 		}
 	}

-	if rv > 0 {
-		obj.ResourceVersion = strconv.FormatInt(rv, 10)
-	}
-
 	if ds.APIVersion != "" {
 		obj.APIVersion = fmt.Sprintf("%s/%s", r.group, ds.APIVersion)
 	}
@@ -1,275 +0,0 @@
-package hardcoded
-
-import (
-	"k8s.io/kube-openapi/pkg/spec3"
-	"k8s.io/kube-openapi/pkg/validation/spec"
-
-	datasourceV0 "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
-)
-
-func TestdataOpenAPIExtension() (*datasourceV0.DataSourceOpenAPIExtension, error) {
-	oas := &datasourceV0.DataSourceOpenAPIExtension{
-		SecureValues: []datasourceV0.SecureValueInfo{ // empty
-			// {
-			// 	Key:         "aaa",
-			// 	Description: "describe aaa",
-			// 	Required:    true,
-			// }, {
-			// 	Key:         "bbb",
-			// 	Description: "describe bbb",
-			// },
-		},
-
-		Examples: map[string]*spec3.Example{
-			"": {
-				ExampleProps: spec3.ExampleProps{
-					Summary: "Empty testdata",
-					Value: map[string]any{
-						"apiVersion": "testdata.datasource.grafana.app/v0alpha1",
-						"kind":       "DataSource",
-						"metadata": map[string]any{
-							"name": "my-testdata-datasource",
-						},
-						"spec": map[string]any{
-							"title": "My TestData Datasource",
-						},
-					},
-				},
-			},
-			"with-url": {
-				ExampleProps: spec3.ExampleProps{
-					Summary: "Testdata with URL (not used)",
-					Value: map[string]any{
-						"apiVersion": "testdata.datasource.grafana.app/v0alpha1",
-						"kind":       "DataSource",
-						"metadata": map[string]any{
-							"name": "testdata-with-url",
-						},
-						"spec": map[string]any{
-							"title": "TestData with URL",
-							"url":   "http://example.com",
-						},
-					},
-				},
-			},
-		},
-	}
-
-	// Dummy spec
-	p := &spec.Schema{} //SchemaProps: spec.SchemaProps{Type: []string{"object"}}}
-	p.Description = "Test data does not require any explicit configuration"
-	p.Required = []string{"title"}
-	p.AdditionalProperties = &spec.SchemaOrBool{Allows: false}
-	p.Properties = map[string]spec.Schema{
-		"title": *spec.StringProperty().WithDescription("display name"),
-		"url":   *spec.StringProperty().WithDescription("not used"),
-	}
-	p.Example = map[string]any{
-		"url": "http://xxxx",
-	}
-	oas.DataSourceSpec = p
-
-	// Resource routes
-	// https://github.com/grafana/grafana/blob/main/pkg/tsdb/grafana-testdata-datasource/resource_handler.go#L20
-	unstructured := spec.MapProperty(nil)
-	unstructuredResponse := &spec3.Responses{
-		ResponsesProps: spec3.ResponsesProps{
-			Default: &spec3.Response{
-				ResponseProps: spec3.ResponseProps{
-					Content: map[string]*spec3.MediaType{
-						"application/json": {
-							MediaTypeProps: spec3.MediaTypeProps{
-								Schema: unstructured,
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-	unstructuredRequest := &spec3.RequestBody{
-		RequestBodyProps: spec3.RequestBodyProps{
-			Content: map[string]*spec3.MediaType{
-				"application/json": {
-					MediaTypeProps: spec3.MediaTypeProps{
-						Schema: unstructured,
-					},
-				},
-			},
-		},
-	}
-
-	oas.Routes = map[string]*spec3.Path{
-		"": {
-			PathProps: spec3.PathProps{
-				Summary: "hello world",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Responses: &spec3.Responses{
-							ResponsesProps: spec3.ResponsesProps{
-								Default: &spec3.Response{
-									ResponseProps: spec3.ResponseProps{
-										Content: map[string]*spec3.MediaType{
-											"text/plain": {
-												MediaTypeProps: spec3.MediaTypeProps{
-													Schema: spec.StringProperty(),
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"/scenarios": {
-			PathProps: spec3.PathProps{
-				Summary: "hello world",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Responses: unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/stream": {
-			PathProps: spec3.PathProps{
-				Summary: "Get streaming response",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Parameters: []*spec3.Parameter{
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "count",
-									In:          "query",
-									Schema:      spec.Int64Property(),
-									Description: "number of points that will be returned",
-									Example:     10,
-								},
-							},
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "start",
-									In:          "query",
-									Schema:      spec.Int64Property(),
-									Description: "the start value",
-								},
-							},
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "flush",
-									In:          "query",
-									Schema:      spec.Int64Property(),
-									Description: "How often the result is flushed (1-100%)",
-									Example:     100,
-								},
-							},
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "speed",
-									In:          "query",
-									Schema:      spec.StringProperty(),
-									Description: "the clock cycle",
-									Example:     "100ms",
-								},
-							},
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "format",
-									In:          "query",
-									Schema:      spec.StringProperty().WithEnum("json", "influx"),
-									Description: "the response format",
-								},
-							},
-						},
-						Responses: unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/boom": {
-			PathProps: spec3.PathProps{
-				Summary: "force a panic",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Responses: unstructuredResponse,
-					},
-				},
-				Post: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Responses: unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/test": {
-			PathProps: spec3.PathProps{
-				Summary: "Echo any request",
-				Post: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						RequestBody: unstructuredRequest,
-						Responses:   unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/test/json": {
-			PathProps: spec3.PathProps{
-				Summary: "Echo json request",
-				Post: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						RequestBody: unstructuredRequest,
-						Responses:   unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/sims": {
-			PathProps: spec3.PathProps{
-				Description: "Get list of simulations",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Responses: unstructuredResponse,
-					},
-				},
-			},
-		},
-		"/sim/{key}": {
-			PathProps: spec3.PathProps{
-				Description: "Get list of simulations",
-				Get: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Parameters: []*spec3.Parameter{
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "key",
-									In:          "path",
-									Description: "simulation key (should include hz)",
-								},
-							},
-						},
-						Responses: unstructuredResponse,
-					},
-				},
-				Post: &spec3.Operation{
-					OperationProps: spec3.OperationProps{
-						Parameters: []*spec3.Parameter{
-							{
-								ParameterProps: spec3.ParameterProps{
-									Name:        "key",
-									In:          "path",
-									Description: "simulation key (should include hz)",
-								},
-							},
-						},
-						RequestBody: unstructuredRequest,
-						Responses:   unstructuredResponse,
-					},
-				},
-			},
-		},
-	}
-	return oas, nil
-}
@@ -1,24 +0,0 @@
-package hardcoded
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	// "sigs.k8s.io/yaml" // uses the same structure as json!
-)
-
-func TestSpec(t *testing.T) {
-	info, err := TestdataOpenAPIExtension()
-	require.NoError(t, err)
-	require.NotNil(t, info)
-
-	jj, err := json.MarshalIndent(info, "", "  ")
-	require.NoError(t, err)
-	fmt.Printf("%s\n", string(jj))
-
-	// jj, err = yaml.Marshal(info)
-	// require.NoError(t, err)
-	// fmt.Printf("%s\n", string(jj))
-}
@@ -2,7 +2,6 @@ package datasource

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@@ -10,15 +9,11 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apiserver/pkg/registry/rest"

-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
-	"github.com/grafana/grafana/pkg/services/datasources"
 )

 var (
@@ -89,16 +84,7 @@ func (s *legacyStorage) Create(ctx context.Context, obj runtime.Object, createVa
 	if !ok {
 		return nil, fmt.Errorf("expected a datasource object")
 	}
-	obj, err := s.datasources.CreateDataSource(ctx, ds)
-	if err != nil {
-		switch {
-		case errors.Is(err, datasources.ErrDataSourceNameExists):
-			return nil, apierrors.NewInvalid(s.resourceInfo.GroupVersionKind().GroupKind(), ds.Name, field.ErrorList{
-				field.Invalid(field.NewPath("spec", "title"), ds.Spec.Title(), "a datasource with this title already exists")})
-		}
-		return nil, err
-	}
-	return obj, nil
+	return s.datasources.CreateDataSource(ctx, ds)
 }

 // Update implements rest.Updater.
@@ -2,35 +2,17 @@ package datasource

 import (
 	"fmt"
-	"maps"
-	"slices"
-	"strings"

 	"k8s.io/kube-openapi/pkg/spec3"
 	"k8s.io/kube-openapi/pkg/validation/spec"

-	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
-	datasourceV0 "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	"github.com/grafana/grafana/pkg/registry/apis/query/queryschema"
-	"github.com/grafana/grafana/pkg/services/apiserver/builder"
 )

 func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.OpenAPI, error) {
 	// The plugin description
 	oas.Info.Description = b.pluginJSON.Info.Description

-	// Add plugin information
-	info := map[string]any{
-		"plugin": b.pluginJSON.ID,
-	}
-	if b.pluginJSON.Info.Version != "" {
-		info["version"] = b.pluginJSON.Info.Version
-	}
-	if b.pluginJSON.Info.Build.Time > 0 {
-		info["build"] = b.pluginJSON.Info.Build.Time
-	}
-	oas.Info.AddExtension("plugin", info)
-
 	// The root api URL
 	root := "/apis/" + b.datasourceResourceInfo.GroupVersion().String() + "/"

@@ -46,17 +28,6 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op
 		return nil, err
 	}

-	// Set the operation ID for the query path
-	query := oas.Paths.Paths[root+"namespaces/{namespace}/datasources/{name}/query"]
-	if query != nil && query.Post != nil {
-		query.Post.OperationId = "queryDataSource"
-		for _, p := range query.Parameters {
-			if p.Name == "name" {
-				p.Description = "DataSource identifier"
-			}
-		}
-	}
-
 	// Hide the resource routes -- explicit ones will be added if defined below
 	prefix := root + "namespaces/{namespace}/datasources/{name}/resource"
 	r := oas.Paths.Paths[prefix]
@@ -81,7 +52,7 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op

 	// Mark connections as deprecated
 	delete(oas.Paths.Paths, root+"namespaces/{namespace}/connections/{name}")
-	query = oas.Paths.Paths[root+"namespaces/{namespace}/connections/{name}/query"]
+	query := oas.Paths.Paths[root+"namespaces/{namespace}/connections/{name}/query"]
 	for query == nil || query.Post == nil {
 		return nil, fmt.Errorf("missing temporary connection path")
 	}
@@ -99,111 +70,5 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op
 		},
 	}

-	if b.schemaProvider == nil {
-		return oas, nil
-	}
-
-	custom, err := b.schemaProvider()
-	if err != nil {
-		return nil, err
-	}
-	return applyCustomSchemas(root, ds, oas, custom)
-}
-
-func applyCustomSchemas(root string, ds *spec.Schema, oas *spec3.OpenAPI, custom *datasourceV0.DataSourceOpenAPIExtension) (*spec3.OpenAPI, error) {
-	if custom == nil {
-		return oas, nil // nothing special
-	}
-
-	// Add custom schemas
-	maps.Copy(oas.Components.Schemas, custom.Schemas)
-
-	// Replace the generic DataSourceSpec with the explicit one
-	if custom.DataSourceSpec != nil {
-		oas.Components.Schemas["DataSourceSpec"] = custom.DataSourceSpec
-		ds.Properties["spec"] = spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Ref: spec.MustCreateRef("#/components/schemas/DataSourceSpec"),
-			},
-		}
-	}
-
-	if len(custom.SecureValues) > 0 {
-		example := common.InlineSecureValues{}
-		ref := spec.MustCreateRef("#/components/schemas/com.github.grafana.grafana.pkg.apimachinery.apis.common.v0alpha1.InlineSecureValue")
-		secure := &spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Properties:           make(map[string]spec.Schema),
-				AdditionalProperties: &spec.SchemaOrBool{Allows: false},
-			}}
-		secure.Description = "custom secure value definition"
-
-		for _, v := range custom.SecureValues {
-			secure.Properties[v.Key] = spec.Schema{
-				SchemaProps: spec.SchemaProps{
-					Description: v.Description,
-					Ref:         ref,
-				},
-			}
-			if v.Required {
-				secure.Required = append(secure.Required, v.Key)
-				example[v.Key] = common.InlineSecureValue{Create: "***"}
-			}
-		}
-
-		if len(example) > 0 {
-			secure.Example = example
-		}
-
-		// Link the explicit secure values in the resource
-		oas.Components.Schemas["SecureValues"] = secure
-		ds.Properties["secure"] = spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Ref: spec.MustCreateRef("#/components/schemas/SecureValues"),
-			},
-		}
-	}
-
-	// Add examples to the POST request
-	if len(custom.Examples) > 0 {
-		ds := oas.Paths.Paths[root+"namespaces/{namespace}/datasources"]
-		if ds != nil && ds.Post != nil {
-			for _, c := range ds.Post.RequestBody.Content {
-				c.Examples = custom.Examples
-			}
-		}
-	}
-
-	if len(custom.Routes) > 0 {
-		ds := oas.Paths.Paths[root+"namespaces/{namespace}/datasources/{name}"]
-		if ds == nil || len(ds.Parameters) < 2 {
-			return nil, fmt.Errorf("missing Parameters")
-		}
-
-		prefix := root + "namespaces/{namespace}/datasources/{name}/resource"
-		for k := range oas.Paths.Paths {
-			if strings.HasPrefix(k, prefix) {
-				delete(oas.Paths.Paths, k)
-			}
-		}
-
-		for k, v := range custom.Routes {
-			if k != "" && !strings.HasPrefix(k, "/") {
-				return nil, fmt.Errorf("path must have slash prefix")
-			}
-			v.Parameters = append(v.Parameters, ds.Parameters[0:2]...)
-			for m, op := range builder.GetPathOperations(v) {
-				if op.Extensions == nil {
-					op.Extensions = make(spec.Extensions)
-				}
-				if !slices.Contains(op.Tags, "Route") {
-					op.Tags = append(op.Tags, "Route") // Custom resource?
-				}
-				tmp := strings.ReplaceAll(strings.ReplaceAll(k, "{", ""), "}", "")
-				op.OperationId = fmt.Sprintf("%s_route%s", strings.ToLower(m), strings.ReplaceAll(tmp, "/", "_"))
-			}
-			oas.Paths.Paths[prefix+k] = v
-		}
-	}
 	return oas, nil
 }
@@ -25,7 +25,6 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/sources"
 	"github.com/grafana/grafana/pkg/promlib/models"
-	"github.com/grafana/grafana/pkg/registry/apis/datasource/hardcoded"
 	"github.com/grafana/grafana/pkg/registry/apis/query/queryschema"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apiserver/builder"
@@ -40,16 +39,14 @@ var (
 // DataSourceAPIBuilder is used just so wire has something unique to return
 type DataSourceAPIBuilder struct {
 	datasourceResourceInfo utils.ResourceInfo
-
-	pluginJSON           plugins.JSONData
-	client               PluginClient // will only ever be called with the same plugin id!
-	datasources          PluginDatasourceProvider
-	contextProvider      PluginContextWrapper
-	accessControl        accesscontrol.AccessControl
-	queryTypes           *queryV0.QueryTypeDefinitionList
-	schemaProvider       func() (*datasourceV0.DataSourceOpenAPIExtension, error)
-	configCrudUseNewApis bool
-	dataSourceCRUDMetric *prometheus.HistogramVec
+	pluginJSON             plugins.JSONData
+	client                 PluginClient // will only ever be called with the same plugin id!
+	datasources            PluginDatasourceProvider
+	contextProvider        PluginContextWrapper
+	accessControl          accesscontrol.AccessControl
+	queryTypes             *queryV0.QueryTypeDefinitionList
+	configCrudUseNewApis   bool
+	dataSourceCRUDMetric   *prometheus.HistogramVec
 }

 func RegisterAPIService(
@@ -62,17 +59,8 @@ func RegisterAPIService(
 	reg prometheus.Registerer,
 	pluginSources sources.Registry,
 ) (*DataSourceAPIBuilder, error) {
-	//nolint:staticcheck
-	useQueryTypes := features.IsEnabledGlobally(featuremgmt.FlagDatasourceQueryTypes)
-
-	//nolint:staticcheck
-	configCrudUseNewApis := features.IsEnabledGlobally(featuremgmt.FlagQueryServiceWithConnections)
-
-	//nolint:staticcheck
-	isExperimental := features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs)
-
 	//nolint:staticcheck // not yet migrated to OpenFeature
-	if !configCrudUseNewApis && !isExperimental {
+	if !features.IsEnabledGlobally(featuremgmt.FlagQueryServiceWithConnections) && !features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
 		return nil, nil
 	}

@@ -94,33 +82,28 @@ func RegisterAPIService(
 		return nil, fmt.Errorf("error getting list of datasource plugins: %s", err)
 	}

-	// For the ST runner, the client can talk to any plugin
-	client, ok := pluginClient.(PluginClient)
-	if !ok {
-		return nil, fmt.Errorf("plugin client is not a PluginClient: %T", pluginClient)
-	}
-
 	for _, pluginJSON := range pluginJSONs {
+		client, ok := pluginClient.(PluginClient)
+		if !ok {
+			return nil, fmt.Errorf("plugin client is not a PluginClient: %T", pluginClient)
+		}
+
 		builder, err = NewDataSourceAPIBuilder(
 			pluginJSON,
 			client,
 			datasources.GetDatasourceProvider(pluginJSON),
 			contextProvider,
 			accessControl,
-			useQueryTypes,        // Exposes the query type OpenAPI schema
-			configCrudUseNewApis, // Enables the new connections-based datasource config CRUD APIs
+			//nolint:staticcheck // not yet migrated to OpenFeature
+			features.IsEnabledGlobally(featuremgmt.FlagDatasourceQueryTypes),
+			//nolint:staticcheck // not yet migrated to OpenFeature
+			features.IsEnabledGlobally(featuremgmt.FlagQueryServiceWithConnections),
 		)
 		if err != nil {
 			return nil, err
 		}
 		builder.SetDataSourceCRUDMetrics(dataSourceCRUDMetric)

-		// Hardcoded schemas for testdata
-		// NOTE: this will be driven by the pluginJSON/manifest soon
-		if pluginJSON.ID == "grafana-testdata-datasource" {
-			builder.schemaProvider = hardcoded.TestdataOpenAPIExtension
-		}
-
 		apiRegistrar.RegisterAPI(builder)
 	}
 	return builder, nil // only used for wire
@@ -264,7 +247,6 @@ func (b *DataSourceAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserver
 			return err
 		}
 	} else {
-		// Read-only access to datasource connection info
 		storage[ds.StoragePath()] = &connectionAccess{
 			datasources:    b.datasources,
 			resourceInfo:   ds,
@@ -3,7 +3,6 @@
    "name": "unique-identifier",
    "namespace": "org-0",
    "uid": "YpaSG5GQAdxtLZtF6BqQWCeYXOhbVi5C4Cg4oILnJC0X",
-    "resourceVersion": "1015203600000",
    "generation": 8,
    "creationTimestamp": "2002-03-04T01:00:00Z",
    "labels": {
@@ -11,6 +10,7 @@
    }
  },
  "spec": {
+    "jsonData": null,
    "title": "Display name"
  }
 }
@@ -5,6 +5,7 @@
    "uid": "boDNh7zU3nXj46rOXIJI7r44qaxjs8yy9I9dOj1MyBoX"
  },
  "spec": {
+    "jsonData": null,
    "title": "Hello testdata"
  }
 }
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"maps"
-	"net/http"
 	"strings"
 	"sync"

@@ -233,9 +232,11 @@ func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder, gvs []s
 						parent := copy.Paths.Paths[path[:idx+6]]
 						if parent != nil && parent.Get != nil {
 							for _, op := range GetPathOperations(spec) {
-								action, ok := op.Extensions.GetString("x-kubernetes-action")
-								if ok && action == "connect" {
-									op.Tags = parent.Get.Tags
+								if op != nil && op.Extensions != nil {
+									action, ok := op.Extensions.GetString("x-kubernetes-action")
+									if ok && action == "connect" {
+										op.Tags = parent.Get.Tags
+									}
 								}
 							}
 						}
@@ -248,32 +249,15 @@ func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder, gvs []s
 	}
 }

-// GetPathOperations returns the set of non-nil operations defined on a path
-func GetPathOperations(path *spec3.Path) map[string]*spec3.Operation {
-	ops := make(map[string]*spec3.Operation)
-	if path.Get != nil {
-		ops[http.MethodGet] = path.Get
+func GetPathOperations(path *spec3.Path) []*spec3.Operation {
+	return []*spec3.Operation{
+		path.Get,
+		path.Head,
+		path.Delete,
+		path.Patch,
+		path.Post,
+		path.Put,
+		path.Trace,
+		path.Options,
 	}
-	if path.Head != nil {
-		ops[http.MethodHead] = path.Head
-	}
-	if path.Delete != nil {
-		ops[http.MethodDelete] = path.Delete
-	}
-	if path.Post != nil {
-		ops[http.MethodPost] = path.Post
-	}
-	if path.Put != nil {
-		ops[http.MethodPut] = path.Put
-	}
-	if path.Patch != nil {
-		ops[http.MethodPatch] = path.Patch
-	}
-	if path.Trace != nil {
-		ops[http.MethodTrace] = path.Trace
-	}
-	if path.Options != nil {
-		ops[http.MethodOptions] = path.Options
-	}
-	return ops
 }
@@ -1,76 +0,0 @@
-package builder
-
-import (
-	"slices"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"k8s.io/kube-openapi/pkg/spec3"
-)
-
-func TestOpenAPI_GetPathOperations(t *testing.T) {
-	testCases := []struct {
-		name    string
-		input   *spec3.Path
-		expect  []string // the methods we should see
-		exclude []string // the methods we should never see
-	}{
-		{
-			name: "some operations",
-			input: &spec3.Path{
-				PathProps: spec3.PathProps{
-					Get:    &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "get"}},
-					Post:   &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "post"}},
-					Delete: &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "delete"}},
-				},
-			},
-			expect:  []string{"GET", "POST", "DELETE"},
-			exclude: []string{"PUT", "PATCH", "OPTIONS", "HEAD", "TRACE"},
-		},
-		{
-			name: "all operations",
-			input: &spec3.Path{
-				PathProps: spec3.PathProps{
-					Get:     &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "get"}},
-					Post:    &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "post"}},
-					Delete:  &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "delete"}},
-					Put:     &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "put"}},
-					Patch:   &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "patch"}},
-					Options: &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "options"}},
-					Head:    &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "head"}},
-					Trace:   &spec3.Operation{OperationProps: spec3.OperationProps{Summary: "trace"}},
-				},
-			},
-			expect:  []string{"GET", "POST", "DELETE", "PUT", "PATCH", "OPTIONS", "HEAD", "TRACE"},
-			exclude: []string{},
-		},
-	}
-	for _, tt := range testCases {
-		t.Run(tt.name, func(t *testing.T) {
-			expect := make(map[string]bool)
-			for _, k := range tt.expect {
-				expect[k] = true
-			}
-
-			for k, op := range GetPathOperations(tt.input) {
-				require.NotNil(t, op)
-				require.Equal(t, strings.ToLower(k), op.Summary)
-
-				if !expect[k] {
-					if slices.Contains(tt.expect, k) {
-						require.Fail(t, "method returned multiple times", k)
-					} else {
-						require.Fail(t, "unexpected method", k)
-					}
-				}
-				delete(expect, k)
-				require.NotContains(t, tt.exclude, k, "exclude")
-			}
-
-			if len(expect) > 0 {
-				require.Fail(t, "missing expected method", expect)
-			}
-		})
-	}
-}
@@ -490,8 +490,9 @@ var (
 		{
 			Name:        "cloudWatchBatchQueries",
 			Description: "Runs CloudWatch metrics queries as separate batches",
-			Stage:       FeatureStagePublicPreview,
+			Stage:       FeatureStageGeneralAvailability,
 			Owner:       awsDatasourcesSquad,
+			Expression:  "true",
 		},
 		{
 			Name:         "cachingOptimizeSerializationMemoryUsage",
@@ -67,7 +67,7 @@ queryService,experimental,@grafana/grafana-datasources-core-services,false,true,
 queryServiceWithConnections,experimental,@grafana/grafana-datasources-core-services,false,true,false
 queryServiceRewrite,experimental,@grafana/grafana-datasources-core-services,false,true,false
 queryServiceFromUI,experimental,@grafana/grafana-datasources-core-services,false,false,true
-cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false
+cloudWatchBatchQueries,GA,@grafana/aws-datasources,false,false,false
 cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false
 alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false
 alertingProvenanceLockWrites,experimental,@grafana/alerting-squad,false,false,false
@@ -874,13 +874,17 @@
    {
      "metadata": {
        "name": "cloudWatchBatchQueries",
-        "resourceVersion": "1764664939750",
-        "creationTimestamp": "2023-10-20T19:09:41Z"
+        "resourceVersion": "1767124751522",
+        "creationTimestamp": "2023-10-20T19:09:41Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-12-30 19:59:11.522773 +0000 UTC"
+        }
      },
      "spec": {
        "description": "Runs CloudWatch metrics queries as separate batches",
-        "stage": "preview",
-        "codeowner": "@grafana/aws-datasources"
+        "stage": "GA",
+        "codeowner": "@grafana/aws-datasources",
+        "expression": "true"
      }
    },
    {
@@ -873,19 +873,10 @@ func VerifyOpenAPISnapshots(t *testing.T, dir string, gv schema.GroupVersion, h
 			require.Failf(t, "Not OK", "Code[%d] %s", rsp.Response.StatusCode, string(rsp.Body))
 		}

-		schema := map[string]any{}
-		err := json.Unmarshal(rsp.Body, &schema)
-		require.NoError(t, err)
-		info, found, err := unstructured.NestedMap(schema, "info", "plugin")
-		require.NoError(t, err)
-		if found {
-			delete(info, "version") // the version is unstable in test environments
-			err = unstructured.SetNestedMap(schema, info, "info", "plugin")
-			require.NoError(t, err)
-		}
-
-		pretty, err := json.MarshalIndent(schema, "", "  ")
+		var prettyJSON bytes.Buffer
+		err := json.Indent(&prettyJSON, rsp.Body, "", "  ")
 		require.NoError(t, err)
+		pretty := prettyJSON.String()

 		write := false
 		fpath := filepath.Join(dir, fmt.Sprintf("%s-%s.json", gv.Group, gv.Version))
@@ -894,7 +885,7 @@ func VerifyOpenAPISnapshots(t *testing.T, dir string, gv schema.GroupVersion, h
 		// We can ignore the gosec G304 warning since this is a test and the function is only called with explicit paths
 		body, err := os.ReadFile(fpath)
 		if err == nil {
-			if !assert.JSONEq(t, string(body), string(pretty)) {
+			if !assert.JSONEq(t, string(body), pretty) {
 				t.Logf("openapi spec has changed: %s", path)
 				t.Fail()
 				write = true
@@ -905,7 +896,7 @@ func VerifyOpenAPISnapshots(t *testing.T, dir string, gv schema.GroupVersion, h
 		}

 		if write {
-			e2 := os.WriteFile(fpath, pretty, 0o644)
+			e2 := os.WriteFile(fpath, []byte(pretty), 0o644)
 			if e2 != nil {
 				t.Errorf("error writing file: %s", e2.Error())
 			}
@@ -2,10 +2,7 @@
  "openapi": "3.0.0",
  "info": {
    "description": "Generates test data in different forms",
-    "title": "testdata.datasource.grafana.app/v0alpha1",
-    "plugin": {
-      "plugin": "grafana-testdata-datasource"
-    }
+    "title": "testdata.datasource.grafana.app/v0alpha1"
  },
  "paths": {
    "/apis/testdata.datasource.grafana.app/v0alpha1/": {
@@ -380,7 +377,7 @@
          "DataSource"
        ],
        "description": "Query the TestData datasources",
-        "operationId": "queryDataSource",
+        "operationId": "createDataSourceQuery",
        "requestBody": {
          "content": {
            "application/json": {
@@ -413,7 +410,7 @@
        {
          "name": "name",
          "in": "path",
-          "description": "DataSource identifier",
+          "description": "name of the QueryDataResponse",
          "required": true,
          "schema": {
            "type": "string",
@@ -433,462 +430,36 @@
      ]
    },
    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource": {
-      "summary": "hello world",
      "get": {
        "tags": [
-          "Route"
+          "DataSource"
        ],
-        "operationId": "get_route",
+        "description": "Get resources in the datasource plugin. NOTE, additional routes may exist, but are not exposed via OpenAPI",
+        "operationId": "getDataSourceResource",
        "responses": {
-          "default": {
+          "200": {
+            "description": "OK",
            "content": {
-              "text/plain": {
+              "*/*": {
                "schema": {
                  "type": "string"
                }
              }
            }
          }
+        },
+        "x-kubernetes-action": "connect",
+        "x-kubernetes-group-version-kind": {
+          "group": "testdata.datasource.grafana.app",
+          "version": "v0alpha1",
+          "kind": "Status"
        }
      },
      "parameters": [
        {
          "name": "name",
          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/boom": {
-      "summary": "force a panic",
-      "get": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "get_route_boom",
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "post_route_boom",
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/scenarios": {
-      "summary": "hello world",
-      "get": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "get_route_scenarios",
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/sim/{key}": {
-      "description": "Get list of simulations",
-      "get": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "get_route_sim_key",
-        "parameters": [
-          {
-            "name": "key",
-            "in": "path",
-            "description": "simulation key (should include hz)"
-          }
-        ],
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "post_route_sim_key",
-        "parameters": [
-          {
-            "name": "key",
-            "in": "path",
-            "description": "simulation key (should include hz)"
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "additionalProperties": true
-              }
-            }
-          }
-        },
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/sims": {
-      "description": "Get list of simulations",
-      "get": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "get_route_sims",
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/stream": {
-      "summary": "Get streaming response",
-      "get": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "get_route_stream",
-        "parameters": [
-          {
-            "name": "count",
-            "in": "query",
-            "description": "number of points that will be returned",
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            },
-            "example": 10
-          },
-          {
-            "name": "start",
-            "in": "query",
-            "description": "the start value",
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          },
-          {
-            "name": "flush",
-            "in": "query",
-            "description": "How often the result is flushed (1-100%)",
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            },
-            "example": 100
-          },
-          {
-            "name": "speed",
-            "in": "query",
-            "description": "the clock cycle",
-            "schema": {
-              "type": "string"
-            },
-            "example": "100ms"
-          },
-          {
-            "name": "format",
-            "in": "query",
-            "description": "the response format",
-            "schema": {
-              "type": "string",
-              "enum": [
-                "json",
-                "influx"
-              ]
-            }
-          }
-        ],
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/test": {
-      "summary": "Echo any request",
-      "post": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "post_route_test",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "additionalProperties": true
-              }
-            }
-          }
-        },
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        },
-        {
-          "name": "namespace",
-          "in": "path",
-          "description": "object name and auth scope, such as for teams and projects",
-          "required": true,
-          "schema": {
-            "type": "string",
-            "uniqueItems": true
-          }
-        }
-      ]
-    },
-    "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/{namespace}/datasources/{name}/resource/test/json": {
-      "summary": "Echo json request",
-      "post": {
-        "tags": [
-          "Route"
-        ],
-        "operationId": "post_route_test_json",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "additionalProperties": true
-              }
-            }
-          }
-        },
-        "responses": {
-          "default": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          }
-        }
-      },
-      "parameters": [
-        {
-          "name": "name",
-          "in": "path",
-          "description": "name of the DataSource",
+          "description": "name of the Status",
          "required": true,
          "schema": {
            "type": "string",
@@ -959,26 +530,6 @@
  },
  "components": {
    "schemas": {
-      "DataSourceSpec": {
-        "description": "Test data does not require any explicit configuration",
-        "required": [
-          "title"
-        ],
-        "properties": {
-          "title": {
-            "description": "display name",
-            "type": "string"
-          },
-          "url": {
-            "description": "not used",
-            "type": "string"
-          }
-        },
-        "additionalProperties": false,
-        "example": {
-          "url": "http://xxxx"
-        }
-      },
      "QueryRequestSchema": {
        "description": "Schema for a set of queries sent to the query method",
        "type": "object",
@@ -1099,7 +650,12 @@
            }
          },
          "spec": {
-            "$ref": "#/components/schemas/DataSourceSpec"
+            "description": "DataSource configuration -- these properties are all visible to anyone able to query the data source from their browser",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/com.github.grafana.grafana.pkg.apis.datasource.v0alpha1.UnstructuredSpec"
+              }
+            ]
          }
        },
        "x-kubernetes-group-version-kind": [
@@ -6009,9 +6009,6 @@
      "name-values-separated-comma": "Hodnoty oddělené čárkou",
      "selection-options": "Možnosti výběru"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Zpět na seznam",
      "label-icon": "Ikona",
@@ -12623,12 +12620,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Werte werden durch Komma getrennt",
      "selection-options": "Auswahloptionen"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Zurück zur Liste",
      "label-icon": "Symbol",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Valores separados por comas",
      "selection-options": "Opciones de selección"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Regresar a la lista",
      "label-icon": "Icono",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Valeurs séparées par des virgules",
      "selection-options": "Options de sélection"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Retour à la liste",
      "label-icon": "Icône",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Értékek vesszővel elválasztva",
      "selection-options": "Kijelölés beállításai"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Vissza a listához",
      "label-icon": "Ikon",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5946,9 +5946,6 @@
      "name-values-separated-comma": "Nilai dipisahkan dengan koma",
      "selection-options": "Opsi pemilihan"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Kembali ke daftar",
      "label-icon": "Ikon",
@@ -12467,12 +12464,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Valori separati da virgola",
      "selection-options": "Seleziona opzioni"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Torna all'elenco",
      "label-icon": "Icona",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5946,9 +5946,6 @@
      "name-values-separated-comma": "カンマ区切りの値",
      "selection-options": "選択オプション"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "一覧に戻る",
      "label-icon": "アイコン",
@@ -12467,12 +12464,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5946,9 +5946,6 @@
      "name-values-separated-comma": "쉼표로 구분된 값",
      "selection-options": "선택 옵션"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "목록으로 돌아가기",
      "label-icon": "아이콘",
@@ -12467,12 +12464,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Waarden gescheiden door komma",
      "selection-options": "Selectiemogelijkheden"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Terug naar lijst",
      "label-icon": "Pictogram",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -6009,9 +6009,6 @@
      "name-values-separated-comma": "Wartości rozdzielone przecinkami",
      "selection-options": "Opcje wyboru"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Powrót do listy",
      "label-icon": "Ikona",
@@ -12623,12 +12620,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Valores separados por vírgula",
      "selection-options": "Opções de seleção"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Voltar para a lista",
      "label-icon": "Ícone",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Valores separados por vírgulas",
      "selection-options": "Opções de seleção"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Voltar à lista",
      "label-icon": "Ícone",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -6009,9 +6009,6 @@
      "name-values-separated-comma": "Значения, разделенные запятыми",
      "selection-options": "Параметры выбора"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Назад к списку",
      "label-icon": "Значок",
@@ -12623,12 +12620,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Värden åtskilda med kommatecken",
      "selection-options": "Urvalsalternativ"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Tillbaka till listan",
      "label-icon": "Ikon",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5967,9 +5967,6 @@
      "name-values-separated-comma": "Virgülle ayrılmış değerler",
      "selection-options": "Seçim ayarları"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "Listeye geri dön",
      "label-icon": "Simge",
@@ -12519,12 +12516,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5946,9 +5946,6 @@
      "name-values-separated-comma": "以逗号分隔的值",
      "selection-options": "选择内容选项"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "回到列表",
      "label-icon": "图标",
@@ -12467,12 +12464,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }
@@ -5946,9 +5946,6 @@
      "name-values-separated-comma": "以逗號分隔的值",
      "selection-options": "選擇選項"
    },
-    "dashboard-edit-pane-renderer": {
-      "title-feedback-dashboard-editing-experience": ""
-    },
    "dashboard-link-form": {
      "back-to-list": "返回清單",
      "label-icon": "圖示",
@@ -12467,12 +12464,6 @@
      "shape-circle": "",
      "shape-gauge": "",
      "sparkline": "",
-      "text-mode": "",
-      "text-mode-auto": "",
-      "text-mode-name": "",
-      "text-mode-none": "",
-      "text-mode-value": "",
-      "text-mode-value-and-name": "",
      "threshold-labels": "",
      "threshold-markers": ""
    }