merge main

.github/CODEOWNERS

@@ -520,7 +520,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
 /e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dataviz-squad
+/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform
 
 # Packages
@@ -956,7 +956,6 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/features/notifications/ @grafana/grafana-search-navigate-organise
 /public/app/features/org/ @grafana/grafana-search-navigate-organise
 /public/app/features/panel/ @grafana/dashboards-squad
-/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx @grafana/dataviz-squad
 /public/app/features/panel/suggestions/ @grafana/dataviz-squad
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend

apps/collections/pkg/apis/collections/v1alpha1/stars.go

@@ -8,8 +8,9 @@ import (
 func (stars *StarsSpec) Add(group, kind, name string) {
 	for i, r := range stars.Resource {
 		if r.Group == group && r.Kind == kind {
-			stars.Resource[i].Names = append(r.Names, name)
-			stars.Normalize()
+			r.Names = append(r.Names, name)
+			slices.Sort(r.Names)
+			stars.Resource[i].Names = slices.Compact(r.Names)
 			return
 		}
 	}
@@ -45,15 +46,8 @@ func (stars *StarsSpec) Normalize() {
 	resources := make([]StarsResource, 0, len(stars.Resource))
 	for _, r := range stars.Resource {
 		if len(r.Names) > 0 {
-			unique := make([]string, 0, len(r.Names))
-			found := make(map[string]bool, len(r.Names))
-			for _, name := range r.Names {
-				if !found[name] {
-					unique = append(unique, name)
-					found[name] = true
-				}
-			}
-			r.Names = unique
+			slices.Sort(r.Names)
+			r.Names = slices.Compact(r.Names) // removes any duplicates
 			resources = append(resources, r)
 		}
 	}

apps/collections/pkg/apis/collections/v1alpha1/stars_test.go

@@ -39,7 +39,7 @@ func TestStarsWrite(t *testing.T) {
 				Resource: []StarsResource{{
 					Group: "g",
 					Kind:  "k",
-					Names: []string{"a", "b", "x", "c"}, // added c to the end
+					Names: []string{"a", "b", "c", "x"}, // added "b" (and sorted)
 				}},
 			},
 		}, {

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

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/conversion"
+
 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
@@ -119,14 +121,6 @@ func countPanelsV0V1(spec map[string]interface{}) int {
 	return count
 }
 
-// countTargetsFromPanel counts the number of targets/queries in a panel.
-func countTargetsFromPanel(panelMap map[string]interface{}) int {
-	if targets, ok := panelMap["targets"].([]interface{}); ok {
-		return len(targets)
-	}
-	return 0
-}
-
 // countQueriesV0V1 counts data queries in v0alpha1 or v1beta1 dashboard spec
 // Note: Row panels are layout containers and should not have queries.
 // We ignore any queries on row panels themselves, but count queries in their collapsed panels.
@@ -151,7 +145,9 @@ func countQueriesV0V1(spec map[string]interface{}) int {
 
 		// Count queries in regular panels (NOT row panels)
 		if panelType != "row" {
-			count += countTargetsFromPanel(panelMap)
+			if targets, ok := panelMap["targets"].([]interface{}); ok {
+				count += len(targets)
+			}
 		}
 
 		// Count queries in collapsed panels inside row panels
@@ -159,7 +155,9 @@ func countQueriesV0V1(spec map[string]interface{}) int {
 			if collapsedPanels, ok := panelMap["panels"].([]interface{}); ok {
 				for _, cp := range collapsedPanels {
 					if cpMap, ok := cp.(map[string]interface{}); ok {
-						count += countTargetsFromPanel(cpMap)
+						if targets, ok := cpMap["targets"].([]interface{}); ok {
+							count += len(targets)
+						}
 					}
 				}
 			}
@@ -444,3 +442,77 @@ func collectDashboardStats(dashboard interface{}) dashboardStats {
 	}
 	return dashboardStats{}
 }
+
+// withConversionDataLossDetection wraps a conversion function to detect data loss
+func withConversionDataLossDetection(sourceFuncName, targetFuncName string, conversionFunc func(a, b interface{}, scope conversion.Scope) error) func(a, b interface{}, scope conversion.Scope) error {
+	return func(a, b interface{}, scope conversion.Scope) error {
+		// Collect source statistics
+		var sourceStats dashboardStats
+		switch source := a.(type) {
+		case *dashv0.Dashboard:
+			if source.Spec.Object != nil {
+				sourceStats = collectStatsV0V1(source.Spec.Object)
+			}
+		case *dashv1.Dashboard:
+			if source.Spec.Object != nil {
+				sourceStats = collectStatsV0V1(source.Spec.Object)
+			}
+		case *dashv2alpha1.Dashboard:
+			sourceStats = collectStatsV2alpha1(source.Spec)
+		case *dashv2beta1.Dashboard:
+			sourceStats = collectStatsV2beta1(source.Spec)
+		}
+
+		// Execute the conversion
+		err := conversionFunc(a, b, scope)
+		if err != nil {
+			return err
+		}
+
+		// Collect target statistics
+		var targetStats dashboardStats
+		switch target := b.(type) {
+		case *dashv0.Dashboard:
+			if target.Spec.Object != nil {
+				targetStats = collectStatsV0V1(target.Spec.Object)
+			}
+		case *dashv1.Dashboard:
+			if target.Spec.Object != nil {
+				targetStats = collectStatsV0V1(target.Spec.Object)
+			}
+		case *dashv2alpha1.Dashboard:
+			targetStats = collectStatsV2alpha1(target.Spec)
+		case *dashv2beta1.Dashboard:
+			targetStats = collectStatsV2beta1(target.Spec)
+		}
+
+		// Detect if data was lost
+		if dataLossErr := detectConversionDataLoss(sourceStats, targetStats, sourceFuncName, targetFuncName); dataLossErr != nil {
+			getLogger().Error("Dashboard conversion data loss detected",
+				"sourceFunc", sourceFuncName,
+				"targetFunc", targetFuncName,
+				"sourcePanels", sourceStats.panelCount,
+				"targetPanels", targetStats.panelCount,
+				"sourceQueries", sourceStats.queryCount,
+				"targetQueries", targetStats.queryCount,
+				"sourceAnnotations", sourceStats.annotationCount,
+				"targetAnnotations", targetStats.annotationCount,
+				"sourceLinks", sourceStats.linkCount,
+				"targetLinks", targetStats.linkCount,
+				"error", dataLossErr,
+			)
+			return dataLossErr
+		}
+
+		getLogger().Debug("Dashboard conversion completed without data loss",
+			"sourceFunc", sourceFuncName,
+			"targetFunc", targetFuncName,
+			"panels", targetStats.panelCount,
+			"queries", targetStats.queryCount,
+			"annotations", targetStats.annotationCount,
+			"links", targetStats.linkCount,
+		)
+
+		return nil
+	}
+}

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2alpha1.json

@@ -237,10 +237,5 @@
     "title": "V10 Table Thresholds Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v10.table_thresholds.v42.v2beta1.json

@@ -244,10 +244,5 @@
     "title": "V10 Table Thresholds Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2alpha1.json

@@ -206,10 +206,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v11.no-op-migration.v42.v2beta1.json

@@ -213,10 +213,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v12.template-variables.v42.v2alpha1.json

@@ -203,10 +203,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v12.template-variables.v42.v2beta1.json

@@ -216,10 +216,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2alpha1.json

@@ -351,10 +351,5 @@
     "title": "V13 Graph Thresholds Migration Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.graph_thresholds.v42.v2beta1.json

@@ -362,10 +362,5 @@
     "title": "V13 Graph Thresholds Migration Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2alpha1.json

@@ -129,10 +129,5 @@
     "title": "Dashboard with minimal graph panel settings",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v13.minimal_graph_config.v42.v2beta1.json

@@ -132,10 +132,5 @@
     "title": "Dashboard with minimal graph panel settings",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2alpha1.json

@@ -210,10 +210,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v14.shared_crosshair_to_graph_tooltip.v42.v2beta1.json

@@ -217,10 +217,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2alpha1.json

@@ -1004,10 +1004,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.mimir_rollout_debugging.v42.v2beta1.json

@@ -1023,10 +1023,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2alpha1.json

@@ -223,10 +223,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v15.no-op-migration.v42.v2beta1.json

@@ -231,10 +231,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.empty-rows-and-panels-array.v42.v2alpha1.json

@@ -1455,10 +1455,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.empty-rows-and-panels-array.v42.v2beta1.json

@@ -1481,10 +1481,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2alpha1.json

@@ -719,10 +719,5 @@
     "title": "V16 Grid Layout Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.grid_layout_upgrade.v42.v2beta1.json

@@ -739,10 +739,5 @@
     "title": "V16 Grid Layout Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.span_zero_demo.v42.v2alpha1.json

@@ -1655,10 +1655,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.span_zero_demo.v42.v2beta1.json

@@ -1707,10 +1707,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2alpha1.json

@@ -636,10 +636,5 @@
     "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v17.minspan_to_maxperrow.v42.v2beta1.json

@@ -657,10 +657,5 @@
     "title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2alpha1.json

@@ -401,10 +401,5 @@
     "title": "V18 Gauge Options Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v18.gauge_options.v42.v2beta1.json

@@ -412,10 +412,5 @@
     "title": "V18 Gauge Options Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2alpha1.json

@@ -434,10 +434,5 @@
     "title": "V19 Panel Links Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v19.panel_links.v42.v2beta1.json

@@ -447,10 +447,5 @@
     "title": "V19 Panel Links Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2alpha1.json

@@ -354,10 +354,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v2.panels-and-services.v42.v2beta1.json

@@ -365,10 +365,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v20.variable_syntax_links.v42.v2alpha1.json

@@ -426,10 +426,5 @@
     "title": "V20 Variable Syntax Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v20.variable_syntax_links.v42.v2beta1.json

@@ -437,10 +437,5 @@
     "title": "V20 Variable Syntax Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2alpha1.json

@@ -401,10 +401,5 @@
     "title": "V21 Data Links Series to Field Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v21.data_links_series_to_field.v42.v2beta1.json

@@ -412,10 +412,5 @@
     "title": "V21 Data Links Series to Field Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2alpha1.json

@@ -123,10 +123,5 @@
     "title": "V22 Table Panel Styles Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v22.table_panel_align.v42.v2beta1.json

@@ -126,10 +126,5 @@
     "title": "V22 Table Panel Styles Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v23.multi_variable_alignment.v42.v2alpha1.json

@@ -374,10 +374,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v23.multi_variable_alignment.v42.v2beta1.json

@@ -391,10 +391,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2alpha1.json

@@ -1065,10 +1065,5 @@
     "title": "No Title",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v24.table-angular.v42.v2beta1.json

@@ -1101,10 +1101,5 @@
     "title": "No Title",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2alpha1.json

@@ -217,10 +217,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v25.no-op-migration.v42.v2beta1.json

@@ -226,10 +226,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2alpha1.json

@@ -240,10 +240,5 @@
     "title": "No Title",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v26.text2_to_text.v42.v2beta1.json

@@ -247,10 +247,5 @@
     "title": "No Title",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2alpha1.json

@@ -207,10 +207,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v27.repeated_panels_and_constant_variable.v42.v2beta1.json

@@ -211,10 +211,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.remove_variable_properties.v42.v2alpha1.json

@@ -131,10 +131,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.remove_variable_properties.v42.v2beta1.json

@@ -134,10 +134,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2alpha1.json

@@ -393,10 +393,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_and_variable_properties.v42.v2beta1.json

@@ -406,10 +406,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2alpha1.json

@@ -622,10 +622,5 @@
     "title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v28.singlestat_migration.v42.v2beta1.json

@@ -642,10 +642,5 @@
     "title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v29.query_variables_refresh_and_options.v42.v2alpha1.json

@@ -435,10 +435,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v29.query_variables_refresh_and_options.v42.v2beta1.json

@@ -458,10 +458,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v3.no-op.v42.v2alpha1.json

@@ -294,10 +294,5 @@
     "title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v3.no-op.v42.v2beta1.json

@@ -303,10 +303,5 @@
     "title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2alpha1.json

@@ -689,10 +689,5 @@
     "title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v30.value_mappings_and_tooltip_options.v42.v2beta1.json

@@ -705,10 +705,5 @@
     "title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v31.labels_to_fields_merge.v42.v2alpha1.json

@@ -669,10 +669,5 @@
     "title": "V31 LabelsToFields Merge Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v31.labels_to_fields_merge.v42.v2beta1.json

@@ -684,10 +684,5 @@
     "title": "V31 LabelsToFields Merge Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2alpha1.json

@@ -310,10 +310,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v32.no_op_migration.v42.v2beta1.json

@@ -320,10 +320,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2alpha1.json

@@ -720,10 +720,5 @@
     "title": "V33 Panel Datasource Name to Ref Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v33.panel_ds_name_to_ref.v42.v2beta1.json

@@ -746,10 +746,5 @@
     "title": "V33 Panel Datasource Name to Ref Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2alpha1.json

@@ -1900,10 +1900,5 @@
     "title": "CloudWatch Multiple Statistics Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v34.multiple_stats_cloudwatch.v42.v2beta1.json

@@ -1964,10 +1964,5 @@
     "title": "CloudWatch Multiple Statistics Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v35.ensure_x_axis_visibility.v42.v2alpha1.json

@@ -595,10 +595,5 @@
     "title": "X-Axis Visibility Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v35.ensure_x_axis_visibility.v42.v2beta1.json

@@ -612,10 +612,5 @@
     "title": "X-Axis Visibility Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v36.ds_name_to_ref.v42.v2alpha1.json

@@ -1029,10 +1029,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v36.ds_name_to_ref.v42.v2beta1.json

@@ -1065,10 +1065,5 @@
       }
     ]
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2alpha1.json

@@ -629,10 +629,5 @@
     "title": "V37 Legend Normalization Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v37.legend_normalization.v42.v2beta1.json

@@ -642,10 +642,5 @@
     "title": "V37 Legend Normalization Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2alpha1.json

@@ -659,10 +659,5 @@
     "title": "V38 Table Migration Comprehensive Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.table_displaymode_comprehensive.v42.v2beta1.json

@@ -671,10 +671,5 @@
     "title": "V38 Table Migration Comprehensive Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2alpha1.json

@@ -659,10 +659,5 @@
     "title": "V38 Table Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v38.timeseries_table_display_mode.v42.v2beta1.json

@@ -671,10 +671,5 @@
     "title": "V38 Table Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2alpha1.json

@@ -586,10 +586,5 @@
     "title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v39.transform_timeseries_table.v42.v2beta1.json

@@ -596,10 +596,5 @@
     "title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2alpha1.json

@@ -237,10 +237,5 @@
     "title": "V4 No-Op Migration Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v4.no-op.v42.v2beta1.json

@@ -244,10 +244,5 @@
     "title": "V4 No-Op Migration Test",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_empty_string.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Empty String Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_empty_string.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "Empty String Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_false.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Boolean False Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_false.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "Boolean False Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_not_set.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Refresh Not Set Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_not_set.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "Refresh Not Set Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_numeric.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Numeric Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_numeric.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "Numeric Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_string.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "String Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_string.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "String Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_true.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Boolean Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v40.refresh_true.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "Boolean Refresh Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v41.no_time_picker.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "No Time Picker Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v41.no_time_picker.v42.v2beta1.json

@@ -65,10 +65,5 @@
     "title": "No Time Picker Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v41.time_picker_no_time_options.v42.v2alpha1.json

@@ -64,10 +64,5 @@
     "title": "Time Picker No Time Options Test Dashboard",
     "variables": []
   },
-  "status": {
-    "conversion": {
-      "failed": false,
-      "storedVersion": "v1beta1"
-    }
-  }
+  "status": {}
 }