public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dashboard Migrations: V3 - no-op; remove v3 from DashboardMigrator.ts (#112239)

Browse Source
This commit is contained in:
Haris Rozajac
2025-10-14 18:39:24 -06:00
committed by GitHub
parent 3895849c85
commit e5ef29c202
8 changed files with 260 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/pkg/migration/schemaversion/migrations.go
+2 -1
View File
@@ -7,7 +7,7 @@ import (
)
const (
MIN_VERSION = 3
MIN_VERSION = 2
LATEST_VERSION = 42
)
@@ -35,6 +35,7 @@ type PanelPluginInfo struct {
func GetMigrations(dsInfoProvider DataSourceInfoProvider) map[int]SchemaVersionMigrationFunc {
return map[int]SchemaVersionMigrationFunc{
3: V3,
4: V4,
5: V5,
6: V6,
apps/dashboard/pkg/migration/schemaversion/v16.go
+13 -2
View File
@@ -271,19 +271,30 @@ func (r *rowArea) getPanelPosition(panelHeight int, panelWidth int) map[string]i
func getMaxPanelID(rows []interface{}) int {
maxID := 0
hasValidID := false
for _, rowInterface := range rows {
if row, ok := rowInterface.(map[string]interface{}); ok {
if panels, ok := row["panels"].([]interface{}); ok {
for _, panelInterface := range panels {
if panel, ok := panelInterface.(map[string]interface{}); ok {
if id := GetIntValue(panel, "id", 0); id > maxID {
maxID = id
if id := GetIntValue(panel, "id", 0); id > 0 {
hasValidID = true
if id > maxID {
maxID = id
}
}
}
}
}
}
}
// If no valid IDs found, return 0 (matches frontend behavior)
if !hasValidID {
return 0
}
return maxID
}
apps/dashboard/pkg/migration/schemaversion/v3.go
+9
View File
@@ -0,0 +1,9 @@
package schemaversion
import "context"
// V3 is a no-op migration
func V3(_ context.Context, dashboard map[string]interface{}) error {
dashboard["schemaVersion"] = 3
return nil
}
apps/dashboard/pkg/migration/schemaversion/v3_test.go
+38
View File
@@ -0,0 +1,38 @@
package schemaversion_test
import (
"testing"
"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
)
func TestV3(t *testing.T) {
tests := []migrationTestCase{
{
name: "v3 no-op migration, updates schema version only",
input: map[string]interface{}{
"title": "V3 No-Op Migration Test Dashboard",
"schemaVersion": 2,
"panels": []interface{}{
map[string]interface{}{
"type": "graph",
"title": "Panel remains unchanged",
"id": 1,
},
},
},
expected: map[string]interface{}{
"title": "V3 No-Op Migration Test Dashboard",
"schemaVersion": 3,
"panels": []interface{}{
map[string]interface{}{
"type": "graph",
"title": "Panel remains unchanged",
"id": 1,
},
},
},
},
}
runMigrationTests(t, tests, schemaversion.V3)
}
apps/dashboard/pkg/migration/testdata/input/v3.no-op.json
Vendored
+21
View File
@@ -0,0 +1,21 @@
{
"title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
"schemaVersion": 2,
"panels": [
{
"id": 1,
"type": "timeseries"
},
{
"id": 2,
"type": "timeseries"
},
{
"id": 2,
"type": "barchart"
},
{
"type": "barchart"
}
]
}
apps/dashboard/pkg/migration/testdata/output/latest_version/v3.no-op.v42.json
Vendored
+114
View File
@@ -0,0 +1,114 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations \u0026 Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"links": [],
"panels": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 1,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"refId": "A"
}
],
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 2,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"refId": "A"
}
],
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 3,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"refId": "A"
}
],
"type": "barchart"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 4,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"refId": "A"
}
],
"type": "barchart"
}
],
"refresh": "",
"schemaVersion": 42,
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
"weekStart": ""
}
apps/dashboard/pkg/migration/testdata/output/single_version/v3.no-op.v3.json
Vendored
+53
View File
@@ -0,0 +1,53 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations \u0026 Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"links": [],
"panels": [
{
"id": 1,
"type": "timeseries"
},
{
"id": 2,
"type": "timeseries"
},
{
"id": 3,
"type": "barchart"
},
{
"id": 4,
"type": "barchart"
}
],
"schemaVersion": 3,
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
"weekStart": ""
}