Skip to content

N
nexpie-grafana-theme
Commit aa5fb20c by Torkel Ödegaard Committed by GitHub
Options

Variables: Adding dashboard to test updating variables from data link (#25192)

parent 4aff2d74
Showing with 164 additions and 42 deletions
devenv/dev-dashboards/feature-templating/testdata-nested-variables.json
...@@ -15,12 +15,18 @@ ...@@ -15,12 +15,18 @@
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": 13844, "iteration": 1590677937026,
"iteration": 1566896059256,
"links": [], "links": [],
"panels": [ "panels": [
{ {
"content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod", "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
"datasource": null,
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"gridPos": { "gridPos": {
"h": 9, "h": 9,
"w": 12, "w": 12,
...@@ -29,7 +35,6 @@ ...@@ -29,7 +35,6 @@
}, },
"id": 4, "id": 4,
"mode": "markdown", "mode": "markdown",
"options": {},
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
...@@ -47,6 +52,12 @@ ...@@ -47,6 +52,12 @@
"colorValue": false, "colorValue": false,
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"], "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"format": "none", "format": "none",
"gauge": { "gauge": {
"maxValue": 100, "maxValue": 100,
...@@ -75,7 +86,6 @@ ...@@ -75,7 +86,6 @@
"maxDataPoints": 100, "maxDataPoints": 100,
"nullPointMode": "connected", "nullPointMode": "connected",
"nullText": null, "nullText": null,
"options": {},
"postfix": "", "postfix": "",
"postfixFontSize": "50%", "postfixFontSize": "50%",
"prefix": "", "prefix": "",
...@@ -119,18 +129,13 @@ ...@@ -119,18 +129,13 @@
}, },
{ {
"cacheTimeout": null, "cacheTimeout": null,
"gridPos": { "datasource": null,
"h": 9, "fieldConfig": {
"w": 4,
"x": 16,
"y": 0
},
"id": 8,
"links": [],
"options": {
"fieldOptions": {
"calcs": ["mean"],
"defaults": { "defaults": {
"color": {
"mode": "thresholds"
},
"custom": {},
"links": [ "links": [
{ {
"targetBlank": true, "targetBlank": true,
...@@ -142,7 +147,9 @@ ...@@ -142,7 +147,9 @@
"max": 100, "max": 100,
"min": 0, "min": 0,
"nullValueMode": "connected", "nullValueMode": "connected",
"thresholds": [ "thresholds": {
"mode": "absolute",
"steps": [
{ {
"color": "green", "color": "green",
"value": null "value": null
...@@ -151,17 +158,30 @@ ...@@ -151,17 +158,30 @@
"color": "red", "color": "red",
"value": 80 "value": 80
} }
], ]
},
"unit": "none" "unit": "none"
}, },
"override": {}, "overrides": []
"values": false },
"gridPos": {
"h": 9,
"w": 4,
"x": 16,
"y": 0
}, },
"id": 8,
"links": [],
"options": {
"orientation": "horizontal", "orientation": "horizontal",
"reduceOptions": {
"calcs": ["mean"],
"values": false
},
"showThresholdLabels": false, "showThresholdLabels": false,
"showThresholdMarkers": true "showThresholdMarkers": true
}, },
"pluginVersion": "6.4.0-pre", "pluginVersion": "7.1.0-pre",
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
...@@ -175,19 +195,13 @@ ...@@ -175,19 +195,13 @@
}, },
{ {
"cacheTimeout": null, "cacheTimeout": null,
"gridPos": { "datasource": null,
"h": 9, "fieldConfig": {
"w": 4,
"x": 20,
"y": 0
},
"id": 9,
"links": [],
"options": {
"displayMode": "basic",
"fieldOptions": {
"calcs": ["mean"],
"defaults": { "defaults": {
"color": {
"mode": "thresholds"
},
"custom": {},
"links": [ "links": [
{ {
"targetBlank": true, "targetBlank": true,
...@@ -199,7 +213,9 @@ ...@@ -199,7 +213,9 @@
"max": 100, "max": 100,
"min": 0, "min": 0,
"nullValueMode": "connected", "nullValueMode": "connected",
"thresholds": [ "thresholds": {
"mode": "absolute",
"steps": [
{ {
"color": "green", "color": "green",
"value": null "value": null
...@@ -208,15 +224,30 @@ ...@@ -208,15 +224,30 @@
"color": "red", "color": "red",
"value": 80 "value": 80
} }
], ]
},
"unit": "none" "unit": "none"
}, },
"override": {}, "overrides": []
},
"gridPos": {
"h": 9,
"w": 4,
"x": 20,
"y": 0
},
"id": 9,
"links": [],
"options": {
"displayMode": "basic",
"orientation": "vertical",
"reduceOptions": {
"calcs": ["mean"],
"values": false "values": false
}, },
"orientation": "vertical" "showUnfilled": true
}, },
"pluginVersion": "6.4.0-pre", "pluginVersion": "7.1.0-pre",
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
...@@ -229,19 +260,107 @@ ...@@ -229,19 +260,107 @@
"type": "bargauge" "type": "bargauge"
}, },
{ {
"datasource": "CsvData",
"fieldConfig": {
"defaults": {
"custom": {
"align": null
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": [
{
"matcher": {
"id": "byName",
"options": "server"
},
"properties": [
{
"id": "links",
"value": [
{
"title": "filter",
"url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
}
]
}
]
}
]
},
"gridPos": {
"h": 6,
"w": 24,
"x": 0,
"y": 9
},
"id": 11,
"options": {
"showHeader": true
},
"pluginVersion": "7.1.0-pre",
"targets": [
{
"data": [
{
"fields": [
{
"config": {},
"name": "datacenter",
"type": "string",
"values": ["A", "B", "C"]
},
{
"config": {},
"name": "server",
"type": "string",
"values": ["AA", "BB", "CC"]
}
]
}
],
"refId": "A"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Data links that filter update variables on current dashboard",
"type": "table"
},
{
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"fill": 1, "fill": 1,
"fillGradient": 0, "fillGradient": 0,
"gridPos": { "gridPos": {
"h": 13, "h": 13,
"w": 24, "w": 24,
"x": 0, "x": 0,
"y": 9 "y": 15
}, },
"hiddenSeries": false,
"id": 2, "id": 2,
"legend": { "legend": {
"avg": false, "avg": false,
...@@ -316,7 +435,7 @@ ...@@ -316,7 +435,7 @@
} }
], ],
"refresh": false, "refresh": false,
"schemaVersion": 19, "schemaVersion": 25,
"style": "dark", "style": "dark",
"tags": ["gdev", "templating"], "tags": ["gdev", "templating"],
"templating": { "templating": {
...@@ -324,6 +443,7 @@ ...@@ -324,6 +443,7 @@
{ {
"allValue": null, "allValue": null,
"current": { "current": {
"selected": true,
"text": "A", "text": "A",
"value": ["A"] "value": ["A"]
}, },
...@@ -349,6 +469,7 @@ ...@@ -349,6 +469,7 @@
{ {
"allValue": null, "allValue": null,
"current": { "current": {
"selected": true,
"text": "AA", "text": "AA",
"value": ["AA"] "value": ["AA"]
}, },
...@@ -374,6 +495,7 @@ ...@@ -374,6 +495,7 @@
{ {
"allValue": null, "allValue": null,
"current": { "current": {
"selected": true,
"text": "All", "text": "All",
"value": ["$__all"] "value": ["$__all"]
}, },
...@@ -403,7 +525,7 @@ ...@@ -403,7 +525,7 @@
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"] "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
}, },
"timezone": "", "timezone": "",
"title": "Templating - Nested Template Variables", "title": "Templating - Nested Template Variables",
......
packages/grafana-data/src/field/fieldOverrides.ts
...@@ -367,7 +367,7 @@ export const getLinksSupplier = ( ...@@ -367,7 +367,7 @@ export const getLinksSupplier = (
const info: LinkModel<Field> = { const info: LinkModel<Field> = {
href: locationUtil.assureBaseUrl(href.replace(/\n/g, '')), href: locationUtil.assureBaseUrl(href.replace(/\n/g, '')),
title: link.title || '', title: link.title || '',
target: link.targetBlank ? '_blank' : '_self', target: link.targetBlank ? '_blank' : undefined,
origin: field, origin: field,
}; };
......
packages/grafana-data/src/types/dataLink.ts
...@@ -34,7 +34,7 @@ export interface DataLink { ...@@ -34,7 +34,7 @@ export interface DataLink {
}; };
} }
export type LinkTarget = '_blank' | '_self'; export type LinkTarget = '_blank' | '_self' | undefined;
/** /**
* Processed Link Model. The values are ready to use * Processed Link Model. The values are ready to use
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment