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

SchemaV2: Always set ad hoc filters to empty array when converting to v2 (#114914)

Browse Source 
* Always set ad hoc filters to empty array when converting to v2

* Update test files
This commit is contained in:
Oscar Kilhed
2025-12-08 11:27:55 +01:00
committed by GitHub
parent 310662a4d0
commit dab64addf8
13 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-elasticsearch/v0alpha1.elasticsearch_complex.v42.v2alpha1.json
Vendored
+2 -2
View File
@@ -7234,9 +7234,9 @@
"type": "elasticsearch",
"uid": "gdev-elasticsearch"
},
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-elasticsearch/v0alpha1.elasticsearch_complex.v42.v2beta1.json
Vendored
+2 -2
View File
@@ -7335,9 +7335,9 @@
},
"spec": {
"name": "adhoc",
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2alpha1.json
Vendored
+2 -2
View File
@@ -307,9 +307,9 @@
"kind": "AdhocVariable",
"spec": {
"name": "adhoc",
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-influxdb/v0alpha1.influxdb-templated.v42.v2beta1.json
Vendored
+2 -2
View File
@@ -317,9 +317,9 @@
"datasource": {},
"spec": {
"name": "adhoc",
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-loki/v0alpha1.loki_fakedata.v42.v2alpha1.json
Vendored
+2 -2
View File
@@ -604,9 +604,9 @@
"type": "loki",
"uid": "PDDA8E780A17E7EF1"
},
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"label": "Ad-hoc",
"hide": "dontHide",
"skipUrlSync": false,
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/datasource-loki/v0alpha1.loki_fakedata.v42.v2beta1.json
Vendored
+2 -2
View File
@@ -616,9 +616,9 @@
},
"spec": {
"name": "adhoc",
"baseFilters": null,
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"label": "Ad-hoc",
"hide": "dontHide",
"skipUrlSync": false,
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_footer.v42.v2alpha1.json
Vendored
+1 -1
View File
@@ -1885,7 +1885,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_footer.v42.v2beta1.json
Vendored
+1 -1
View File
@@ -1931,7 +1931,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_kitchen_sink.v42.v2alpha1.json
Vendored
+1 -1
View File
@@ -2184,7 +2184,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_kitchen_sink.v42.v2beta1.json
Vendored
+1 -1
View File
@@ -2219,7 +2219,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_v12_2_migrations.v42.v2alpha1.json
Vendored
+1 -1
View File
@@ -2499,7 +2499,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/testdata/output/migrated_dev_dashboards/panel-table/v0alpha1.table_v12_2_migrations.v42.v2beta1.json
Vendored
+1 -1
View File
@@ -2542,7 +2542,7 @@
"name": "Filters",
"baseFilters": [],
"filters": [],
"defaultKeys": null,
"defaultKeys": [],
"hide": "dontHide",
"skipUrlSync": false,
"allowCustomValue": true
apps/dashboard/pkg/migration/conversion/v1beta1_to_v2alpha1.go
+15 -3
View File
@@ -1539,26 +1539,38 @@ func buildAdhocVariable(ctx context.Context, varMap map[string]interface{}, comm
},
}
// Transform baseFilters if they exist
// Transform baseFilters if they exist, otherwise default to empty array
if baseFilters, exists := varMap["baseFilters"]; exists {
if baseFiltersArray, ok := baseFilters.([]interface{}); ok {
adhocVar.Spec.BaseFilters = transformAdHocFilters(baseFiltersArray)
}
}
// Ensure baseFilters is always set (default to empty array if not present or invalid)
if adhocVar.Spec.BaseFilters == nil {
adhocVar.Spec.BaseFilters = []dashv2alpha1.DashboardAdHocFilterWithLabels{}
}
// Transform filters if they exist
// Transform filters if they exist, otherwise default to empty array
if filters, exists := varMap["filters"]; exists {
if filtersArray, ok := filters.([]interface{}); ok {
adhocVar.Spec.Filters = transformAdHocFilters(filtersArray)
}
}
// Ensure filters is always set (default to empty array if not present or invalid)
if adhocVar.Spec.Filters == nil {
adhocVar.Spec.Filters = []dashv2alpha1.DashboardAdHocFilterWithLabels{}
}
// Transform defaultKeys if they exist
// Transform defaultKeys if they exist, otherwise default to empty array
if defaultKeys, exists := varMap["defaultKeys"]; exists {
if defaultKeysArray, ok := defaultKeys.([]interface{}); ok {
adhocVar.Spec.DefaultKeys = transformMetricFindValues(defaultKeysArray)
}
}
// Ensure defaultKeys is always set (default to empty array if not present or invalid)
if adhocVar.Spec.DefaultKeys == nil {
adhocVar.Spec.DefaultKeys = []dashv2alpha1.DashboardMetricFindValue{}
}
// Only include datasource if datasourceUID exists (matching frontend behavior)
if datasourceUID != "" {