CloudWatch: fix error source for some query errors

apps/advisor/go.mod

@@ -54,7 +54,6 @@ require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
-	github.com/Machiel/slugify v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect

apps/advisor/go.sum

@@ -115,8 +115,6 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapp
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
 github.com/IBM/pgxpoolprometheus v1.1.2 h1:sHJwxoL5Lw4R79Zt+H4Uj1zZ4iqXJLdk7XDE7TPs97U=
 github.com/IBM/pgxpoolprometheus v1.1.2/go.mod h1:+vWzISN6S9ssgurhUNmm6AlXL9XLah3TdWJktquKTR8=
-github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E=
-github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=

apps/alerting/notifications/definitions/alerting-notifications-manifest.yaml

@@ -430,100 +430,4 @@ spec:
           type: object
       scope: Namespaced
     name: v0alpha1
-    routes:
-      namespaced:
-        /testing/integration:
-          get:
-            operationId: getIntegrationTest
-            requestBody:
-              content:
-                application/json:
-                  schema:
-                    additionalProperties: false
-                    properties:
-                      alert:
-                        $ref: '#/components/schemas/getIntegrationTestAlert'
-                      integration:
-                        $ref: '#/components/schemas/getIntegrationTestIntegration'
-                      receiver_ref:
-                        type: string
-                    required:
-                    - alert
-                    - integration
-                    type: object
-              required: true
-            responses:
-              default:
-                content:
-                  application/json:
-                    schema:
-                      additionalProperties: false
-                      properties:
-                        apiVersion:
-                          description: 'APIVersion defines the versioned schema of
-                            this representation of an object. Servers should convert
-                            recognized schemas to the latest internal value, and may
-                            reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-                          type: string
-                        duration:
-                          type: string
-                        error:
-                          type: string
-                        kind:
-                          description: 'Kind is a string value representing the REST
-                            resource this object represents. Servers may infer this
-                            from the endpoint the client submits requests to. Cannot
-                            be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                          type: string
-                        timestamp:
-                          format: date-time
-                          type: string
-                      required:
-                      - timestamp
-                      - duration
-                      - apiVersion
-                      - kind
-                      type: object
-                description: Default OK response
-      schemas:
-        getIntegrationTestAlert:
-          additionalProperties: false
-          properties:
-            annotations:
-              additionalProperties:
-                type: string
-              type: object
-            labels:
-              additionalProperties:
-                type: string
-              type: object
-          required:
-          - labels
-          - annotations
-          type: object
-        getIntegrationTestIntegration:
-          additionalProperties: false
-          properties:
-            disableResolveMessage:
-              type: boolean
-            secureFields:
-              additionalProperties:
-                type: boolean
-              type: object
-            settings:
-              additionalProperties:
-                additionalProperties: {}
-                type: object
-              type: object
-            type:
-              type: string
-            uid:
-              type: string
-            version:
-              type: string
-          required:
-          - type
-          - version
-          - settings
-          type: object
     served: true

apps/alerting/notifications/kinds/manifest.cue

@@ -1,19 +1,5 @@
 package kinds
 
-import (
-	"time",
-	"github.com/grafana/grafana/apps/alerting/notifications/kinds/v0alpha1"
-)
-
-#Alert: {
-	labels: {
-		[string]: string
-	}
-	annotations: {
-		[string]: string
-	}
-}
-
 manifest: {
 	appName:       "alerting-notifications"
 	groupOverride: "notifications.alerting.grafana.app"
@@ -28,28 +14,7 @@ manifest: {
 				routeTreev0alpha1,
 				templatev0alpha1,
 				timeIntervalv0alpha1,
-			],
-			routes: {
-				namespaced: {
-					"/testing/integration" : {
-						"GET": {
-							name: "getIntegrationTest"
-							request: {
-								body: {
-										alert: #Alert
-										receiver_ref?: string
-										integration: v0alpha1.#Integration
-								}
-							}
-							response: {
-									timestamp: time.Time
-									duration: string
-									error?: string
-							}
-						}
-					}
-				}
-			},
+			]
 		}
 	}
 }

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/getintegrationtest_request_body_types_gen.go

@@ -1,46 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-type GetIntegrationTestRequestAlert struct {
-	Labels      map[string]string `json:"labels"`
-	Annotations map[string]string `json:"annotations"`
-}
-
-// NewGetIntegrationTestRequestAlert creates a new GetIntegrationTestRequestAlert object.
-func NewGetIntegrationTestRequestAlert() *GetIntegrationTestRequestAlert {
-	return &GetIntegrationTestRequestAlert{
-		Labels:      map[string]string{},
-		Annotations: map[string]string{},
-	}
-}
-
-type GetIntegrationTestRequestIntegration struct {
-	Uid                   *string         `json:"uid,omitempty"`
-	Type                  string          `json:"type"`
-	Version               string          `json:"version"`
-	DisableResolveMessage *bool           `json:"disableResolveMessage,omitempty"`
-	Settings              map[string]any  `json:"settings"`
-	SecureFields          map[string]bool `json:"secureFields,omitempty"`
-}
-
-// NewGetIntegrationTestRequestIntegration creates a new GetIntegrationTestRequestIntegration object.
-func NewGetIntegrationTestRequestIntegration() *GetIntegrationTestRequestIntegration {
-	return &GetIntegrationTestRequestIntegration{
-		Settings: map[string]any{},
-	}
-}
-
-type GetIntegrationTestRequestBody struct {
-	Alert       GetIntegrationTestRequestAlert       `json:"alert"`
-	ReceiverRef *string                              `json:"receiver_ref,omitempty"`
-	Integration GetIntegrationTestRequestIntegration `json:"integration"`
-}
-
-// NewGetIntegrationTestRequestBody creates a new GetIntegrationTestRequestBody object.
-func NewGetIntegrationTestRequestBody() *GetIntegrationTestRequestBody {
-	return &GetIntegrationTestRequestBody{
-		Alert:       *NewGetIntegrationTestRequestAlert(),
-		Integration: *NewGetIntegrationTestRequestIntegration(),
-	}
-}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/getintegrationtest_response_body_types_gen.go

@@ -1,19 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-import (
-	time "time"
-)
-
-// +k8s:openapi-gen=true
-type GetIntegrationTestBody struct {
-	Timestamp time.Time `json:"timestamp"`
-	Duration  string    `json:"duration"`
-	Error     *string   `json:"error,omitempty"`
-}
-
-// NewGetIntegrationTestBody creates a new GetIntegrationTestBody object.
-func NewGetIntegrationTestBody() *GetIntegrationTestBody {
-	return &GetIntegrationTestBody{}
-}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/getintegrationtest_response_object_types_gen.go

@@ -1,37 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-import (
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-// +k8s:openapi-gen=true
-type GetIntegrationTest struct {
-	metav1.TypeMeta        `json:",inline"`
-	GetIntegrationTestBody `json:",inline"`
-}
-
-func NewGetIntegrationTest() *GetIntegrationTest {
-	return &GetIntegrationTest{}
-}
-
-func (t *GetIntegrationTestBody) DeepCopyInto(dst *GetIntegrationTestBody) {
-	_ = resource.CopyObjectInto(dst, t)
-}
-
-func (o *GetIntegrationTest) DeepCopyObject() runtime.Object {
-	dst := NewGetIntegrationTest()
-	o.DeepCopyInto(dst)
-	return dst
-}
-
-func (o *GetIntegrationTest) DeepCopyInto(dst *GetIntegrationTest) {
-	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
-	dst.TypeMeta.Kind = o.TypeMeta.Kind
-	o.GetIntegrationTestBody.DeepCopyInto(&dst.GetIntegrationTestBody)
-}
-
-var _ runtime.Object = NewGetIntegrationTest()

apps/alerting/notifications/pkg/apis/alertingnotifications_manifest.go

@@ -79,206 +79,9 @@ var appManifestData = app.ManifestData{
 				},
 			},
 			Routes: app.ManifestVersionRoutes{
-				Namespaced: map[string]spec3.PathProps{
-					"/testing/integration": {
-						Get: &spec3.Operation{
-							OperationProps: spec3.OperationProps{
-
-								OperationId: "getIntegrationTest",
-
-								RequestBody: &spec3.RequestBody{
-									RequestBodyProps: spec3.RequestBodyProps{
-
-										Required: true,
-										Content: map[string]*spec3.MediaType{
-											"application/json": {
-												MediaTypeProps: spec3.MediaTypeProps{
-													Schema: &spec.Schema{
-														SchemaProps: spec.SchemaProps{
-															Type: []string{"object"},
-															Properties: map[string]spec.Schema{
-																"alert": {
-																	SchemaProps: spec.SchemaProps{
-
-																		Ref: spec.MustCreateRef("#/components/schemas/getIntegrationTestAlert"),
-																	},
-																},
-																"integration": {
-																	SchemaProps: spec.SchemaProps{
-
-																		Ref: spec.MustCreateRef("#/components/schemas/getIntegrationTestIntegration"),
-																	},
-																},
-																"receiver_ref": {
-																	SchemaProps: spec.SchemaProps{
-																		Type: []string{"string"},
-																	},
-																},
-															},
-															Required: []string{
-																"alert",
-																"integration",
-															},
-														}},
-												}},
-										},
-									}},
-								Responses: &spec3.Responses{
-									ResponsesProps: spec3.ResponsesProps{
-										Default: &spec3.Response{
-											ResponseProps: spec3.ResponseProps{
-												Description: "Default OK response",
-												Content: map[string]*spec3.MediaType{
-													"application/json": {
-														MediaTypeProps: spec3.MediaTypeProps{
-															Schema: &spec.Schema{
-																SchemaProps: spec.SchemaProps{
-																	Type: []string{"object"},
-																	Properties: map[string]spec.Schema{
-																		"apiVersion": {
-																			SchemaProps: spec.SchemaProps{
-																				Type:        []string{"string"},
-																				Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-																			},
-																		},
-																		"duration": {
-																			SchemaProps: spec.SchemaProps{
-																				Type: []string{"string"},
-																			},
-																		},
-																		"error": {
-																			SchemaProps: spec.SchemaProps{
-																				Type: []string{"string"},
-																			},
-																		},
-																		"kind": {
-																			SchemaProps: spec.SchemaProps{
-																				Type:        []string{"string"},
-																				Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-																			},
-																		},
-																		"timestamp": {
-																			SchemaProps: spec.SchemaProps{
-																				Type:   []string{"string"},
-																				Format: "date-time",
-																			},
-																		},
-																	},
-																	Required: []string{
-																		"timestamp",
-																		"duration",
-																		"apiVersion",
-																		"kind",
-																	},
-																}},
-														}},
-												},
-											},
-										},
-									}},
-							},
-						},
-					},
-				},
-				Cluster: map[string]spec3.PathProps{},
-				Schemas: map[string]spec.Schema{
-					"getIntegrationTestAlert": {
-						SchemaProps: spec.SchemaProps{
-							Type: []string{"object"},
-							Properties: map[string]spec.Schema{
-								"annotations": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"object"},
-										AdditionalProperties: &spec.SchemaOrBool{
-											Schema: &spec.Schema{
-												SchemaProps: spec.SchemaProps{
-													Type: []string{"string"},
-												},
-											},
-										},
-									},
-								},
-								"labels": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"object"},
-										AdditionalProperties: &spec.SchemaOrBool{
-											Schema: &spec.Schema{
-												SchemaProps: spec.SchemaProps{
-													Type: []string{"string"},
-												},
-											},
-										},
-									},
-								},
-							},
-							Required: []string{
-								"labels",
-								"annotations",
-							},
-						},
-					},
-					"getIntegrationTestIntegration": {
-						SchemaProps: spec.SchemaProps{
-							Type: []string{"object"},
-							Properties: map[string]spec.Schema{
-								"disableResolveMessage": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"boolean"},
-									},
-								},
-								"secureFields": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"object"},
-										AdditionalProperties: &spec.SchemaOrBool{
-											Schema: &spec.Schema{
-												SchemaProps: spec.SchemaProps{
-													Type: []string{"boolean"},
-												},
-											},
-										},
-									},
-								},
-								"settings": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"object"},
-										AdditionalProperties: &spec.SchemaOrBool{
-											Schema: &spec.Schema{
-												SchemaProps: spec.SchemaProps{
-													Type: []string{"object"},
-													AdditionalProperties: &spec.SchemaOrBool{
-														Schema: &spec.Schema{
-															SchemaProps: spec.SchemaProps{},
-														},
-													},
-												},
-											},
-										},
-									},
-								},
-								"type": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"string"},
-									},
-								},
-								"uid": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"string"},
-									},
-								},
-								"version": {
-									SchemaProps: spec.SchemaProps{
-										Type: []string{"string"},
-									},
-								},
-							},
-							Required: []string{
-								"type",
-								"version",
-								"settings",
-							},
-						},
-					},
-				},
+				Namespaced: map[string]spec3.PathProps{},
+				Cluster:    map[string]spec3.PathProps{},
+				Schemas:    map[string]spec.Schema{},
 			},
 		},
 	},
@@ -306,9 +109,7 @@ func ManifestGoTypeAssociator(kind, version string) (goType resource.Kind, exist
 	return goType, exists
 }
 
-var customRouteToGoResponseType = map[string]any{
-	"v0alpha1||<namespace>/testing/integration|GET": v0alpha1.GetIntegrationTest{},
-}
+var customRouteToGoResponseType = map[string]any{}
 
 // ManifestCustomRouteResponsesAssociator returns the associated response go type for a given kind, version, custom route path, and method, if one exists.
 // kind may be empty for custom routes which are not kind subroutes. Leading slashes are removed from subroute paths.
@@ -332,9 +133,7 @@ func ManifestCustomRouteQueryAssociator(kind, version, path, verb string) (goTyp
 	return goType, exists
 }
 
-var customRouteToGoRequestBodyType = map[string]any{
-	"v0alpha1||<namespace>/testing/integration|GET": v0alpha1.GetIntegrationTestRequestBody{},
-}
+var customRouteToGoRequestBodyType = map[string]any{}
 
 func ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb string) (goType any, exists bool) {
 	if len(path) > 0 && path[0] == '/' {

apps/alerting/notifications/pkg/app/app.go

@@ -2,8 +2,6 @@ package app
 
 import (
 	"context"
-	"errors"
-	"fmt"
 
 	"github.com/grafana/grafana-app-sdk/app"
 	"github.com/grafana/grafana-app-sdk/logging"
@@ -11,7 +9,6 @@ import (
 	"github.com/grafana/grafana-app-sdk/simple"
 
 	"github.com/grafana/grafana/apps/alerting/notifications/pkg/apis"
-	"github.com/grafana/grafana/apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1"
 )
 
 func New(cfg app.Config) (app.App, error) {
@@ -22,14 +19,6 @@ func New(cfg app.Config) (app.App, error) {
 		}
 	}
 
-	customCfg, ok := cfg.SpecificConfig.(*Config)
-	if !ok {
-		return nil, errors.New("no configuration")
-	}
-	if err := customCfg.Validate(); err != nil {
-		return nil, fmt.Errorf("invalid configuration: %w", err)
-	}
-
 	c := simple.AppConfig{
 		Name:       "alerting.notification",
 		KubeConfig: cfg.KubeConfig,
@@ -41,15 +30,6 @@ func New(cfg app.Config) (app.App, error) {
 			},
 		},
 		ManagedKinds: managedKinds,
-		VersionedCustomRoutes: map[string]simple.AppVersionRouteHandlers{
-			v0alpha1.APIVersion: {
-				simple.AppVersionRoute{
-					Namespaced: true,
-					Path:       "testing/integration",
-					Method:     "GET",
-				}: customCfg.ReceiverTestingHandler.HandleReceiverTestingRequest,
-			},
-		},
 	}
 
 	a, err := simple.NewApp(c)

apps/alerting/notifications/pkg/app/config.go

@@ -1,23 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-
-	"github.com/grafana/grafana-app-sdk/app"
-)
-
-type Config struct {
-	ReceiverTestingHandler ReceiverTestingHandler
-}
-
-func (c *Config) Validate() error {
-	if c.ReceiverTestingHandler == nil {
-		return errors.New("receiver testing handler is required")
-	}
-	return nil
-}
-
-type ReceiverTestingHandler interface {
-	HandleReceiverTestingRequest(context.Context, app.CustomRouteResponseWriter, *app.CustomRouteRequest) error
-}

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

@@ -85,20 +85,20 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
 		// Only track schema versions for v0/v1 dashboards (v2+ info is redundant with API version)
 		switch source := a.(type) {
 		case *dashv0.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			if source.Spec.Object != nil {
 				sourceSchemaVersion = schemaversion.GetSchemaVersion(source.Spec.Object)
 			}
 		case *dashv2alpha1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		case *dashv2beta1.Dashboard:
-			dashboardUID = source.Name
+			dashboardUID = string(source.UID)
 			// Don't track schema version for v2+ (redundant with API version)
 		}
 

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v10.table_thresholds.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v11.no-op-migration.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -131,10 +115,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.graph_thresholds.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -131,10 +115,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v13.minimal_graph_config.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -54,10 +50,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v14.shared_crosshair_to_graph_tooltip.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -54,10 +50,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v0alpha1.json

@@ -65,9 +65,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Versions running\nShows the versions reported by each running pod.\n\nThe rollout will fail if any pod is not running the expected version.\n\nPods in green are running the expected version, while pods running other versions are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -188,9 +185,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Deployment rollout progress\nShows the number of pods for each `Deployment` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `Deployment`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -292,9 +286,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### StatefulSet rollout progress\nShows the number of pods for each `StatefulSet` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `StatefulSet`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -408,9 +399,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Aggregator lag\nShows the consumption lag of each aggregator pod.\n\nThis panel may show no data if aggregators are not deployed to this cell.\n\nThe rollout will fail if any pod's consumption lag is both:\n* greater than 30s (red area on graph), and\n* trending upwards compared to 1 minute earlier\n\n",
         "fieldConfig": {
           "defaults": {
@@ -480,9 +468,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Unhealthy Deployment replicas\nShows the number of unavailable pods for each `Deployment`.\n\nThe rollout will fail if any `Deployment` has an unavailable pod.\n\nBoth this panel and the rollout check ignore any `Deployment`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`Deployment`s shown in green do not have any unavailable pods, while `Deployment`s shown in orange have one or more unavailable pods.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -584,9 +569,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Unhealthy StatefulSet replicas\nShows the number of pods for each `StatefulSet` that are not ready.\n\nThe rollout will fail if any `StatefulSet` has fewer ready pods than requested.\n\nBoth this panel and the rollout check ignore any `StatefulSets`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`StatefulSets`s shown in green do not have any pods that are not ready, while `StatefulSet`s shown in orange have one or more pods that are not ready.\n\n",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.mimir_rollout_debugging.v1beta1.json

@@ -65,9 +65,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Versions running\nShows the versions reported by each running pod.\n\nThe rollout will fail if any pod is not running the expected version.\n\nPods in green are running the expected version, while pods running other versions are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -188,9 +185,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Deployment rollout progress\nShows the number of pods for each `Deployment` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `Deployment`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -292,9 +286,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### StatefulSet rollout progress\nShows the number of pods for each `StatefulSet` that match the desired configuration, as a proportion of the desired number of pods.\n\nThe rollout will fail if insufficient pods match the desired configuration for any `StatefulSet`.\n\nPods in green match the desired configuration, while pods that do not match the desired configuration are shown in orange.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -408,9 +399,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Aggregator lag\nShows the consumption lag of each aggregator pod.\n\nThis panel may show no data if aggregators are not deployed to this cell.\n\nThe rollout will fail if any pod's consumption lag is both:\n* greater than 30s (red area on graph), and\n* trending upwards compared to 1 minute earlier\n\n",
         "fieldConfig": {
           "defaults": {
@@ -480,9 +468,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Unhealthy Deployment replicas\nShows the number of unavailable pods for each `Deployment`.\n\nThe rollout will fail if any `Deployment` has an unavailable pod.\n\nBoth this panel and the rollout check ignore any `Deployment`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`Deployment`s shown in green do not have any unavailable pods, while `Deployment`s shown in orange have one or more unavailable pods.\n\n",
         "fieldConfig": {
           "defaults": {
@@ -584,9 +569,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "uid": "$datasource"
-        },
         "description": "### Unhealthy StatefulSet replicas\nShows the number of pods for each `StatefulSet` that are not ready.\n\nThe rollout will fail if any `StatefulSet` has fewer ready pods than requested.\n\nBoth this panel and the rollout check ignore any `StatefulSets`s that require spot nodes, as these are expected to be unavailable from time to time.\n\n`StatefulSets`s shown in green do not have any pods that are not ready, while `StatefulSet`s shown in orange have one or more pods that are not ready.\n\n",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v0alpha1.json

@@ -37,10 +37,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -63,10 +59,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v15.no-op-migration.v1beta1.json

@@ -37,10 +37,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -63,10 +59,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v0alpha1.json

@@ -44,9 +44,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample metric showing connection count.",
         "fieldConfig": {
           "defaults": {
@@ -137,9 +134,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample counter metric.",
         "fieldConfig": {
           "defaults": {
@@ -230,9 +224,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample error metric.",
         "fieldConfig": {
           "defaults": {
@@ -323,9 +314,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample event rate metric.",
         "fieldConfig": {
           "defaults": {
@@ -416,9 +404,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample resource utilization metric.",
         "fieldConfig": {
           "defaults": {
@@ -508,9 +493,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample memory allocation metrics.",
         "fieldConfig": {
           "defaults": {
@@ -611,9 +593,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample utilization percentage.",
         "fieldConfig": {
           "defaults": {
@@ -683,9 +662,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample latency metric for primary operations.",
         "fieldConfig": {
           "defaults": {
@@ -772,9 +748,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample latency metric for secondary operations.",
         "fieldConfig": {
           "defaults": {
@@ -861,9 +834,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample expansion events metric.",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.empty-rows-and-panels-array.v1beta1.json

@@ -44,9 +44,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample metric showing connection count.",
         "fieldConfig": {
           "defaults": {
@@ -137,9 +134,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample counter metric.",
         "fieldConfig": {
           "defaults": {
@@ -230,9 +224,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample error metric.",
         "fieldConfig": {
           "defaults": {
@@ -323,9 +314,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample event rate metric.",
         "fieldConfig": {
           "defaults": {
@@ -416,9 +404,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample resource utilization metric.",
         "fieldConfig": {
           "defaults": {
@@ -508,9 +493,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample memory allocation metrics.",
         "fieldConfig": {
           "defaults": {
@@ -611,9 +593,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample utilization percentage.",
         "fieldConfig": {
           "defaults": {
@@ -683,9 +662,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample latency metric for primary operations.",
         "fieldConfig": {
           "defaults": {
@@ -772,9 +748,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample latency metric for secondary operations.",
         "fieldConfig": {
           "defaults": {
@@ -861,9 +834,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "uid": "${example_datasource}"
-        },
         "description": "Sample expansion events metric.",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v0alpha1.json

@@ -39,10 +39,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 12,
@@ -65,10 +61,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 12,
@@ -159,10 +151,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -185,10 +173,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -211,10 +195,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -249,10 +229,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 16,
@@ -275,10 +251,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 8,
@@ -314,10 +286,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 24,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.grid_layout_upgrade.v1beta1.json

@@ -39,10 +39,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 12,
@@ -65,10 +61,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 12,
@@ -159,10 +151,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -185,10 +173,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -211,10 +195,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -249,10 +229,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 16,
@@ -275,10 +251,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 8,
@@ -314,10 +286,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 24,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v0alpha1.json

@@ -41,10 +41,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 24,
@@ -82,10 +78,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -111,10 +103,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -140,10 +128,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "fieldConfig": {
           "defaults": {
             "thresholds": {
@@ -190,10 +174,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -222,10 +202,6 @@
         "type": "logs"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -254,10 +230,6 @@
         "type": "logs"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -283,10 +255,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Number of concurrent processing threads available for handling operations",
         "gridPos": {
           "h": 7,
@@ -312,10 +280,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "tempo",
-          "uid": "${tempo}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -360,10 +324,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
         "fieldConfig": {
           "defaults": {
@@ -465,10 +425,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
         "gridPos": {
           "h": 7,
@@ -521,10 +477,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Total number of jobs waiting to be processed",
         "gridPos": {
           "h": 7,
@@ -550,10 +502,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "fieldConfig": {
           "defaults": {
             "unit": "s"
@@ -584,10 +532,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "How long a job is in the queue before being picked up",
         "gridPos": {
           "h": 7,
@@ -640,10 +584,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -669,10 +609,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -697,10 +633,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -743,10 +675,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v16.span_zero_demo.v1beta1.json

@@ -41,10 +41,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 24,
@@ -82,10 +78,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -111,10 +103,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -140,10 +128,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "fieldConfig": {
           "defaults": {
             "thresholds": {
@@ -190,10 +174,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -222,10 +202,6 @@
         "type": "logs"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "${loki}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -254,10 +230,6 @@
         "type": "logs"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -283,10 +255,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Number of concurrent processing threads available for handling operations",
         "gridPos": {
           "h": 7,
@@ -312,10 +280,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "tempo",
-          "uid": "${tempo}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -360,10 +324,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
         "fieldConfig": {
           "defaults": {
@@ -465,10 +425,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Histogram showing p99, p95, p50, and p10 percentiles for job processing duration based on number of resources changed",
         "gridPos": {
           "h": 7,
@@ -521,10 +477,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "Total number of jobs waiting to be processed",
         "gridPos": {
           "h": 7,
@@ -550,10 +502,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "fieldConfig": {
           "defaults": {
             "unit": "s"
@@ -584,10 +532,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "description": "How long a job is in the queue before being picked up",
         "gridPos": {
           "h": 7,
@@ -640,10 +584,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -669,10 +609,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -697,10 +633,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,
@@ -743,10 +675,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prom}"
-        },
         "gridPos": {
           "h": 7,
           "w": 8,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 4,
@@ -131,10 +115,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -157,10 +137,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -183,10 +159,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 24,
@@ -209,10 +181,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 24,
@@ -235,10 +203,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -261,10 +225,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v17.minspan_to_maxperrow.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 4,
@@ -131,10 +115,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 8,
@@ -157,10 +137,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -183,10 +159,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 6,
           "w": 24,
@@ -209,10 +181,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 24,
@@ -235,10 +203,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,
@@ -261,10 +225,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 4,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -75,10 +71,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -106,10 +98,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -138,10 +126,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -176,10 +160,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v18.gauge_options.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -75,10 +71,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -106,10 +98,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -138,10 +126,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -176,10 +160,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -59,10 +55,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -91,10 +83,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -123,10 +111,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -156,10 +140,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -188,10 +168,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v19.panel_links.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -59,10 +55,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -91,10 +83,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -123,10 +111,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -156,10 +140,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -188,10 +168,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -54,10 +50,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -81,10 +73,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -107,10 +95,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v2.panels-and-services.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -54,10 +50,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -81,10 +73,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -107,10 +95,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -66,10 +62,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -110,10 +102,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 24,
@@ -156,10 +144,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -202,10 +186,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v20.variable_syntax_links.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -66,10 +62,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -110,10 +102,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 24,
@@ -156,10 +144,6 @@
         "type": "gauge"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -202,10 +186,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -64,10 +60,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +97,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -148,10 +136,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -181,10 +165,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v21.data_links_series_to_field.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -64,10 +60,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +97,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -148,10 +136,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -181,10 +165,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v22.table_panel_align.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v23.multi_variable_alignment.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
         "gridPos": {
           "h": 3,
@@ -61,10 +57,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
         "gridPos": {
           "h": 3,
@@ -88,10 +80,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg-\u003emean, max-\u003emax, min-\u003emin, total-\u003esum, current-\u003elastNotNull, count-\u003ecount).",
         "gridPos": {
           "h": 3,
@@ -115,10 +103,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
         "gridPos": {
           "h": 3,
@@ -142,10 +126,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
         "gridPos": {
           "h": 3,
@@ -169,10 +149,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
         "gridPos": {
           "h": 3,
@@ -196,10 +172,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
         "gridPos": {
           "h": 3,
@@ -236,10 +208,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
         "gridPos": {
           "h": 3,
@@ -263,10 +231,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests all color mode mappings: cell-\u003ecolor-background, row-\u003ecolor-background, value-\u003ecolor-text.",
         "gridPos": {
           "h": 3,
@@ -290,10 +254,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
         "gridPos": {
           "h": 3,
@@ -317,10 +277,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
         "gridPos": {
           "h": 3,
@@ -344,10 +300,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
         "gridPos": {
           "h": 3,
@@ -371,10 +323,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests various date format patterns and aliases.",
         "gridPos": {
           "h": 3,
@@ -398,10 +346,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
         "gridPos": {
           "h": 3,
@@ -425,10 +369,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Angular table without styles property should not be migrated.",
         "gridPos": {
           "h": 3,
@@ -452,10 +392,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Non-table panels should remain completely unchanged.",
         "gridPos": {
           "h": 3,
@@ -479,10 +415,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Other panel types should not be affected by table migration.",
         "gridPos": {
           "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v24.table-angular.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests basic migration with default style pattern (/.*/) containing thresholds and colors. Should convert styles to fieldConfig.defaults with threshold steps.",
         "gridPos": {
           "h": 3,
@@ -61,10 +57,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests comprehensive migration including: default style with thresholds/colors/unit/decimals/align/colorMode, column overrides with exact name and regex patterns, date formatting, hidden columns, and links with tooltips.",
         "gridPos": {
           "h": 3,
@@ -88,10 +80,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_aggregations transform to reduce transformation with column mappings (avg-\u003emean, max-\u003emax, min-\u003emin, total-\u003esum, current-\u003elastNotNull, count-\u003ecount).",
         "gridPos": {
           "h": 3,
@@ -115,10 +103,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_to_rows transform to seriesToRows transformation.",
         "gridPos": {
           "h": 3,
@@ -142,10 +126,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of timeseries_to_columns transform to seriesToColumns transformation.",
         "gridPos": {
           "h": 3,
@@ -169,10 +149,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests migration of table transform to merge transformation. Also tests auto alignment conversion to empty string.",
         "gridPos": {
           "h": 3,
@@ -196,10 +172,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests that existing transformations are preserved and new transformation from old format is appended to the list.",
         "gridPos": {
           "h": 3,
@@ -236,10 +208,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests handling of mixed numeric and string threshold values (int, string, float) with proper type conversion.",
         "gridPos": {
           "h": 3,
@@ -263,10 +231,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests all color mode mappings: cell-\u003ecolor-background, row-\u003ecolor-background, value-\u003ecolor-text.",
         "gridPos": {
           "h": 3,
@@ -290,10 +254,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests all alignment options: left, center, right, and auto (should convert to empty string).",
         "gridPos": {
           "h": 3,
@@ -317,10 +277,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests both field matcher types: byName for exact matches and byRegexp for regex patterns.",
         "gridPos": {
           "h": 3,
@@ -344,10 +300,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests various link configurations: with and without tooltip, with and without target blank.",
         "gridPos": {
           "h": 3,
@@ -371,10 +323,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests various date format patterns and aliases.",
         "gridPos": {
           "h": 3,
@@ -398,10 +346,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "React table (table2) should not be migrated. Properties should remain unchanged.",
         "gridPos": {
           "h": 3,
@@ -425,10 +369,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Angular table without styles property should not be migrated.",
         "gridPos": {
           "h": 3,
@@ -452,10 +392,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Non-table panels should remain completely unchanged.",
         "gridPos": {
           "h": 3,
@@ -479,10 +415,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Other panel types should not be affected by table migration.",
         "gridPos": {
           "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v0alpha1.json

@@ -33,10 +33,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -59,10 +55,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v25.no-op-migration.v1beta1.json

@@ -33,10 +33,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -59,10 +55,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v26.text2_to_text.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "text"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v27.repeated_panels_and_constant_variable.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -60,10 +56,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -86,10 +78,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -119,10 +107,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_and_variable_properties.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -60,10 +56,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -86,10 +78,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -119,10 +107,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -60,10 +56,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -93,10 +85,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -119,10 +107,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -152,10 +136,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -179,10 +159,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "gridPos": {
           "h": 8,
           "w": 8,
@@ -206,10 +182,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -277,10 +249,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "gridPos": {
           "h": 8,
           "w": 8,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v28.singlestat_migration.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -60,10 +56,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -93,10 +85,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -119,10 +107,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -152,10 +136,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -179,10 +159,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "gridPos": {
           "h": 8,
           "w": 8,
@@ -206,10 +182,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -277,10 +249,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "PD8C576611E62080A"
-        },
         "gridPos": {
           "h": 8,
           "w": 8,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v29.query_variables_refresh_and_options.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v3.no-op.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -105,10 +93,6 @@
         "type": "barchart"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -129,10 +125,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -159,10 +151,6 @@
         "type": "xychart"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -190,10 +178,6 @@
         "type": "xychart2"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -220,10 +204,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -325,10 +305,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "fieldConfig": {
               "defaults": {
                 "unit": "bytes"
@@ -361,10 +337,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "fieldConfig": {
               "overrides": [
                 {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v30.value_mappings_and_tooltip_options.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -129,10 +125,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -159,10 +151,6 @@
         "type": "xychart"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -190,10 +178,6 @@
         "type": "xychart2"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -220,10 +204,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "mappings": [
@@ -325,10 +305,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "fieldConfig": {
               "defaults": {
                 "unit": "bytes"
@@ -361,10 +337,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "fieldConfig": {
               "overrides": [
                 {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -63,10 +59,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -107,10 +99,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -161,10 +149,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -187,10 +171,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -279,10 +259,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v31.labels_to_fields_merge.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -63,10 +59,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -107,10 +99,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -161,10 +149,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -187,10 +171,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -279,10 +259,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v0alpha1.json

@@ -33,10 +33,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -75,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v32.no_op_migration.v1beta1.json

@@ -33,10 +33,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -75,10 +71,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "non-default-test-ds-uid"
-        },
         "description": "Tests v33 migration behavior when panel datasource is explicitly null. Should remain null after migration (returnDefaultAsNull: true).",
         "gridPos": {
           "h": 3,
@@ -55,10 +51,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests v33 migration behavior when panel datasource is already a proper object reference. Should remain unchanged.",
         "gridPos": {
           "h": 3,
@@ -83,10 +75,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "non-default-test-ds-uid"
-        },
         "description": "Tests v33 migration when panel datasource is a string name. Should convert to proper object with uid, type, apiVersion.",
         "gridPos": {
           "h": 3,
@@ -110,10 +98,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests v33 migration when panel has datasource string but empty targets array. Panel datasource should still migrate.",
         "gridPos": {
           "h": 3,
@@ -299,10 +283,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "description": "Nested panel with string datasource should migrate to proper object reference, proving row panel recursion works.",
             "gridPos": {
               "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v33.panel_ds_name_to_ref.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "non-default-test-ds-uid"
-        },
         "description": "Tests v33 migration behavior when panel datasource is explicitly null. Should remain null after migration (returnDefaultAsNull: true).",
         "gridPos": {
           "h": 3,
@@ -55,10 +51,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests v33 migration behavior when panel datasource is already a proper object reference. Should remain unchanged.",
         "gridPos": {
           "h": 3,
@@ -83,10 +75,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "loki",
-          "uid": "non-default-test-ds-uid"
-        },
         "description": "Tests v33 migration when panel datasource is a string name. Should convert to proper object with uid, type, apiVersion.",
         "gridPos": {
           "h": 3,
@@ -110,10 +98,6 @@
         "type": "table"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests v33 migration when panel has datasource string but empty targets array. Panel datasource should still migrate.",
         "gridPos": {
           "h": 3,
@@ -299,10 +283,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "description": "Nested panel with string datasource should migrate to proper object reference, proving row panel recursion works.",
             "gridPos": {
               "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v0alpha1.json

@@ -289,10 +289,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -359,10 +355,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -394,10 +386,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -504,10 +492,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -538,10 +522,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -646,10 +626,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -713,10 +689,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -766,10 +738,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -801,10 +769,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -854,10 +818,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -889,10 +849,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -971,10 +927,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -1054,10 +1006,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v34.multiple_stats_cloudwatch.v1beta1.json

@@ -289,10 +289,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -359,10 +355,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -394,10 +386,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -504,10 +492,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -538,10 +522,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -646,10 +626,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -713,10 +689,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -766,10 +738,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -801,10 +769,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -854,10 +818,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -889,10 +849,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -971,10 +927,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "default-ds-uid"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,
@@ -1054,10 +1006,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "prometheus",
-              "uid": "prometheus"
-            },
             "gridPos": {
               "h": 3,
               "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -74,10 +70,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -133,10 +125,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -166,10 +154,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -199,10 +183,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -225,10 +205,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -251,10 +227,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "unit": "bytes"
@@ -282,10 +254,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v35.ensure_x_axis_visibility.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -74,10 +70,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -133,10 +125,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -166,10 +154,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {
@@ -199,10 +183,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -225,10 +205,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -251,10 +227,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "unit": "bytes"
@@ -282,10 +254,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "fieldConfig": {
           "defaults": {
             "custom": {

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v0alpha1.json

@@ -77,10 +77,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource migration with targets - should fallback to default",
         "gridPos": {
           "h": 3,
@@ -104,10 +100,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource with empty targets array - should create default target",
         "gridPos": {
           "h": 3,
@@ -131,10 +123,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource with missing targets - should create default target array",
         "gridPos": {
           "h": 3,
@@ -192,10 +180,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with already migrated datasource object - should preserve existing refs",
         "gridPos": {
           "h": 3,
@@ -219,10 +203,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "unknown-target-datasource"
-        },
         "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
         "gridPos": {
           "h": 3,
@@ -280,10 +260,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel inheriting datasource from target when panel datasource was default",
         "gridPos": {
           "h": 3,
@@ -307,10 +283,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with datasource referenced by name - should migrate to full object",
         "gridPos": {
           "h": 3,
@@ -334,10 +306,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with datasource referenced by UID - should migrate to full object",
         "gridPos": {
           "h": 3,
@@ -377,10 +345,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
             "description": "Nested panel in collapsed row with default datasource",
             "gridPos": {
               "h": 3,
@@ -404,10 +368,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
             "description": "Nested panel in collapsed row with unknown datasource",
             "gridPos": {
               "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v36.ds_name_to_ref.v1beta1.json

@@ -77,10 +77,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource migration with targets - should fallback to default",
         "gridPos": {
           "h": 3,
@@ -104,10 +100,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource with empty targets array - should create default target",
         "gridPos": {
           "h": 3,
@@ -131,10 +123,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "description": "Tests null panel datasource with missing targets - should create default target array",
         "gridPos": {
           "h": 3,
@@ -192,10 +180,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with already migrated datasource object - should preserve existing refs",
         "gridPos": {
           "h": 3,
@@ -219,10 +203,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "unknown-target-datasource"
-        },
         "description": "Tests panel with unknown datasource - should preserve as UID-only reference",
         "gridPos": {
           "h": 3,
@@ -280,10 +260,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel inheriting datasource from target when panel datasource was default",
         "gridPos": {
           "h": 3,
@@ -307,10 +283,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with datasource referenced by name - should migrate to full object",
         "gridPos": {
           "h": 3,
@@ -334,10 +306,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "existing-target-uid"
-        },
         "description": "Tests panel with datasource referenced by UID - should migrate to full object",
         "gridPos": {
           "h": 3,
@@ -377,10 +345,6 @@
         "id": -1,
         "panels": [
           {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
             "description": "Nested panel in collapsed row with default datasource",
             "gridPos": {
               "h": 3,
@@ -404,10 +368,6 @@
             "type": "timeseries"
           },
           {
-            "datasource": {
-              "type": "elasticsearch",
-              "uid": "existing-target-uid"
-            },
             "description": "Nested panel in collapsed row with unknown datasource",
             "gridPos": {
               "h": 3,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v4.no-op.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v4.no-op.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v5.no-op.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v5.no-op.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v6.pulldowns_and_templating.v0alpha1.json

@@ -49,10 +49,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -76,10 +72,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v6.pulldowns_and_templating.v1beta1.json

@@ -49,10 +49,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,
@@ -76,10 +72,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 8,
           "w": 12,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v7.timepicker.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v7.timepicker.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v9.no-op.v0alpha1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dashboards_from_v0_to_v2/v2beta1.v9.no-op.v1beta1.json

@@ -27,10 +27,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -53,10 +49,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,
@@ -79,10 +71,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "default-ds-uid"
-        },
         "gridPos": {
           "h": 3,
           "w": 6,

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.complete.v0alpha1.json

@@ -66,10 +66,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "description": "This panel demonstrates conditional rendering features",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.complete.v1beta1.json

@@ -66,10 +66,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "description": "This panel demonstrates conditional rendering features",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.ds-data-query.v0alpha1.json

@@ -150,9 +150,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -248,10 +245,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -348,9 +341,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -410,10 +400,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.ds-data-query.v1beta1.json

@@ -150,9 +150,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -248,10 +245,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -348,9 +341,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -410,10 +400,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.viz-config.v0alpha1.json

@@ -14,10 +14,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2alpha1.viz-config.v1beta1.json

@@ -14,10 +14,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.complete.v0alpha1.json

@@ -66,10 +66,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "description": "This panel demonstrates conditional rendering features",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.complete.v1beta1.json

@@ -66,10 +66,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "description": "This panel demonstrates conditional rendering features",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.datasource-resolution.v0alpha1.json

@@ -80,10 +80,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "description": "This should resolve to the grafana-testdata-datasource datasource",
         "fieldConfig": {
           "defaults": {
@@ -174,9 +170,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch"
-        },
         "description": "This should resolve to the first elasticsearch datasource",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.datasource-resolution.v1beta1.json

@@ -80,10 +80,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "description": "This should resolve to the grafana-testdata-datasource datasource",
         "fieldConfig": {
           "defaults": {
@@ -174,9 +170,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "elasticsearch"
-        },
         "description": "This should resolve to the first elasticsearch datasource",
         "fieldConfig": {
           "defaults": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.ds-data-query.v0alpha1.json

@@ -150,9 +150,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -248,10 +245,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -348,9 +341,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -410,10 +400,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.ds-data-query.v1beta1.json

@@ -150,9 +150,6 @@
     "liveNow": false,
     "panels": [
       {
-        "datasource": {
-          "type": "prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -248,10 +245,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "prometheus",
-          "uid": "gdev-prometheus"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -348,9 +341,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -410,10 +400,6 @@
         "type": "stat"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "gdev-testdata"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {

apps/dashboard/pkg/migration/conversion/testdata/output/v2beta1.rows-with-nested-tabs.v0alpha1.json

@@ -67,10 +67,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "defin43am9o1sd"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -223,10 +219,6 @@
         "type": "row"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "defin43am9o1sd"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -317,10 +309,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": {
-          "type": "grafana-testdata-datasource",
-          "uid": "defin43am9o1sd"
-        },
         "fieldConfig": {
           "defaults": {
             "color": {