From 1966eba79634270b73e57cc0782260a39c55e61f Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Tue, 11 Jan 2022 16:47:30 +0000 Subject: [PATCH] Chore: Add some e2e tests for repeating behaviour (#43457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * user essentials mob! :trident: * user essentials mob! :trident: * WIP: Mob session work :construction: :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * mob next [ci-skip] [ci skip] [skip ci] * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * user essentials mob! :trident: * :construction:: Mob session work :trident: * user essentials mob! :trident: * user essentials mob! :trident: * 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 :trident: * :construction:: Mob session work :trident: * 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 * update schema versions and test Co-authored-by: thisisobate Co-authored-by: Hugo Häggmark Co-authored-by: joshhunt Co-authored-by: kay delaney Co-authored-by: Alexandra Vargas Co-authored-by: sam boyer --- devenv/dev-dashboards/all-panels.json | 2 +- .../elasticsearch_compare.json | 390 +- .../datasource-opentsdb/opentsdb_v2.3.json | 2 +- .../new_features_in_v8.json | 5624 +++++++++-------- .../e2e-repeats/Repeating-Kitchen-Sink.json | 486 ++ .../Repeating-a-panel-horizontally.json | 204 + .../Repeating-a-panel-vertically.json | 202 + ...-panel-and-horizontal-repeating-panel.json | 335 + ...ng-panel-and-vertical-repeating-panel.json | 335 + ...ting-a-row-with-a-non-repeating-panel.json | 258 + ...row-with-a-repeating-horizontal-panel.json | 260 + ...a-row-with-a-repeating-vertical-panel.json | 259 + .../e2e-repeats/Repeating-an-empty-row.json | 183 + devenv/dev-dashboards/home.json | 2 +- .../panel-barchart/barchart-autosizing.json | 7 +- .../panel-geomap/geomap_multi-layers.json | 2 +- .../panel-geomap/panel-geomap.json | 2 +- .../graph-ng-by-value-color-schemes.json | 22 +- .../panel-graph/graph-ng-nulls.json | 34 +- .../panel-histogram/histogram_tests.json | 7 +- .../panel-timeline/timeline-demo.json | 2 +- .../panel-timeline/timeline-modes.json | 2 +- .../transforms/config-from-query.json | 2 +- .../transforms/rows-to-fields.json | 22 +- .../Repeating_a_panel_horizontally.spec.ts | 29 + .../Repeating_a_panel_vertically.spec.ts | 28 + .../Repeating_an_empty_row.spec.ts | 23 + .../src/selectors/components.ts | 3 + .../src/scuemata/dashboard/dashboard.cue | 13 +- pkg/schema/load/load_test.go | 4 +- .../devenvgoldenfiles/all-panels.json | 4 +- .../barchart-autosizing.json | 9 +- .../devenvgoldenfiles/config-from-query.json | 4 +- .../elasticsearch_compare.json | 372 +- .../graph-ng-by-value-color-schemes.json | 24 +- .../devenvgoldenfiles/graph-ng-nulls.json | 36 +- .../devenvgoldenfiles/histogram_tests.json | 9 +- .../testdata/devenvgoldenfiles/home.json | 4 +- .../devenvgoldenfiles/new_features_in_v8.json | 120 +- .../devenvgoldenfiles/opentsdb_v2.3.json | 4 +- .../devenvgoldenfiles/panel-geomap.json | 4 +- .../devenvgoldenfiles/rows-to-fields.json | 24 +- .../devenvgoldenfiles/timeline-demo.json | 4 +- .../devenvgoldenfiles/timeline-modes.json | 4 +- .../components/DashboardRow/DashboardRow.tsx | 7 +- scripts/stripnulls.sh | 2 +- 46 files changed, 6281 insertions(+), 3094 deletions(-) create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-horizontal-repeating-panel.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-vertical-repeating-panel.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json create mode 100644 devenv/dev-dashboards/e2e-repeats/Repeating-an-empty-row.json create mode 100644 e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts create mode 100644 e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts create mode 100644 e2e/dashboards-suite/Repeating_an_empty_row.spec.ts diff --git a/devenv/dev-dashboards/all-panels.json b/devenv/dev-dashboards/all-panels.json index ddd2dbe4ea0..6e4cf7cd21d 100644 --- a/devenv/dev-dashboards/all-panels.json +++ b/devenv/dev-dashboards/all-panels.json @@ -894,7 +894,7 @@ } ], "refresh": "", - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json index 061d93f9fb0..2ab0785563b 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/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": { @@ -701,8 +715,7 @@ "field": "@value", "id": "1", "meta": {}, - "settings": { - }, + "settings": {}, "type": "avg" } ], @@ -746,7 +759,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -801,8 +816,7 @@ "field": "@value", "id": "1", "meta": {}, - "settings": { - }, + "settings": {}, "type": "avg" } ], @@ -846,7 +860,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -901,8 +917,7 @@ "field": "@value", "id": "1", "meta": {}, - "settings": { - }, + "settings": {}, "type": "sum" } ], @@ -946,7 +961,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1001,8 +1018,7 @@ "field": "@value", "id": "1", "meta": {}, - "settings": { - }, + "settings": {}, "type": "sum" } ], @@ -1046,7 +1062,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1147,7 +1165,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1248,7 +1268,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1349,7 +1371,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1450,7 +1474,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1563,7 +1589,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1676,7 +1704,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1786,7 +1816,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1896,7 +1928,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -1998,7 +2032,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fill": 1, "fillGradient": 0, @@ -2114,7 +2150,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2234,7 +2272,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2354,7 +2394,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2474,7 +2516,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2594,7 +2638,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2714,7 +2760,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2834,7 +2882,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -2954,7 +3004,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -3074,7 +3126,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -3194,7 +3248,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -3314,7 +3370,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -3434,7 +3492,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -3568,7 +3628,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -3683,7 +3745,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -3798,7 +3862,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -3913,7 +3979,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4028,7 +4096,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4143,7 +4213,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4258,7 +4330,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4373,7 +4447,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4488,7 +4564,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4603,7 +4681,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4718,7 +4798,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4833,7 +4915,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -4962,7 +5046,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5081,7 +5167,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5200,7 +5288,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5319,7 +5409,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5438,7 +5530,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5557,7 +5651,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5676,7 +5772,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5795,7 +5893,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -5914,7 +6014,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -6033,7 +6135,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -6152,7 +6256,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -6271,7 +6377,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {}, @@ -6404,7 +6512,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -6523,7 +6633,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -6642,7 +6754,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "fieldConfig": { "defaults": { "custom": {} @@ -6773,7 +6887,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "fieldConfig": { "defaults": { "custom": {} @@ -6918,7 +7034,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_one", + "datasource": { + "uid": "$version_one" + }, "decimals": 3, "fieldConfig": { "defaults": { @@ -7071,7 +7189,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "$version_two", + "datasource": { + "uid": "$version_two" + }, "decimals": 3, "fieldConfig": { "defaults": { @@ -7238,7 +7358,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7349,7 +7471,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7460,7 +7584,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7571,7 +7697,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7682,7 +7810,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7794,7 +7924,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -7906,7 +8038,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -8018,7 +8152,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fieldConfig": { "defaults": { "custom": {} @@ -8144,7 +8280,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8260,7 +8398,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8376,7 +8516,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8492,7 +8634,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8608,7 +8752,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8724,7 +8870,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8840,7 +8988,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -8956,7 +9106,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9072,7 +9224,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9188,7 +9342,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9304,7 +9460,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9420,7 +9578,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9536,7 +9696,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9652,7 +9814,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9768,7 +9932,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -9884,7 +10050,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -10014,7 +10182,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -10125,7 +10295,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -10236,7 +10408,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -10347,7 +10521,9 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -10471,7 +10647,9 @@ "type": "row" }, { - "datasource": "${version_one}", + "datasource": { + "uid": "${version_one}" + }, "fieldConfig": { "defaults": { "color": { @@ -10584,8 +10762,8 @@ "field": "@value", "id": "1", "settings": { - "script": { - "inline": "_value * 1.5" + "script": { + "inline": "_value * 1.5" } }, "type": "avg" @@ -10600,7 +10778,9 @@ "type": "timeseries" }, { - "datasource": "${version_two}", + "datasource": { + "uid": "${version_two}" + }, "fieldConfig": { "defaults": { "color": { @@ -10713,8 +10893,8 @@ "field": "@value", "id": "1", "settings": { - "script": { - "inline": "_value * 1.5" + "script": { + "inline": "_value * 1.5" } }, "type": "avg" @@ -10730,7 +10910,7 @@ } ], "refresh": false, - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "elasticsearch", diff --git a/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json b/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json index 287d5b434f1..52d14a2edc2 100644 --- a/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json +++ b/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json @@ -217,7 +217,7 @@ } } ], - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [], "templating": { diff --git a/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json b/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json index 82b6c8904a7..62840ec2f87 100644 --- a/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json +++ b/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json @@ -1,2789 +1,2847 @@ { - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "graphTooltip": 0, - "id": 625, - "links": [], - "panels": [ + "annotations": { + "list": [ { - "gridPos": { - "h": 4, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 13, - "options": { - "content": "\n# Welcome to Grafana 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/)   |  \n[Download](https://grafana.com/grafana/download/beta)   |  \n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play&plcmt=whatnew)", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "refId": "A", - "target": "" - } - ], - "transparent": true, - "type": "text" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 8, - "w": 6, - "x": 0, - "y": 4 - }, - "id": 61, - "links": [], - "options": { - "content": "## State timeline\n\nThe new state timeline panel is one of the new core visualizations. \nIt adds unique state over time visualization for string or boolean states. \n\n### Map strings to colors\n\nWith the new revamped value mapping feature you \ncan now easily map strings, booleans, nulls & NaN values\nto a color or new display text. \n\nThis mapping and coloring support will work in all new core panels.", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "fillOpacity": 80, - "lineWidth": 0 - }, - "mappings": [ - { - "options": { - "CRITICAL": { - "color": "red", - "index": 3 - }, - "HIGH": { - "color": "orange", - "index": 2 - }, - "LOW": { - "color": "blue", - "index": 0 - }, - "NORMAL": { - "color": "green", - "index": 1 - } - }, - "type": "value" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 18, - "x": 6, - "y": 4 - }, - "id": 63, - "options": { - "alignValue": "center", - "colWidth": 0.9, - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "right" - }, - "mergeValues": true, - "mode": "changes", - "rowHeight": 0.97, - "showValue": "always" - }, - "pluginVersion": "7.5.0-pre", - "targets": [ - { - "alias": "Level A", - "refId": "A", - "scenarioId": "csv_metric_values", - "stringInput": "LOW,HIGH,NORMAL,NORMAL,NORMAL,LOW,LOW,NORMAL,HIGH,CRITICAL" - }, - { - "alias": "Level B", - "hide": false, - "refId": "B", - "scenarioId": "csv_metric_values", - "stringInput": "NORMAL,LOW,LOW,CRITICAL,CRITICAL,LOW,LOW,NORMAL,HIGH,CRITICAL" - }, - { - "alias": "Level C", - "hide": false, - "refId": "C", - "scenarioId": "csv_metric_values", - "stringInput": "NORMAL,NORMAL,NORMAL,NORMAL,CRITICAL,LOW,NORMAL,NORMAL,NORMAL,LOW" - } - ], - "title": "State timeline strings", - "type": "state-timeline" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 15, - "w": 6, - "x": 0, - "y": 12 - }, - "id": 70, - "links": [], - "options": { - "content": "### Discrete time series\n\nIt can also transform any numerical time series into discrete states trough \nthresholds. This allow you to quickly gauge health over time and visualize\nthe duration spent in each threshold bracket. \n", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-graphite-1.0", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": { - "fillOpacity": 100, - "lineWidth": 0 - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue" - }, - { - "color": "green", - "value": 50 - }, - { - "color": "red", - "value": 300 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 18, - "x": 6, - "y": 12 - }, - "id": 65, - "maxDataPoints": 200, - "options": { - "alignValue": "left", - "legend": { - "displayMode": "list", - "placement": "bottom" - }, - "mergeValues": true, - "rowHeight": 0.96, - "showValue": "never" - }, - "targets": [ - { - "refId": "A", - "target": "aliasByNode(apps.backend.*.counters.requests.count, 2)" - } - ], - "title": "State timeline with time series + thresholds", - "type": "state-timeline" - }, - { - "datasource": "gdev-graphite-1.0", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "axisWidth": 85, - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "area" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue" - }, - { - "color": "green", - "value": 50 - }, - { - "color": "transparent", - "value": 50 - }, - { - "color": "red", - "value": 300 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 18, - "x": 6, - "y": 20 - }, - "id": 66, - "maxDataPoints": 200, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "8.0.0-beta2", - "targets": [ - { - "refId": "A", - "target": "aliasByNode(apps.backend.*.counters.requests.count, 2)" - } - ], - "title": "Same query/data as above", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 13, - "w": 6, - "x": 0, - "y": 27 - }, - "id": 67, - "links": [], - "options": { - "content": "## Status history\n\nA sister panel to the state timeline is the new Status history panel. It can visualize periodic state in a \ngrid. Works with both numerical, string or boolean state. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "custom": { - "fillOpacity": 70, - "lineWidth": 1 - }, - "mappings": [], - "max": 40, - "min": -10, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue" - }, - { - "color": "#EAB839", - "value": 0 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 18, - "x": 6, - "y": 27 - }, - "id": 68, - "maxDataPoints": 10, - "options": { - "colWidth": 0.95, - "legend": { - "displayMode": "list", - "placement": "bottom" - }, - "rowHeight": 0.9, - "showValue": "auto" - }, - "targets": [ - { - "alias": "__house_locations", - "max": 40, - "min": -10, - "noise": 5, - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 4, - "spread": 20, - "startValue": 10 - } - ], - "title": "State timeline with time series + thresholds", - "type": "status-history" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "custom": { - "fillOpacity": 70, - "lineWidth": 1 - }, - "mappings": [ - { - "options": { - "match": "true", - "result": { - "color": "green", - "index": 0, - "text": "True" - } - }, - "type": "special" - }, - { - "options": { - "match": "false", - "result": { - "color": "red", - "index": 1, - "text": "False" - } - }, - "type": "special" - } - ], - "max": 40, - "min": -10, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue" - }, - { - "color": "#EAB839", - "value": 0 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 5, - "w": 18, - "x": 6, - "y": 35 - }, - "id": 69, - "maxDataPoints": 10, - "options": { - "colWidth": 0.95, - "legend": { - "displayMode": "list", - "placement": "bottom" - }, - "rowHeight": 0.9, - "showValue": "auto" - }, - "targets": [ - { - "alias": "SensorA", - "refId": "A", - "scenarioId": "csv_metric_values", - "stringInput": "true,false,true,false,true,true,true,true,false" - }, - { - "alias": "SensorB", - "hide": false, - "refId": "B", - "scenarioId": "csv_metric_values", - "stringInput": "true,true,true,false,true,true,false,true,false" - } - ], - "title": "Status history - boolean values", - "type": "status-history" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 3, - "w": 24, - "x": 0, - "y": 40 - }, - "id": 59, - "links": [], - "options": { - "content": "## Bar chart \n\nA new bar chart panel adds new graphing capabilities to Grafana, especially for non\ntime series based data. It supports a categorical x or y field, grouped bars, horizontal \nand vertical layout. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "fixedColor": "blue", - "mode": "fixed" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMin": 0, - "fillOpacity": 74, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineWidth": 1 - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "pressure" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 10, - "w": 12, - "x": 0, - "y": 43 - }, - "id": 73, - "options": { - "barWidth": 0.81, - "groupWidth": 0.7, - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "right" - }, - "orientation": "horizontal", - "showValue": "auto", - "text": {}, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "csvFileName": "browser_marketshare.csv", - "refId": "A", - "scenarioId": "csv_file" - } - ], - "title": "Browser market share", - "transformations": [ - { - "id": "filterByValue", - "options": { - "filters": [ - { - "config": { - "id": "greater", - "options": { - "value": 0.37 - } - }, - "fieldName": "Market share" - } - ], - "match": "any", - "type": "include" - } - }, - { - "id": "sortBy", - "options": { - "fields": {}, - "sort": [ - { - "desc": true, - "field": "Market share" - } - ] - } - } - ], - "type": "barchart" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMin": 0, - "fillOpacity": 80, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineWidth": 1 - }, - "mappings": [ - { - "options": { - "match": "true", - "result": { - "color": "green", - "index": 0, - "text": "True" - } - }, - "type": "special" - }, - { - "options": { - "match": "false", - "result": { - "color": "red", - "index": 1, - "text": "False" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "blue" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 10, - "w": 12, - "x": 12, - "y": 43 - }, - "id": 74, - "maxDataPoints": 10, - "options": { - "barWidth": 0.97, - "groupWidth": 0.7, - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "right" - }, - "orientation": "auto", - "showValue": "auto", - "text": {}, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "alias": "SensorA", - "csvFileName": "js_libraries.csv", - "refId": "A", - "scenarioId": "csv_file" - } - ], - "title": "Popular JS Frameworks", - "type": "barchart" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 3, - "w": 24, - "x": 0, - "y": 53 - }, - "id": 71, - "links": [], - "options": { - "content": "## Next-gen Graph\n\nThe new next-gen graphing visualization named `Time series` is now the default\nvisualization in v8. It supports many new options as well as improved performance.\nBelow we highlight some new features. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 56 - }, - "id": 25, - "links": [], - "options": { - "content": "### Interpolation modes\n\nThe new time series panel brings a new interpolation mode\nwhere you can choose between.\n* Linear\n* Smooth\n* Step before\n* Step after (same as old staircase option)", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 50, - "gradientMode": "hue", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "smooth", - "lineWidth": 2, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Requests/s" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "orange", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 6, - "y": 56 - }, - "id": 23, - "maxDataPoints": 80, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "Requests/s", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 1, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "" - } - ], - "title": "Interpolation mode: smooth", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 40, - "gradientMode": "hue", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "stepBefore", - "lineWidth": 2, - "pointSize": 8, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "always", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Requests/s" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 12, - "y": 56 - }, - "id": 26, - "maxDataPoints": 80, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "Requests/s", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "seriesCount": 1, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "1,20,90,30,5,0" - } - ], - "title": "Interpolation mode: Step before", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 40, - "gradientMode": "hue", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "stepAfter", - "lineWidth": 2, - "pointSize": 8, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "always", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Requests/s" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 18, - "y": 56 - }, - "id": 27, - "maxDataPoints": 80, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "Requests/s", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "seriesCount": 1, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "1,20,90,30,5,0" - } - ], - "title": "Interpolation mode: Step after", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 8, - "w": 6, - "x": 0, - "y": 62 - }, - "id": 43, - "links": [], - "options": { - "content": "### Soft min and max\n\nAuto **Min** and **Max** can make small variations look much bigger than they are. This can be fixed by setting **Min** & **Max**. \nThis creates a new problem when spikes in the data occur. Because the \n**Min** and **Max** are hard the full spike cannot be seen. The **Soft min** and **Soft max** options give control over the default range of the axis but also allow going beyond this range when the data does. \n\nYou can combine both the existing standard option **Min** and **Max** and the new **Soft min**\n and **Soft max** to define both soft and hard limits. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 6, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 6, - "x": 6, - "y": 62 - }, - "id": 41, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,10,10,11,12,13,11,10,9,10,11,12,13,14,10,10" - } - ], - "title": "Auto min max", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 6, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "max": 30, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 6, - "x": 12, - "y": 62 - }, - "id": 32, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10" - } - ], - "title": "Hard min 0, max 30", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMax": 30, - "axisSoftMin": 0, - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 6, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "degree" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 6, - "x": 18, - "y": 62 - }, - "id": 44, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10" - } - ], - "title": "Soft min 0, soft max 30", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 5, - "w": 6, - "x": 0, - "y": 70 - }, - "id": 55, - "links": [], - "options": { - "content": "### Multiple Y-Axes\n\nWith the new panel you can have more than 2 y-axes! ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMax": 60, - "axisSoftMin": 0, - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "opacity", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineWidth": 2, - "pointSize": 6, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Temperature" - }, - "properties": [ - { - "id": "unit", - "value": "celsius" - }, - { - "id": "custom.axisPlacement", - "value": "right" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Pressure" - }, - "properties": [ - { - "id": "unit", - "value": "pressurekpa" - }, - { - "id": "custom.axisPlacement", - "value": "right" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Energy" - }, - "properties": [ - { - "id": "unit", - "value": "watt" - }, - { - "id": "custom.axisPlacement", - "value": "left" - } - ] - } - ] - }, - "gridPos": { - "h": 5, - "w": 18, - "x": 6, - "y": 70 - }, - "id": 54, - "maxDataPoints": 50, - "options": { - "legend": { - "calcs": [ - "last" - ], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "Temperature", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "20,25,30,18,35,20,30,25" - }, - { - "alias": "Pressure", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "hide": false, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "B", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "320,230,120,180,400,340,50,270" - }, - { - "alias": "Energy", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "hide": false, - "lines": 10, - "max": 300, - "min": 100, - "noise": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "C", - "scenarioId": "random_walk", - "spread": 100, - "startValue": 0, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "" - } - ], - "title": "Multiple Y-Axes (more than 2!)", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 5, - "w": 6, - "x": 0, - "y": 75 - }, - "id": 51, - "links": [], - "options": { - "content": "### Richer display options\n\nThe new time series panel supports more control over lines, fill gradients that \nwork for both line, area graphs & bars. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "dash": [ - 10, - 10 - ], - "fill": "dash" - }, - "lineWidth": 2, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "B-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 10, - 20 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "C-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 10, - 30 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "D-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 30, - 3, - 3 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "E-series" - }, - "properties": [ - { - "id": "custom.lineStyle" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "F-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 0, - 10 - ], - "fill": "dot" - } - } - ] - } - ] - }, - "gridPos": { - "h": 5, - "w": 6, - "x": 6, - "y": 75 - }, - "id": 48, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "10,10" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "B", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "9,9" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "C", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "8,8" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "D", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "7,7" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "E", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "6,6" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "F", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "5,5" - } - ], - "title": "Advanced dashed line settings", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "dash": [ - 10, - 10 - ], - "fill": "dash" - }, - "lineWidth": 2, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "B-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 10, - 20 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "C-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 10, - 30 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "D-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 30, - 3, - 3 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "E-series" - }, - "properties": [ - { - "id": "custom.lineStyle" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "F-series" - }, - "properties": [ - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 0, - 10 - ], - "fill": "dot" - } - } - ] - } - ] - }, - "gridPos": { - "h": 5, - "w": 6, - "x": 12, - "y": 75 - }, - "id": 76, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "10,10" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "B", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "9,9" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "C", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "8,8" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "D", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "7,7" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "E", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "6,6" - }, - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "F", - "scenarioId": "csv_metric_values", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "5,5" - } - ], - "title": "Advanced dashed line settings", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "bars", - "fillOpacity": 82, - "gradientMode": "hue", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "dash": [ - 10, - 10 - ], - "fill": "solid" - }, - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "A-series" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "orange", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 5, - "w": 6, - "x": 18, - "y": 75 - }, - "id": 50, - "maxDataPoints": 6, - "options": { - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "hide": false, - "lines": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "random_walk", - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "1,20,90,30,5,0" - } - ], - "title": "Bars with hue gradient", - "type": "timeseries" - }, - { - "datasource": "gdev-testdata", - "gridPos": { - "h": 3, - "w": 24, - "x": 0, - "y": 80 - }, - "id": 75, - "links": [], - "options": { - "content": "## Histogram\n\nThis hidden feature of the old Graph panel is now a standalone visualization. It combines a histogram \ntransformation and bar chart visualization into single integrated easy to use panel. There is also a new standalone histogram \ntransformation that can be paired with any visualization. ", - "mode": "markdown" - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "__server_names", - "refId": "A", - "scenarioId": "random_walk", - "seriesCount": 6 - } - ], - "type": "text" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "fillOpacity": 80, - "gradientMode": "hue", - "hideFrom": { - "viz": false, - "legend": false, - "tooltip": false - }, - "lineWidth": 1 - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "A-series" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 11, - "w": 12, - "x": 0, - "y": 83 - }, - "id": 49, - "options": { - "bucketOffset": 0, - "bucketSize": 10, - "legend": { - "calcs": [], - "displayMode": "hidden", - "placement": "bottom" - } - }, - "pluginVersion": "7.4.0-beta1", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "hide": false, - "lines": 10, - "max": 100, - "min": 1, - "noise": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "random_walk", - "spread": 10, - "startValue": 50, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "1,20,90,30,5,0" - } - ], - "title": "Histogram visualization", - "type": "histogram" - }, - { - "datasource": "gdev-testdata", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": { - "align": "auto", - "displayMode": "auto" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "A-series" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - } - ] - }, - "gridPos": { - "h": 11, - "w": 12, - "x": 12, - "y": 83 - }, - "id": 77, - "options": { - "showHeader": true - }, - "pluginVersion": "8.1.0-pre", - "targets": [ - { - "alias": "", - "csvWave": { - "timeStep": 60, - "valuesCSV": "0,0,2,2,1,1" - }, - "hide": false, - "lines": 10, - "max": 100, - "min": 1, - "noise": 10, - "points": [], - "pulseWave": { - "offCount": 3, - "offValue": 1, - "onCount": 3, - "onValue": 2, - "timeStep": 60 - }, - "refId": "A", - "scenarioId": "random_walk", - "spread": 10, - "startValue": 50, - "stream": { - "bands": 1, - "noise": 2.2, - "speed": 250, - "spread": 3.5, - "type": "signal" - }, - "stringInput": "1,20,90,30,5,0" - } - ], - "title": "Histogram transform ", - "transformations": [ - { - "id": "histogram", - "options": { - "bucketSize": 10, - "combine": true, - "fields": {} - } - } - ], - "type": "table" + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" } - ], - "refresh": false, - "schemaVersion": 30, - "style": "dark", - "tags": [ - "gdev", - "graph-ng", - "demo" - ], - "templating": { - "list": [] + ] + }, + "editable": true, + "graphTooltip": 0, + "id": 625, + "links": [], + "panels": [ + { + "gridPos": { + "h": 4, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 13, + "options": { + "content": "\n# Welcome to Grafana 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/)   |  \n[Download](https://grafana.com/grafana/download/beta)   |  \n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play&plcmt=whatnew)", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "refId": "A", + "target": "" + } + ], + "transparent": true, + "type": "text" }, - "time": { - "from": "now-6h", - "to": "now" + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 0, + "y": 4 + }, + "id": 61, + "links": [], + "options": { + "content": "## State timeline\n\nThe new state timeline panel is one of the new core visualizations. \nIt adds unique state over time visualization for string or boolean states. \n\n### Map strings to colors\n\nWith the new revamped value mapping feature you \ncan now easily map strings, booleans, nulls & NaN values\nto a color or new display text. \n\nThis mapping and coloring support will work in all new core panels.", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" }, - "timepicker": { - "refresh_intervals": [ - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ] + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "fillOpacity": 80, + "lineWidth": 0 + }, + "mappings": [ + { + "options": { + "CRITICAL": { + "color": "red", + "index": 3 + }, + "HIGH": { + "color": "orange", + "index": 2 + }, + "LOW": { + "color": "blue", + "index": 0 + }, + "NORMAL": { + "color": "green", + "index": 1 + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 18, + "x": 6, + "y": 4 + }, + "id": 63, + "options": { + "alignValue": "center", + "colWidth": 0.9, + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "right" + }, + "mergeValues": true, + "mode": "changes", + "rowHeight": 0.97, + "showValue": "always" + }, + "pluginVersion": "7.5.0-pre", + "targets": [ + { + "alias": "Level A", + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "LOW,HIGH,NORMAL,NORMAL,NORMAL,LOW,LOW,NORMAL,HIGH,CRITICAL" + }, + { + "alias": "Level B", + "hide": false, + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "NORMAL,LOW,LOW,CRITICAL,CRITICAL,LOW,LOW,NORMAL,HIGH,CRITICAL" + }, + { + "alias": "Level C", + "hide": false, + "refId": "C", + "scenarioId": "csv_metric_values", + "stringInput": "NORMAL,NORMAL,NORMAL,NORMAL,CRITICAL,LOW,NORMAL,NORMAL,NORMAL,LOW" + } + ], + "title": "State timeline strings", + "type": "state-timeline" }, - "timezone": "", - "title": "New Features in v8.0", - "uid": "8mux8PqGz", - "version": 17 - } + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 15, + "w": 6, + "x": 0, + "y": 12 + }, + "id": 70, + "links": [], + "options": { + "content": "### Discrete time series\n\nIt can also transform any numerical time series into discrete states trough \nthresholds. This allow you to quickly gauge health over time and visualize\nthe duration spent in each threshold bracket. \n", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "graphite" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "fillOpacity": 100, + "lineWidth": 0 + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue" + }, + { + "color": "green", + "value": 50 + }, + { + "color": "red", + "value": 300 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 18, + "x": 6, + "y": 12 + }, + "id": 65, + "maxDataPoints": 200, + "options": { + "alignValue": "left", + "legend": { + "displayMode": "list", + "placement": "bottom" + }, + "mergeValues": true, + "rowHeight": 0.96, + "showValue": "never" + }, + "targets": [ + { + "refId": "A", + "target": "aliasByNode(apps.backend.*.counters.requests.count, 2)" + } + ], + "title": "State timeline with time series + thresholds", + "type": "state-timeline" + }, + { + "datasource": { + "type": "graphite" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "axisWidth": 85, + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "area" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue" + }, + { + "color": "green", + "value": 50 + }, + { + "color": "transparent", + "value": 50 + }, + { + "color": "red", + "value": 300 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 18, + "x": 6, + "y": 20 + }, + "id": 66, + "maxDataPoints": 200, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "8.0.0-beta2", + "targets": [ + { + "refId": "A", + "target": "aliasByNode(apps.backend.*.counters.requests.count, 2)" + } + ], + "title": "Same query/data as above", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 13, + "w": 6, + "x": 0, + "y": 27 + }, + "id": 67, + "links": [], + "options": { + "content": "## Status history\n\nA sister panel to the state timeline is the new Status history panel. It can visualize periodic state in a \ngrid. Works with both numerical, string or boolean state. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "custom": { + "fillOpacity": 70, + "lineWidth": 1 + }, + "mappings": [], + "max": 40, + "min": -10, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue" + }, + { + "color": "#EAB839", + "value": 0 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 18, + "x": 6, + "y": 27 + }, + "id": 68, + "maxDataPoints": 10, + "options": { + "colWidth": 0.95, + "legend": { + "displayMode": "list", + "placement": "bottom" + }, + "rowHeight": 0.9, + "showValue": "auto" + }, + "targets": [ + { + "alias": "__house_locations", + "max": 40, + "min": -10, + "noise": 5, + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 4, + "spread": 20, + "startValue": 10 + } + ], + "title": "State timeline with time series + thresholds", + "type": "status-history" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "custom": { + "fillOpacity": 70, + "lineWidth": 1 + }, + "mappings": [ + { + "options": { + "match": "true", + "result": { + "color": "green", + "index": 0, + "text": "True" + } + }, + "type": "special" + }, + { + "options": { + "match": "false", + "result": { + "color": "red", + "index": 1, + "text": "False" + } + }, + "type": "special" + } + ], + "max": 40, + "min": -10, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue" + }, + { + "color": "#EAB839", + "value": 0 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 18, + "x": 6, + "y": 35 + }, + "id": 69, + "maxDataPoints": 10, + "options": { + "colWidth": 0.95, + "legend": { + "displayMode": "list", + "placement": "bottom" + }, + "rowHeight": 0.9, + "showValue": "auto" + }, + "targets": [ + { + "alias": "SensorA", + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "true,false,true,false,true,true,true,true,false" + }, + { + "alias": "SensorB", + "hide": false, + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "true,true,true,false,true,true,false,true,false" + } + ], + "title": "Status history - boolean values", + "type": "status-history" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 3, + "w": 24, + "x": 0, + "y": 40 + }, + "id": 59, + "links": [], + "options": { + "content": "## Bar chart \n\nA new bar chart panel adds new graphing capabilities to Grafana, especially for non\ntime series based data. It supports a categorical x or y field, grouped bars, horizontal \nand vertical layout. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "blue", + "mode": "fixed" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMin": 0, + "fillOpacity": 74, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineWidth": 1 + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "pressure" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 10, + "w": 12, + "x": 0, + "y": 43 + }, + "id": 73, + "options": { + "barWidth": 0.81, + "groupWidth": 0.7, + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "right" + }, + "orientation": "horizontal", + "showValue": "auto", + "text": {}, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "csvFileName": "browser_marketshare.csv", + "refId": "A", + "scenarioId": "csv_file" + } + ], + "title": "Browser market share", + "transformations": [ + { + "id": "filterByValue", + "options": { + "filters": [ + { + "config": { + "id": "greater", + "options": { + "value": 0.37 + } + }, + "fieldName": "Market share" + } + ], + "match": "any", + "type": "include" + } + }, + { + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "desc": true, + "field": "Market share" + } + ] + } + } + ], + "type": "barchart" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMin": 0, + "fillOpacity": 80, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineWidth": 1 + }, + "mappings": [ + { + "options": { + "match": "true", + "result": { + "color": "green", + "index": 0, + "text": "True" + } + }, + "type": "special" + }, + { + "options": { + "match": "false", + "result": { + "color": "red", + "index": 1, + "text": "False" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "blue" + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 10, + "w": 12, + "x": 12, + "y": 43 + }, + "id": 74, + "maxDataPoints": 10, + "options": { + "barWidth": 0.97, + "groupWidth": 0.7, + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right" + }, + "orientation": "auto", + "showValue": "auto", + "text": {}, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "alias": "SensorA", + "csvFileName": "js_libraries.csv", + "refId": "A", + "scenarioId": "csv_file" + } + ], + "title": "Popular JS Frameworks", + "type": "barchart" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 3, + "w": 24, + "x": 0, + "y": 53 + }, + "id": 71, + "links": [], + "options": { + "content": "## Next-gen Graph\n\nThe new next-gen graphing visualization named `Time series` is now the default\nvisualization in v8. It supports many new options as well as improved performance.\nBelow we highlight some new features. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 56 + }, + "id": 25, + "links": [], + "options": { + "content": "### Interpolation modes\n\nThe new time series panel brings a new interpolation mode\nwhere you can choose between.\n* Linear\n* Smooth\n* Step before\n* Step after (same as old staircase option)", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 50, + "gradientMode": "hue", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "smooth", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Requests/s" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 56 + }, + "id": 23, + "maxDataPoints": 80, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "Requests/s", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 1, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "" + } + ], + "title": "Interpolation mode: smooth", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 40, + "gradientMode": "hue", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "stepBefore", + "lineWidth": 2, + "pointSize": 8, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "always", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Requests/s" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 6, + "w": 6, + "x": 12, + "y": 56 + }, + "id": 26, + "maxDataPoints": 80, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "Requests/s", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "seriesCount": 1, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "1,20,90,30,5,0" + } + ], + "title": "Interpolation mode: Step before", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 40, + "gradientMode": "hue", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "stepAfter", + "lineWidth": 2, + "pointSize": 8, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "always", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Requests/s" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 6, + "w": 6, + "x": 18, + "y": 56 + }, + "id": 27, + "maxDataPoints": 80, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "Requests/s", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "seriesCount": 1, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "1,20,90,30,5,0" + } + ], + "title": "Interpolation mode: Step after", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 0, + "y": 62 + }, + "id": 43, + "links": [], + "options": { + "content": "### Soft min and max\n\nAuto **Min** and **Max** can make small variations look much bigger than they are. This can be fixed by setting **Min** & **Max**. \nThis creates a new problem when spikes in the data occur. Because the \n**Min** and **Max** are hard the full spike cannot be seen. The **Soft min** and **Soft max** options give control over the default range of the axis but also allow going beyond this range when the data does. \n\nYou can combine both the existing standard option **Min** and **Max** and the new **Soft min**\n and **Soft max** to define both soft and hard limits. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 6, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 6, + "y": 62 + }, + "id": 41, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,10,10,11,12,13,11,10,9,10,11,12,13,14,10,10" + } + ], + "title": "Auto min max", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 6, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "max": 30, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 12, + "y": 62 + }, + "id": 32, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10" + } + ], + "title": "Hard min 0, max 30", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMax": 30, + "axisSoftMin": 0, + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 6, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "degree" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 6, + "x": 18, + "y": 62 + }, + "id": 44, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10" + } + ], + "title": "Soft min 0, soft max 30", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 0, + "y": 70 + }, + "id": 55, + "links": [], + "options": { + "content": "### Multiple Y-Axes\n\nWith the new panel you can have more than 2 y-axes! ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMax": 60, + "axisSoftMin": 0, + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "opacity", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 6, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Temperature" + }, + "properties": [ + { + "id": "unit", + "value": "celsius" + }, + { + "id": "custom.axisPlacement", + "value": "right" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Pressure" + }, + "properties": [ + { + "id": "unit", + "value": "pressurekpa" + }, + { + "id": "custom.axisPlacement", + "value": "right" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Energy" + }, + "properties": [ + { + "id": "unit", + "value": "watt" + }, + { + "id": "custom.axisPlacement", + "value": "left" + } + ] + } + ] + }, + "gridPos": { + "h": 5, + "w": 18, + "x": 6, + "y": 70 + }, + "id": 54, + "maxDataPoints": 50, + "options": { + "legend": { + "calcs": [ + "last" + ], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "Temperature", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "20,25,30,18,35,20,30,25" + }, + { + "alias": "Pressure", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "hide": false, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "B", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "320,230,120,180,400,340,50,270" + }, + { + "alias": "Energy", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "hide": false, + "lines": 10, + "max": 300, + "min": 100, + "noise": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "C", + "scenarioId": "random_walk", + "spread": 100, + "startValue": 0, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "" + } + ], + "title": "Multiple Y-Axes (more than 2!)", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 0, + "y": 75 + }, + "id": 51, + "links": [], + "options": { + "content": "### Richer display options\n\nThe new time series panel supports more control over lines, fill gradients that \nwork for both line, area graphs & bars. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "dash": [ + 10, + 10 + ], + "fill": "dash" + }, + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "B-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 10, + 20 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "C-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 10, + 30 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "D-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 30, + 3, + 3 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "E-series" + }, + "properties": [ + { + "id": "custom.lineStyle" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "F-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 0, + 10 + ], + "fill": "dot" + } + } + ] + } + ] + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 6, + "y": 75 + }, + "id": 48, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "10,10" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "B", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "9,9" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "C", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "8,8" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "D", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "7,7" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "E", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "6,6" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "F", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "5,5" + } + ], + "title": "Advanced dashed line settings", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "dash": [ + 10, + 10 + ], + "fill": "dash" + }, + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "B-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 10, + 20 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "C-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 10, + 30 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "D-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 30, + 3, + 3 + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "E-series" + }, + "properties": [ + { + "id": "custom.lineStyle" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "F-series" + }, + "properties": [ + { + "id": "custom.lineStyle", + "value": { + "dash": [ + 0, + 10 + ], + "fill": "dot" + } + } + ] + } + ] + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 12, + "y": 75 + }, + "id": 76, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "10,10" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "B", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "9,9" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "C", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "8,8" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "D", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "7,7" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "E", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "6,6" + }, + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "F", + "scenarioId": "csv_metric_values", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "5,5" + } + ], + "title": "Advanced dashed line settings", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "bars", + "fillOpacity": 82, + "gradientMode": "hue", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "dash": [ + 10, + 10 + ], + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "A-series" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 18, + "y": 75 + }, + "id": 50, + "maxDataPoints": 6, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "hide": false, + "lines": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "random_walk", + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "1,20,90,30,5,0" + } + ], + "title": "Bars with hue gradient", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "gridPos": { + "h": 3, + "w": 24, + "x": 0, + "y": 80 + }, + "id": 75, + "links": [], + "options": { + "content": "## Histogram\n\nThis hidden feature of the old Graph panel is now a standalone visualization. It combines a histogram \ntransformation and bar chart visualization into single integrated easy to use panel. There is also a new standalone histogram \ntransformation that can be paired with any visualization. ", + "mode": "markdown" + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "__server_names", + "refId": "A", + "scenarioId": "random_walk", + "seriesCount": 6 + } + ], + "type": "text" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "fillOpacity": 80, + "gradientMode": "hue", + "hideFrom": { + "viz": false, + "legend": false, + "tooltip": false + }, + "lineWidth": 1 + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "A-series" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 11, + "w": 12, + "x": 0, + "y": 83 + }, + "id": 49, + "options": { + "bucketOffset": 0, + "bucketSize": 10, + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + } + }, + "pluginVersion": "7.4.0-beta1", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "hide": false, + "lines": 10, + "max": 100, + "min": 1, + "noise": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "random_walk", + "spread": 10, + "startValue": 50, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "1,20,90,30,5,0" + } + ], + "title": "Histogram visualization", + "type": "histogram" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "displayMode": "auto" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "A-series" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 11, + "w": 12, + "x": 12, + "y": 83 + }, + "id": 77, + "options": { + "showHeader": true + }, + "pluginVersion": "8.1.0-pre", + "targets": [ + { + "alias": "", + "csvWave": { + "timeStep": 60, + "valuesCSV": "0,0,2,2,1,1" + }, + "hide": false, + "lines": 10, + "max": 100, + "min": 1, + "noise": 10, + "points": [], + "pulseWave": { + "offCount": 3, + "offValue": 1, + "onCount": 3, + "onValue": 2, + "timeStep": 60 + }, + "refId": "A", + "scenarioId": "random_walk", + "spread": 10, + "startValue": 50, + "stream": { + "bands": 1, + "noise": 2.2, + "speed": 250, + "spread": 3.5, + "type": "signal" + }, + "stringInput": "1,20,90,30,5,0" + } + ], + "title": "Histogram transform ", + "transformations": [ + { + "id": "histogram", + "options": { + "bucketSize": 10, + "combine": true, + "fields": {} + } + } + ], + "type": "table" + } + ], + "refresh": false, + "schemaVersion": 33, + "style": "dark", + "tags": [ + "gdev", + "graph-ng", + "demo" + ], + "templating": { + "list": [] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "New Features in v8.0", + "uid": "8mux8PqGz", + "version": 17 +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json b/devenv/dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json new file mode 100644 index 00000000000..26cd15fbc7c --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json @@ -0,0 +1,486 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181282174, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 0 + }, + "id": 44, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "title": "Orphan non-repeating panel", + "type": "timeseries" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 8 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 9 + }, + "id": 9, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "horizontal", + "repeatDirection": "h", + "title": "Horizontal repeating $horizontal", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 17 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "title": "Non-repeating panel", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 17 + }, + "id": 22, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "vertical", + "repeatDirection": "v", + "title": "Vertical repeating $vertical", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating Kitchen Sink", + "uid": "hxQwTjpnk", + "version": 6, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json new file mode 100644 index 00000000000..a1847c7e93a --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json @@ -0,0 +1,204 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181116069, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "horizontal", + "repeatDirection": "h", + "title": "Panel Title $horizontal", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a panel horizontally", + "uid": "WVpf2jp7z", + "version": 3, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json new file mode 100644 index 00000000000..7dc03da259d --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json @@ -0,0 +1,202 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "vertical", + "repeatDirection": "v", + "title": "Panel Title $vertical", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "1" + ], + "value": [ + "1" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": false, + "text": "All", + "value": "$__all" + }, + { + "selected": true, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a panel vertically", + "uid": "OY8Ghjt7k", + "version": 1, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-horizontal-repeating-panel.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-horizontal-repeating-panel.json new file mode 100644 index 00000000000..ff27b5edcc6 --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-horizontal-repeating-panel.json @@ -0,0 +1,335 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181157128, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 1 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "title": "Panel Title", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 9 + }, + "id": 9, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "horizontal", + "repeatDirection": "h", + "title": "Horizontal repeating $horizontal", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a row with a non-repeating panel and horizontal repeating panel", + "uid": "k3PEoCpnk", + "version": 3, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-vertical-repeating-panel.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-vertical-repeating-panel.json new file mode 100644 index 00000000000..732ae4ae993 --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel-and-vertical-repeating-panel.json @@ -0,0 +1,335 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181176989, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 1 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "title": "Panel Title", + "type": "timeseries" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 1 + }, + "id": 9, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "vertical", + "repeatDirection": "v", + "title": "Vertical repeating $vertical", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a row with a non-repeating panel and vertical repeating panel", + "uid": "7lS-ojt7z", + "version": 2, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel.json new file mode 100644 index 00000000000..a2dd0305f60 --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-non-repeating-panel.json @@ -0,0 +1,258 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181195825, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 1 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "title": "Panel Title", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a row with a non-repeating panel", + "uid": "ZzyTojpnz", + "version": 3, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json new file mode 100644 index 00000000000..0c8cc89888d --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json @@ -0,0 +1,260 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181211838, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 1 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "horizontal", + "repeatDirection": "h", + "title": "Panel Title $horizontal", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a row with a repeating horizontal panel", + "uid": "0OmtTCtnk", + "version": 3, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json new file mode 100644 index 00000000000..0547b8ba6bf --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json @@ -0,0 +1,259 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181228045, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + }, + { + "datasource": { + "type": "testdata" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "repeat": "vertical", + "repeatDirection": "v", + "title": "Panel Title $vertical", + "type": "timeseries" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating a row with a repeating vertical panel", + "uid": "I0YIojp7z", + "version": 3, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/e2e-repeats/Repeating-an-empty-row.json b/devenv/dev-dashboards/e2e-repeats/Repeating-an-empty-row.json new file mode 100644 index 00000000000..52e68bd9fd9 --- /dev/null +++ b/devenv/dev-dashboards/e2e-repeats/Repeating-an-empty-row.json @@ -0,0 +1,183 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "iteration": 1640181241284, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "panels": [], + "repeat": "row", + "title": "Row title $row", + "type": "row" + } + ], + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "vertical", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "horizontal", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "hide": 0, + "includeAll": true, + "multi": true, + "name": "row", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1", + "value": "1" + }, + { + "selected": false, + "text": "2", + "value": "2" + }, + { + "selected": false, + "text": "3", + "value": "3" + } + ], + "query": "1,2,3", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "utc", + "title": "Repeating an empty row", + "uid": "dtpl2Ctnk", + "version": 4, + "weekStart": "" +} diff --git a/devenv/dev-dashboards/home.json b/devenv/dev-dashboards/home.json index 3fd98704fff..c59210f5874 100644 --- a/devenv/dev-dashboards/home.json +++ b/devenv/dev-dashboards/home.json @@ -189,7 +189,7 @@ "type": "dashlist" } ], - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [], "templating": { diff --git a/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json b/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json index db655f110e3..785ad11d5d7 100644 --- a/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json +++ b/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json @@ -309,7 +309,10 @@ "type": "barchart" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -526,7 +529,7 @@ } ], "refresh": "", - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-geomap/geomap_multi-layers.json b/devenv/dev-dashboards/panel-geomap/geomap_multi-layers.json index 7a00c1f3fcf..7da66da3c17 100644 --- a/devenv/dev-dashboards/panel-geomap/geomap_multi-layers.json +++ b/devenv/dev-dashboards/panel-geomap/geomap_multi-layers.json @@ -433,4 +433,4 @@ "uid": "2jFpEvp7z", "version": 8, "weekStart": "" -} \ No newline at end of file +} diff --git a/devenv/dev-dashboards/panel-geomap/panel-geomap.json b/devenv/dev-dashboards/panel-geomap/panel-geomap.json index b00a48f33a1..5fb9d880e15 100644 --- a/devenv/dev-dashboards/panel-geomap/panel-geomap.json +++ b/devenv/dev-dashboards/panel-geomap/panel-geomap.json @@ -362,7 +362,7 @@ } ], "refresh": "", - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json b/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json index ee567e26d2b..3a72b9f4608 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json @@ -283,7 +283,10 @@ "type": "timeseries" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -460,7 +463,10 @@ "type": "timeseries" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -550,7 +556,10 @@ "type": "timeseries" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -640,7 +649,10 @@ "type": "timeseries" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -834,7 +846,7 @@ } ], "refresh": false, - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json b/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json index d927719fd27..cc454854dac 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json @@ -34,7 +34,9 @@ ], "panels": [ { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "fieldConfig": { "defaults": { "color": { @@ -139,7 +141,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "description": "Series A have no nulls and is not aligned with series B", "fieldConfig": { "defaults": { @@ -254,7 +258,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "description": "", "fieldConfig": { "defaults": { @@ -389,7 +395,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "fieldConfig": { "defaults": { "color": { @@ -494,7 +502,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "description": "Series A have no nulls and is not aligned with series B", "fieldConfig": { "defaults": { @@ -609,7 +619,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "description": "Should look the same as above\n", "fieldConfig": { "defaults": { @@ -744,7 +756,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "fieldConfig": { "defaults": { "color": { @@ -885,7 +899,9 @@ "type": "timeseries" }, { - "datasource": "gdev-testdata", + "datasource": { + "type": "testdata" + }, "fieldConfig": { "defaults": { "color": { @@ -1208,7 +1224,7 @@ "type": "timeseries" } ], - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-histogram/histogram_tests.json b/devenv/dev-dashboards/panel-histogram/histogram_tests.json index 3fc522d9970..49caf47b446 100644 --- a/devenv/dev-dashboards/panel-histogram/histogram_tests.json +++ b/devenv/dev-dashboards/panel-histogram/histogram_tests.json @@ -76,7 +76,10 @@ "type": "histogram" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -409,7 +412,7 @@ "type": "table" } ], - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-timeline/timeline-demo.json b/devenv/dev-dashboards/panel-timeline/timeline-demo.json index 2c642371bf5..6dec37ab297 100644 --- a/devenv/dev-dashboards/panel-timeline/timeline-demo.json +++ b/devenv/dev-dashboards/panel-timeline/timeline-demo.json @@ -414,7 +414,7 @@ } ], "refresh": false, - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/panel-timeline/timeline-modes.json b/devenv/dev-dashboards/panel-timeline/timeline-modes.json index 22256080fd7..d1895390fbd 100644 --- a/devenv/dev-dashboards/panel-timeline/timeline-modes.json +++ b/devenv/dev-dashboards/panel-timeline/timeline-modes.json @@ -361,7 +361,7 @@ } ], "refresh": false, - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/transforms/config-from-query.json b/devenv/dev-dashboards/transforms/config-from-query.json index 9b72d9f1025..c0d7e9cfff3 100644 --- a/devenv/dev-dashboards/transforms/config-from-query.json +++ b/devenv/dev-dashboards/transforms/config-from-query.json @@ -532,7 +532,7 @@ } ], "refresh": "", - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/devenv/dev-dashboards/transforms/rows-to-fields.json b/devenv/dev-dashboards/transforms/rows-to-fields.json index fd3665a8be5..2f694102456 100644 --- a/devenv/dev-dashboards/transforms/rows-to-fields.json +++ b/devenv/dev-dashboards/transforms/rows-to-fields.json @@ -23,7 +23,10 @@ "links": [], "panels": [ { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -70,7 +73,10 @@ "type": "table" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -264,7 +270,10 @@ "type": "gauge" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -311,7 +320,10 @@ "type": "table" }, { - "datasource": "-- Dashboard --", + "datasource": { + "type": "datasource", + "uid": "-- Dashboard --" + }, "fieldConfig": { "defaults": { "color": { @@ -579,7 +591,7 @@ } ], "refresh": "", - "schemaVersion": 30, + "schemaVersion": 33, "style": "dark", "tags": [ "gdev", diff --git a/e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts b/e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts new file mode 100644 index 00000000000..cb1418e4466 --- /dev/null +++ b/e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts @@ -0,0 +1,29 @@ +import { e2e } from '@grafana/e2e'; +const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally'; + +describe('Repeating a panel horizontally', () => { + it('should be able to repeat a panel horizontally', () => { + e2e.flows.login('admin', 'admin'); + e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST }); + + let prevLeft = Number.NEGATIVE_INFINITY; + let prevTop = null; + const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3']; + panelTitles.forEach((title) => { + e2e.components.Panels.Panel.title(title) + .should('be.visible') + .then(($el) => { + const { left, top } = $el[0].getBoundingClientRect(); + expect(left).to.be.greaterThan(prevLeft); + if (prevTop !== null) { + expect(top).to.be.equal(prevTop); + } + + prevLeft = left; + prevTop = top; + }); + }); + }); + + // TODO: Add test for the case when we pass variables in the url +}); diff --git a/e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts b/e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts new file mode 100644 index 00000000000..c12052278bc --- /dev/null +++ b/e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts @@ -0,0 +1,28 @@ +import { e2e } from '@grafana/e2e'; +const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically'; + +describe('Repeating a panel vertically', () => { + it('should be able to repeat a panel vertically', () => { + e2e.flows.login('admin', 'admin'); + e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST }); + + let prevTop = Number.NEGATIVE_INFINITY; + let prevLeft = null; + const panelTitles = ['Panel Title 1', 'Panel Title 2', 'Panel Title 3']; + panelTitles.forEach((title) => { + e2e.components.Panels.Panel.title(title) + .should('be.visible') + .then(($el) => { + const { left, top } = $el[0].getBoundingClientRect(); + expect(top).to.be.greaterThan(prevTop); + if (prevLeft !== null) { + expect(left).to.be.equal(prevLeft); + } + prevLeft = left; + prevTop = top; + }); + }); + }); + + // TODO: Add test for the case when we pass variables in the url +}); diff --git a/e2e/dashboards-suite/Repeating_an_empty_row.spec.ts b/e2e/dashboards-suite/Repeating_an_empty_row.spec.ts new file mode 100644 index 00000000000..002eae58da8 --- /dev/null +++ b/e2e/dashboards-suite/Repeating_an_empty_row.spec.ts @@ -0,0 +1,23 @@ +import { e2e } from '@grafana/e2e'; +const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row'; + +describe('Repeating empty rows', () => { + it('should be able to repeat empty rows vertically', () => { + e2e.flows.login('admin', 'admin'); + e2e.flows.openDashboard({ uid: PAGE_UNDER_TEST }); + + let prevTop = Number.NEGATIVE_INFINITY; + const rowTitles = ['Row title 1', 'Row title 2', 'Row title 3']; + rowTitles.forEach((title) => { + e2e.components.DashboardRow.title(title) + .should('be.visible') + .then(($el) => { + const { top } = $el[0].getBoundingClientRect(); + expect(top).to.be.greaterThan(prevTop); + prevTop = top; + }); + }); + }); + + // TODO: Add test for the case when we pass variables in the url +}); diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts index a0c5360ddda..a69a6b0c36a 100644 --- a/packages/grafana-e2e-selectors/src/selectors/components.ts +++ b/packages/grafana-e2e-selectors/src/selectors/components.ts @@ -319,4 +319,7 @@ export const Components = { ColorSwatch: { name: `data-testid-colorswatch`, }, + DashboardRow: { + title: (title: string) => `data-testid dashboard-row-title-${title}`, + }, }; diff --git a/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue b/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue index 6aed732d70c..cb7e767ca01 100644 --- a/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue +++ b/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue @@ -137,7 +137,7 @@ Family: scuemata.#Family & { // because they share a version timeline with the dashboard // schema; they do not evolve independently. #Panel: { - // The panel plugin type id. + // The panel plugin type id. type: !="" // TODO docs @@ -169,8 +169,11 @@ Family: scuemata.#Family & { description?: string // Whether to display the panel without a background. transparent: bool | *false - // Name of default datasource. - datasource?: string + // The datasource used in all targets. + datasource?: { + type?: string + uid?: string + } // Grid position. gridPos?: { // Panel @@ -347,6 +350,8 @@ Family: scuemata.#Family & { } id: number panels: [...(#Panel | #GraphPanel)] + // Name of template variable to repeat for. + repeat?: string } // Support for legacy graph panels. #GraphPanel: { @@ -426,4 +431,4 @@ Family: scuemata.#Family & { } } } -} \ No newline at end of file +} diff --git a/pkg/schema/load/load_test.go b/pkg/schema/load/load_test.go index a073a90ebdf..e7d3c1e310c 100644 --- a/pkg/schema/load/load_test.go +++ b/pkg/schema/load/load_test.go @@ -60,9 +60,9 @@ var doTestAgainstDevenv = func(sch schema.VersionedCueSchema, validdir string, f t.Logf("no schemaVersion in %s", path) return nil } else { - if !(oldschemav.(float64) > 29) { + if !(oldschemav.(float64) > 32) { if testing.Verbose() { - t.Logf("schemaVersion is %v, older than 30, skipping %s", oldschemav, path) + t.Logf("schemaVersion is %v, older than 33, skipping %s", oldschemav, path) } return nil } diff --git a/pkg/schema/testdata/devenvgoldenfiles/all-panels.json b/pkg/schema/testdata/devenvgoldenfiles/all-panels.json index 8365f6a1628..305b3608691 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/all-panels.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/barchart-autosizing.json b/pkg/schema/testdata/devenvgoldenfiles/barchart-autosizing.json index 1df2163d51e..c7dc46a14b2 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/barchart-autosizing.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/config-from-query.json b/pkg/schema/testdata/devenvgoldenfiles/config-from-query.json index 71c0e5056f3..a25f728deae 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/config-from-query.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/elasticsearch_compare.json b/pkg/schema/testdata/devenvgoldenfiles/elasticsearch_compare.json index 45a25564fba..8615e9cf6b7 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/elasticsearch_compare.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/graph-ng-by-value-color-schemes.json b/pkg/schema/testdata/devenvgoldenfiles/graph-ng-by-value-color-schemes.json index 8a12de95330..3c2d99479e5 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/graph-ng-by-value-color-schemes.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/graph-ng-nulls.json b/pkg/schema/testdata/devenvgoldenfiles/graph-ng-nulls.json index b807575db92..5d01318f0f4 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/graph-ng-nulls.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/histogram_tests.json b/pkg/schema/testdata/devenvgoldenfiles/histogram_tests.json index 7d439b5621b..c7be358e054 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/histogram_tests.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/home.json b/pkg/schema/testdata/devenvgoldenfiles/home.json index b55813e9c9e..75af7e24889 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/home.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/new_features_in_v8.json b/pkg/schema/testdata/devenvgoldenfiles/new_features_in_v8.json index f74b2db8f65..66e4dd94077 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/new_features_in_v8.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/opentsdb_v2.3.json b/pkg/schema/testdata/devenvgoldenfiles/opentsdb_v2.3.json index 8f3b3bf204b..18a9574862b 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/opentsdb_v2.3.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/panel-geomap.json b/pkg/schema/testdata/devenvgoldenfiles/panel-geomap.json index aa8b40f26ef..95f99e3f97f 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/panel-geomap.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/rows-to-fields.json b/pkg/schema/testdata/devenvgoldenfiles/rows-to-fields.json index 680f97bc070..12925b4d261 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/rows-to-fields.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/timeline-demo.json b/pkg/schema/testdata/devenvgoldenfiles/timeline-demo.json index 7931c5a6583..35dd8565a20 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/timeline-demo.json +++ b/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 -} \ No newline at end of file +} diff --git a/pkg/schema/testdata/devenvgoldenfiles/timeline-modes.json b/pkg/schema/testdata/devenvgoldenfiles/timeline-modes.json index 90a19f54522..1a383726df4 100644 --- a/pkg/schema/testdata/devenvgoldenfiles/timeline-modes.json +++ b/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 -} \ No newline at end of file +} diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx index 94213237567..6848ba1b13e 100644 --- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx +++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx @@ -8,6 +8,7 @@ import { RowOptionsButton } from '../RowOptions/RowOptionsButton'; import { getTemplateSrv, RefreshEvent } from '@grafana/runtime'; import { ShowConfirmModalEvent } from '../../../../types/events'; import { Unsubscribable } from 'rxjs'; +import { selectors } from '@grafana/e2e-selectors'; export interface DashboardRowProps { panel: PanelModel; @@ -84,7 +85,11 @@ export class DashboardRow extends React.Component { return (