Chore: Add some e2e tests for repeating behaviour (#43457)

* user essentials mob! 🔱

* user essentials mob! 🔱

* WIP: Mob session work 🚧 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* mob next [ci-skip] [ci skip] [skip ci]

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* :construction:: Mob session work 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* Move repeats suite under dashboard suite

* remove these generated files

* move repeats-suite into dashboards-suite

* Reexport dashboard jsons from play and update them

* :construction:: Mob session work 🔱

* :construction:: Mob session work 🔱

* Rename dashboards to work with stripnulls

* Run stripnulls

* Add repeat to row schema

* Clean up the rest of the repeating dashboards

* Fix tooltip sorting

* Update older dashboards

* Update golden files so tests pass

* format this to ensure consistent tabs/spaces

* undo whitespace changes

* Update scripts/stripnulls.sh

Co-authored-by: sam boyer <sam.boyer@grafana.com>

* update schema versions and test

Co-authored-by: thisisobate <obasiuche62@gmail.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
Co-authored-by: sam boyer <sam.boyer@grafana.com>

pkg/schema/testdata/devenvgoldenfiles/all-panels.json

@@ -1068,7 +1068,7 @@
 		}
 	],
 	"refresh": "",
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -1181,4 +1181,4 @@
 	"title": "Panel tests - All panels",
 	"uid": "n1jR8vnnz",
 	"version": 24
-}
+}

pkg/schema/testdata/devenvgoldenfiles/barchart-autosizing.json

@@ -346,7 +346,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -590,7 +593,7 @@
 		}
 	],
 	"refresh": "",
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -625,4 +628,4 @@
 	"title": "BarChart - Panel Tests - Value sizing",
 	"uid": "WFlOM-jM1",
 	"version": 9
-}
+}

pkg/schema/testdata/devenvgoldenfiles/config-from-query.json

@@ -582,7 +582,7 @@
 		}
 	],
 	"refresh": "",
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -616,4 +616,4 @@
 	"title": "Transforms - Config from query",
 	"uid": "Juj4_7ink",
 	"version": 1
-}
+}

pkg/schema/testdata/devenvgoldenfiles/elasticsearch_compare.json

@@ -46,7 +46,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -144,7 +146,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -242,7 +246,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -339,7 +345,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -436,7 +444,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -534,7 +544,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -646,7 +658,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -745,7 +759,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -844,7 +860,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -943,7 +961,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -1042,7 +1062,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1143,7 +1165,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1244,7 +1268,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1345,7 +1371,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1446,7 +1474,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1559,7 +1589,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1672,7 +1704,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1782,7 +1816,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1892,7 +1928,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -1994,7 +2032,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fill": 1,
 					"fillGradient": 0,
@@ -2110,7 +2150,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2230,7 +2272,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2350,7 +2394,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2470,7 +2516,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2590,7 +2638,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2710,7 +2760,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2830,7 +2882,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -2950,7 +3004,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -3070,7 +3126,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -3190,7 +3248,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -3310,7 +3370,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -3430,7 +3492,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -3564,7 +3628,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -3679,7 +3745,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -3794,7 +3862,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -3909,7 +3979,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4024,7 +4096,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4139,7 +4213,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4254,7 +4330,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4369,7 +4447,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4484,7 +4564,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4599,7 +4681,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4714,7 +4798,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4829,7 +4915,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -4958,7 +5046,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5077,7 +5167,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5196,7 +5288,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5315,7 +5409,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5434,7 +5530,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5553,7 +5651,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5672,7 +5772,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5791,7 +5893,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -5910,7 +6014,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -6029,7 +6135,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -6148,7 +6256,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -6267,7 +6377,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {},
@@ -6400,7 +6512,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -6519,7 +6633,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -6638,7 +6754,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -6769,7 +6887,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -6914,7 +7034,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_one",
+					"datasource": {
+						"uid": "$version_one"
+					},
 					"decimals": 3,
 					"fieldConfig": {
 						"defaults": {
@@ -7067,7 +7189,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "$version_two",
+					"datasource": {
+						"uid": "$version_two"
+					},
 					"decimals": 3,
 					"fieldConfig": {
 						"defaults": {
@@ -7234,7 +7358,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7345,7 +7471,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7456,7 +7584,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7567,7 +7697,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7678,7 +7810,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7790,7 +7924,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -7902,7 +8038,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -8014,7 +8152,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fieldConfig": {
 						"defaults": {
 							"custom": {}
@@ -8140,7 +8280,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8256,7 +8398,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8372,7 +8516,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8488,7 +8634,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8604,7 +8752,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8720,7 +8870,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8836,7 +8988,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -8952,7 +9106,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9068,7 +9224,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9184,7 +9342,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9300,7 +9460,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9416,7 +9578,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9532,7 +9696,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9648,7 +9814,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9764,7 +9932,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -9880,7 +10050,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -10010,7 +10182,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -10121,7 +10295,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -10232,7 +10408,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_one}",
+					"datasource": {
+						"uid": "${version_one}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -10343,7 +10521,9 @@
 					"bars": false,
 					"dashLength": 10,
 					"dashes": false,
-					"datasource": "${version_two}",
+					"datasource": {
+						"uid": "${version_two}"
+					},
 					"fill": 1,
 					"fillGradient": 0,
 					"gridPos": {
@@ -10467,7 +10647,9 @@
 			"type": "row"
 		},
 		{
-			"datasource": "${version_one}",
+			"datasource": {
+				"uid": "${version_one}"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -10605,7 +10787,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "${version_two}",
+			"datasource": {
+				"uid": "${version_two}"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -10744,7 +10928,7 @@
 		}
 	],
 	"refresh": false,
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"elasticsearch",
@@ -10829,4 +11013,4 @@
 	"title": "Datasource tests - Elasticsearch comparison",
 	"uid": "fuFWehBmk",
 	"version": 4
-}
+}

pkg/schema/testdata/devenvgoldenfiles/graph-ng-by-value-color-schemes.json

@@ -311,7 +311,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -506,7 +509,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -605,7 +611,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -704,7 +713,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -916,7 +928,7 @@
 		}
 	],
 	"refresh": false,
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -950,4 +962,4 @@
 	"title": "Panel Tests - Graph NG - By value color schemes",
 	"uid": "aBXrJ0R7z",
 	"version": 11
-}
+}

pkg/schema/testdata/devenvgoldenfiles/graph-ng-nulls.json

@@ -35,7 +35,9 @@
 	],
 	"panels": [
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -149,7 +151,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "Series A have no nulls and is not aligned with series B",
 			"fieldConfig": {
 				"defaults": {
@@ -273,7 +277,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "",
 			"fieldConfig": {
 				"defaults": {
@@ -417,7 +423,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -531,7 +539,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "Series A have no nulls and is not aligned with series B",
 			"fieldConfig": {
 				"defaults": {
@@ -655,7 +665,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "Should look the same as above\n",
 			"fieldConfig": {
 				"defaults": {
@@ -799,7 +811,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -946,7 +960,9 @@
 			"repeatDirection": "h"
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1293,7 +1309,7 @@
 			"transformations": []
 		}
 	],
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -1328,4 +1344,4 @@
 	"title": "Panel Tests - Graph NG - Gaps and Connected",
 	"uid": "8mmCAF1Mz",
 	"version": 2
-}
+}

pkg/schema/testdata/devenvgoldenfiles/histogram_tests.json

@@ -86,7 +86,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -460,7 +463,7 @@
 			"repeatDirection": "h"
 		}
 	],
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -494,4 +497,4 @@
 	"title": "Panel Tests - Histogram",
 	"uid": "UTv--wqMk",
 	"version": 4
-}
+}

pkg/schema/testdata/devenvgoldenfiles/home.json

@@ -268,7 +268,7 @@
 			}
 		}
 	],
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [],
 	"templating": {
@@ -310,4 +310,4 @@
 	"title": "Grafana Dev Overview & Home",
 	"uid": "j6T00KRZz",
 	"version": 2
-}
+}

pkg/schema/testdata/devenvgoldenfiles/new_features_in_v8.json

@@ -53,7 +53,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 8,
 				"w": 6,
@@ -91,7 +93,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -195,7 +199,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 15,
 				"w": 6,
@@ -233,7 +239,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-graphite-1.0",
+			"datasource": {
+				"type": "graphite"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -302,7 +310,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-graphite-1.0",
+			"datasource": {
+				"type": "graphite"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -401,7 +411,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 13,
 				"w": 6,
@@ -439,7 +451,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -513,7 +527,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -612,7 +628,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 3,
 				"w": 24,
@@ -650,7 +668,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -777,7 +797,9 @@
 			"repeatDirection": "h"
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -878,7 +900,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 3,
 				"w": 24,
@@ -916,7 +940,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 6,
 				"w": 6,
@@ -954,7 +980,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1082,7 +1110,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1210,7 +1240,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1338,7 +1370,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 8,
 				"w": 6,
@@ -1376,7 +1410,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1487,7 +1523,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "",
 			"fieldConfig": {
 				"defaults": {
@@ -1601,7 +1639,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"description": "",
 			"fieldConfig": {
 				"defaults": {
@@ -1715,7 +1755,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 5,
 				"w": 6,
@@ -1753,7 +1795,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -1977,7 +2021,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 5,
 				"w": 6,
@@ -2015,7 +2061,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -2347,7 +2395,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -2679,7 +2729,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -2814,7 +2866,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"gridPos": {
 				"h": 3,
 				"w": 24,
@@ -2852,7 +2906,9 @@
 			}
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -2964,7 +3020,9 @@
 			"transformations": []
 		},
 		{
-			"datasource": "gdev-testdata",
+			"datasource": {
+				"type": "testdata"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -3074,7 +3132,7 @@
 		}
 	],
 	"refresh": false,
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -3107,4 +3165,4 @@
 	"title": "New Features in v8.0",
 	"uid": "8mux8PqGz",
 	"version": 17
-}
+}

pkg/schema/testdata/devenvgoldenfiles/opentsdb_v2.3.json

@@ -218,7 +218,7 @@
 			}
 		}
 	],
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [],
 	"templating": {
@@ -249,4 +249,4 @@
 	"title": "Datasource tests - OpenTSDB v2.3",
 	"uid": "rZRUGik7k",
 	"version": 3
-}
+}

pkg/schema/testdata/devenvgoldenfiles/panel-geomap.json

@@ -378,7 +378,7 @@
 		}
 	],
 	"refresh": "",
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -411,4 +411,4 @@
 	"title": "Panel Tests - Geomap",
 	"uid": "2xuwrgV7z",
 	"version": 5
-}
+}

pkg/schema/testdata/devenvgoldenfiles/rows-to-fields.json

@@ -24,7 +24,10 @@
 	"links": [],
 	"panels": [
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -80,7 +83,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -297,7 +303,10 @@
 			"repeatDirection": "h"
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -353,7 +362,10 @@
 			"transformations": []
 		},
 		{
-			"datasource": "-- Dashboard --",
+			"datasource": {
+				"type": "datasource",
+				"uid": "-- Dashboard --"
+			},
 			"fieldConfig": {
 				"defaults": {
 					"color": {
@@ -651,7 +663,7 @@
 		}
 	],
 	"refresh": "",
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -685,4 +697,4 @@
 	"title": "Transforms - Rows to fields",
 	"uid": "PMtIInink",
 	"version": 1
-}
+}

pkg/schema/testdata/devenvgoldenfiles/timeline-demo.json

@@ -453,7 +453,7 @@
 		}
 	],
 	"refresh": false,
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -487,4 +487,4 @@
 	"title": "Timeline Demo",
 	"uid": "mIJjFy8Kz",
 	"version": 3
-}
+}

pkg/schema/testdata/devenvgoldenfiles/timeline-modes.json

@@ -390,7 +390,7 @@
 		}
 	],
 	"refresh": false,
-	"schemaVersion": 30,
+	"schemaVersion": 33,
 	"style": "dark",
 	"tags": [
 		"gdev",
@@ -424,4 +424,4 @@
 	"title": "Timeline Modes",
 	"uid": "mIJjFy8Gz",
 	"version": 13
-}
+}