Commit 318b8c5a by Marcus Efraimsson

update devenv datasources and dashboards for sql datasources

Removed dashboards from docker blocks
parent 4f7882cd
...@@ -51,12 +51,28 @@ datasources: ...@@ -51,12 +51,28 @@ datasources:
user: grafana user: grafana
password: password password: password
- name: gdev-mysql-ds-tests
type: mysql
url: localhost:3306
database: grafana_ds_tests
user: grafana
password: password
- name: gdev-mssql - name: gdev-mssql
type: mssql type: mssql
url: localhost:1433 url: localhost:1433
database: grafana database: grafana
user: grafana user: grafana
password: "Password!" secureJsonData:
password: Password!
- name: gdev-mssql-ds-tests
type: mssql
url: localhost:1433
database: grafanatest
user: grafana
secureJsonData:
password: Password!
- name: gdev-postgres - name: gdev-postgres
type: postgres type: postgres
...@@ -68,6 +84,16 @@ datasources: ...@@ -68,6 +84,16 @@ datasources:
jsonData: jsonData:
sslmode: "disable" sslmode: "disable"
- name: gdev-postgres-ds-tests
type: postgres
url: localhost:5432
database: grafanadstest
user: grafanatest
secureJsonData:
password: grafanatest
jsonData:
sslmode: "disable"
- name: gdev-cloudwatch - name: gdev-cloudwatch
type: cloudwatch type: cloudwatch
editable: true editable: true
......
{ {
"__inputs": [
{
"name": "DS_MSSQL",
"label": "MSSQL",
"description": "",
"type": "datasource",
"pluginId": "mssql",
"pluginName": "MSSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mssql",
"name": "MSSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -52,8 +16,8 @@ ...@@ -52,8 +16,8 @@
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 203,
"iteration": 1520976748896, "iteration": 1532618661457,
"links": [], "links": [],
"panels": [ "panels": [
{ {
...@@ -63,7 +27,7 @@ ...@@ -63,7 +27,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -149,14 +113,18 @@ ...@@ -149,14 +113,18 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 18, "h": 18,
...@@ -234,14 +202,18 @@ ...@@ -234,14 +202,18 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -313,11 +285,15 @@ ...@@ -313,11 +285,15 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 10, "h": 10,
...@@ -371,13 +347,13 @@ ...@@ -371,13 +347,13 @@
], ],
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [], "tags": ["gdev", "mssql", "fake-data-gen"],
"templating": { "templating": {
"list": [ "list": [
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Datacenter", "label": "Datacenter",
...@@ -387,6 +363,7 @@ ...@@ -387,6 +363,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric", "query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -397,7 +374,7 @@ ...@@ -397,7 +374,7 @@
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_MSSQL}", "datasource": "gdev-mssql",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Hostname", "label": "Hostname",
...@@ -407,6 +384,7 @@ ...@@ -407,6 +384,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'", "query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -499,6 +477,7 @@ ...@@ -499,6 +477,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d", "query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -533,7 +512,7 @@ ...@@ -533,7 +512,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Grafana Fake Data Gen - MSSQL", "title": "Datasource tests - MSSQL",
"uid": "86Js1xRmk", "uid": "86Js1xRmk",
"version": 11 "version": 1
} }
\ No newline at end of file
{ {
"__inputs": [
{
"name": "DS_MSSQL_TEST",
"label": "MSSQL Test",
"description": "",
"type": "datasource",
"pluginId": "mssql",
"pluginName": "Microsoft SQL Server"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mssql",
"name": "Microsoft SQL Server",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -47,7 +11,7 @@ ...@@ -47,7 +11,7 @@
"type": "dashboard" "type": "dashboard"
}, },
{ {
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#6ed0e0", "iconColor": "#6ed0e0",
...@@ -59,7 +23,7 @@ ...@@ -59,7 +23,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "rgba(255, 96, 96, 1)", "iconColor": "rgba(255, 96, 96, 1)",
...@@ -71,7 +35,7 @@ ...@@ -71,7 +35,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#7eb26d", "iconColor": "#7eb26d",
...@@ -83,7 +47,7 @@ ...@@ -83,7 +47,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#1f78c1", "iconColor": "#1f78c1",
...@@ -96,16 +60,17 @@ ...@@ -96,16 +60,17 @@
} }
] ]
}, },
"description": "Run the mssql unit tests to generate the data backing this dashboard",
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 35,
"iteration": 1523320861623, "iteration": 1532618879985,
"links": [], "links": [],
"panels": [ "panels": [
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 4, "h": 4,
...@@ -152,7 +117,7 @@ ...@@ -152,7 +117,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -206,7 +171,7 @@ ...@@ -206,7 +171,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -260,7 +225,7 @@ ...@@ -260,7 +225,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -314,7 +279,7 @@ ...@@ -314,7 +279,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -371,7 +336,7 @@ ...@@ -371,7 +336,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -454,7 +419,7 @@ ...@@ -454,7 +419,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -537,7 +502,7 @@ ...@@ -537,7 +502,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -620,7 +585,7 @@ ...@@ -620,7 +585,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -703,7 +668,7 @@ ...@@ -703,7 +668,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -786,7 +751,7 @@ ...@@ -786,7 +751,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -869,7 +834,7 @@ ...@@ -869,7 +834,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -962,7 +927,7 @@ ...@@ -962,7 +927,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1065,7 +1030,7 @@ ...@@ -1065,7 +1030,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1158,7 +1123,7 @@ ...@@ -1158,7 +1123,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1243,7 +1208,7 @@ ...@@ -1243,7 +1208,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1336,7 +1301,7 @@ ...@@ -1336,7 +1301,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1421,7 +1386,7 @@ ...@@ -1421,7 +1386,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1514,7 +1479,7 @@ ...@@ -1514,7 +1479,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1599,7 +1564,7 @@ ...@@ -1599,7 +1564,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1686,7 +1651,7 @@ ...@@ -1686,7 +1651,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1773,7 +1738,7 @@ ...@@ -1773,7 +1738,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1867,7 +1832,7 @@ ...@@ -1867,7 +1832,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1954,7 +1919,7 @@ ...@@ -1954,7 +1919,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2048,7 +2013,7 @@ ...@@ -2048,7 +2013,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2135,7 +2100,7 @@ ...@@ -2135,7 +2100,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2229,7 +2194,7 @@ ...@@ -2229,7 +2194,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2316,7 +2281,7 @@ ...@@ -2316,7 +2281,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2410,7 +2375,7 @@ ...@@ -2410,7 +2375,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MSSQL_TEST}", "datasource": "gdev-mssql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2496,22 +2461,44 @@ ...@@ -2496,22 +2461,44 @@
"refresh": false, "refresh": false,
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [], "tags": ["gdev", "mssql"],
"templating": { "templating": {
"list": [ "list": [
{ {
"allValue": "'ALL'", "allValue": "'ALL'",
"current": {}, "current": {
"datasource": "${DS_MSSQL_TEST}", "selected": true,
"tags": [],
"text": "All",
"value": "$__all"
},
"datasource": "gdev-mssql-ds-tests",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Metric", "label": "Metric",
"multi": false, "multi": false,
"name": "metric", "name": "metric",
"options": [], "options": [
{
"selected": true,
"text": "All",
"value": "$__all"
},
{
"selected": false,
"text": "Metric A",
"value": "Metric A"
},
{
"selected": false,
"text": "Metric B",
"value": "Metric B"
}
],
"query": "SELECT DISTINCT measurement FROM metric_values", "query": "SELECT DISTINCT measurement FROM metric_values",
"refresh": 1, "refresh": 0,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 0, "sort": 0,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -2564,6 +2551,7 @@ ...@@ -2564,6 +2551,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m", "query": "1s,10s,30s,1m,5m,10m",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -2598,7 +2586,7 @@ ...@@ -2598,7 +2586,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Microsoft SQL Server Data Source Test", "title": "Datasource tests - MSSQL (unit test)",
"uid": "GlAqcPgmz", "uid": "GlAqcPgmz",
"version": 58 "version": 58
} }
\ No newline at end of file
{ {
"__inputs": [
{
"name": "DS_MYSQL",
"label": "MySQL",
"description": "",
"type": "datasource",
"pluginId": "mysql",
"pluginName": "MySQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mysql",
"name": "MySQL",
"version": "5.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -52,8 +16,8 @@ ...@@ -52,8 +16,8 @@
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 4,
"iteration": 1523372133566, "iteration": 1532620738041,
"links": [], "links": [],
"panels": [ "panels": [
{ {
...@@ -63,7 +27,7 @@ ...@@ -63,7 +27,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL}", "datasource": "gdev-mysql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -161,7 +125,7 @@ ...@@ -161,7 +125,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL}", "datasource": "gdev-mysql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 18, "h": 18,
...@@ -251,7 +215,7 @@ ...@@ -251,7 +215,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL}", "datasource": "gdev-mysql",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -332,7 +296,7 @@ ...@@ -332,7 +296,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL}", "datasource": "gdev-mysql",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -390,6 +354,7 @@ ...@@ -390,6 +354,7 @@
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"gdev",
"fake-data-gen", "fake-data-gen",
"mysql" "mysql"
], ],
...@@ -397,8 +362,11 @@ ...@@ -397,8 +362,11 @@
"list": [ "list": [
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {
"datasource": "${DS_MYSQL}", "text": "America",
"value": "America"
},
"datasource": "gdev-mysql",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Datacenter", "label": "Datacenter",
...@@ -408,6 +376,7 @@ ...@@ -408,6 +376,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric", "query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -417,8 +386,11 @@ ...@@ -417,8 +386,11 @@
}, },
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {
"datasource": "${DS_MYSQL}", "text": "All",
"value": "$__all"
},
"datasource": "gdev-mysql",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Hostname", "label": "Hostname",
...@@ -428,6 +400,7 @@ ...@@ -428,6 +400,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'", "query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -520,6 +493,7 @@ ...@@ -520,6 +493,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d", "query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -554,7 +528,7 @@ ...@@ -554,7 +528,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Grafana Fake Data Gen - MySQL", "title": "Datasource tests - MySQL",
"uid": "DGsCac3kz", "uid": "DGsCac3kz",
"version": 8 "version": 8
} }
\ No newline at end of file
{ {
"__inputs": [
{
"name": "DS_MYSQL_TEST",
"label": "MySQL TEST",
"description": "",
"type": "datasource",
"pluginId": "mysql",
"pluginName": "MySQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mysql",
"name": "MySQL",
"version": "5.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -47,7 +11,7 @@ ...@@ -47,7 +11,7 @@
"type": "dashboard" "type": "dashboard"
}, },
{ {
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#6ed0e0", "iconColor": "#6ed0e0",
...@@ -59,7 +23,7 @@ ...@@ -59,7 +23,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "rgba(255, 96, 96, 1)", "iconColor": "rgba(255, 96, 96, 1)",
...@@ -71,7 +35,7 @@ ...@@ -71,7 +35,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#7eb26d", "iconColor": "#7eb26d",
...@@ -83,7 +47,7 @@ ...@@ -83,7 +47,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#1f78c1", "iconColor": "#1f78c1",
...@@ -96,16 +60,17 @@ ...@@ -96,16 +60,17 @@
} }
] ]
}, },
"description": "Run the mysql unit tests to generate the data backing this dashboard",
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 39,
"iteration": 1523320712115, "iteration": 1532620354037,
"links": [], "links": [],
"panels": [ "panels": [
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 4, "h": 4,
...@@ -152,7 +117,7 @@ ...@@ -152,7 +117,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -206,7 +171,7 @@ ...@@ -206,7 +171,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -260,7 +225,7 @@ ...@@ -260,7 +225,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -314,7 +279,7 @@ ...@@ -314,7 +279,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -371,7 +336,7 @@ ...@@ -371,7 +336,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -454,7 +419,7 @@ ...@@ -454,7 +419,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -537,7 +502,7 @@ ...@@ -537,7 +502,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -620,7 +585,7 @@ ...@@ -620,7 +585,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -703,7 +668,7 @@ ...@@ -703,7 +668,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -786,7 +751,7 @@ ...@@ -786,7 +751,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -869,7 +834,7 @@ ...@@ -869,7 +834,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -962,7 +927,7 @@ ...@@ -962,7 +927,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1059,7 +1024,7 @@ ...@@ -1059,7 +1024,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1152,7 +1117,7 @@ ...@@ -1152,7 +1117,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1237,7 +1202,7 @@ ...@@ -1237,7 +1202,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1330,7 +1295,7 @@ ...@@ -1330,7 +1295,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1415,7 +1380,7 @@ ...@@ -1415,7 +1380,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1508,7 +1473,7 @@ ...@@ -1508,7 +1473,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1593,7 +1558,7 @@ ...@@ -1593,7 +1558,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1687,7 +1652,7 @@ ...@@ -1687,7 +1652,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1774,7 +1739,7 @@ ...@@ -1774,7 +1739,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1868,7 +1833,7 @@ ...@@ -1868,7 +1833,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1955,7 +1920,7 @@ ...@@ -1955,7 +1920,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2049,7 +2014,7 @@ ...@@ -2049,7 +2014,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2136,7 +2101,7 @@ ...@@ -2136,7 +2101,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2230,7 +2195,7 @@ ...@@ -2230,7 +2195,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_MYSQL_TEST}", "datasource": "gdev-mysql-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2316,22 +2281,42 @@ ...@@ -2316,22 +2281,42 @@
"refresh": false, "refresh": false,
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [], "tags": ["gdev", "mysql"],
"templating": { "templating": {
"list": [ "list": [
{ {
"allValue": "", "allValue": "",
"current": {}, "current": {
"datasource": "${DS_MYSQL_TEST}", "text": "All",
"value": "$__all"
},
"datasource": "gdev-mysql-ds-tests",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Metric", "label": "Metric",
"multi": true, "multi": true,
"name": "metric", "name": "metric",
"options": [], "options": [
{
"selected": true,
"text": "All",
"value": "$__all"
},
{
"selected": false,
"text": "Metric A",
"value": "Metric A"
},
{
"selected": false,
"text": "Metric B",
"value": "Metric B"
}
],
"query": "SELECT DISTINCT measurement FROM metric_values", "query": "SELECT DISTINCT measurement FROM metric_values",
"refresh": 1, "refresh": 0,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 0, "sort": 0,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -2384,6 +2369,7 @@ ...@@ -2384,6 +2369,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m", "query": "1s,10s,30s,1m,5m,10m",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -2418,7 +2404,7 @@ ...@@ -2418,7 +2404,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "MySQL Data Source Test", "title": "Datasource tests - MySQL (unittest)",
"uid": "Hmf8FDkmz", "uid": "Hmf8FDkmz",
"version": 12 "version": 12
} }
\ No newline at end of file
{ {
"__inputs": [
{
"name": "DS_POSTGRESQL",
"label": "PostgreSQL",
"description": "",
"type": "datasource",
"pluginId": "postgres",
"pluginName": "PostgreSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "postgres",
"name": "PostgreSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": ""
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -52,8 +16,8 @@ ...@@ -52,8 +16,8 @@
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 5,
"iteration": 1518601837383, "iteration": 1532620601931,
"links": [], "links": [],
"panels": [ "panels": [
{ {
...@@ -63,7 +27,7 @@ ...@@ -63,7 +27,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRESQL}", "datasource": "gdev-postgres",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -150,14 +114,18 @@ ...@@ -150,14 +114,18 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRESQL}", "datasource": "gdev-postgres",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 18, "h": 18,
...@@ -236,14 +204,18 @@ ...@@ -236,14 +204,18 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRESQL}", "datasource": "gdev-postgres",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -316,11 +288,15 @@ ...@@ -316,11 +288,15 @@
"min": null, "min": null,
"show": true "show": true
} }
] ],
"yaxis": {
"align": false,
"alignLevel": null
}
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRESQL}", "datasource": "gdev-postgres",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -377,6 +353,7 @@ ...@@ -377,6 +353,7 @@
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"gdev",
"fake-data-gen", "fake-data-gen",
"postgres" "postgres"
], ],
...@@ -384,8 +361,11 @@ ...@@ -384,8 +361,11 @@
"list": [ "list": [
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {
"datasource": "${DS_POSTGRESQL}", "text": "America",
"value": "America"
},
"datasource": "gdev-postgres",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Datacenter", "label": "Datacenter",
...@@ -395,6 +375,7 @@ ...@@ -395,6 +375,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric", "query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -404,8 +385,11 @@ ...@@ -404,8 +385,11 @@
}, },
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {
"datasource": "${DS_POSTGRESQL}", "text": "All",
"value": "$__all"
},
"datasource": "gdev-postgres",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Hostname", "label": "Hostname",
...@@ -415,6 +399,7 @@ ...@@ -415,6 +399,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'", "query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1, "refresh": 1,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -507,6 +492,7 @@ ...@@ -507,6 +492,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d", "query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -541,7 +527,7 @@ ...@@ -541,7 +527,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Grafana Fake Data Gen - PostgreSQL", "title": "Datasource tests - Postgres",
"uid": "JYola5qzz", "uid": "JYola5qzz",
"version": 1 "version": 4
} }
\ No newline at end of file
{ {
"__inputs": [
{
"name": "DS_POSTGRES_TEST",
"label": "Postgres TEST",
"description": "",
"type": "datasource",
"pluginId": "postgres",
"pluginName": "PostgreSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "postgres",
"name": "PostgreSQL",
"version": "5.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
...@@ -47,7 +11,7 @@ ...@@ -47,7 +11,7 @@
"type": "dashboard" "type": "dashboard"
}, },
{ {
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#6ed0e0", "iconColor": "#6ed0e0",
...@@ -59,7 +23,7 @@ ...@@ -59,7 +23,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "rgba(255, 96, 96, 1)", "iconColor": "rgba(255, 96, 96, 1)",
...@@ -71,7 +35,7 @@ ...@@ -71,7 +35,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#7eb26d", "iconColor": "#7eb26d",
...@@ -83,7 +47,7 @@ ...@@ -83,7 +47,7 @@
"type": "tags" "type": "tags"
}, },
{ {
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"enable": false, "enable": false,
"hide": false, "hide": false,
"iconColor": "#1f78c1", "iconColor": "#1f78c1",
...@@ -96,16 +60,17 @@ ...@@ -96,16 +60,17 @@
} }
] ]
}, },
"description": "Run the postgres unit tests to generate the data backing this dashboard",
"editable": true, "editable": true,
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 38,
"iteration": 1523320929325, "iteration": 1532619575136,
"links": [], "links": [],
"panels": [ "panels": [
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 4, "h": 4,
...@@ -152,7 +117,7 @@ ...@@ -152,7 +117,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -206,7 +171,7 @@ ...@@ -206,7 +171,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -260,7 +225,7 @@ ...@@ -260,7 +225,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -314,7 +279,7 @@ ...@@ -314,7 +279,7 @@
}, },
{ {
"columns": [], "columns": [],
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fontSize": "100%", "fontSize": "100%",
"gridPos": { "gridPos": {
"h": 3, "h": 3,
...@@ -371,7 +336,7 @@ ...@@ -371,7 +336,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -454,7 +419,7 @@ ...@@ -454,7 +419,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -537,7 +502,7 @@ ...@@ -537,7 +502,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -620,7 +585,7 @@ ...@@ -620,7 +585,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -703,7 +668,7 @@ ...@@ -703,7 +668,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -786,7 +751,7 @@ ...@@ -786,7 +751,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 9, "h": 9,
...@@ -869,7 +834,7 @@ ...@@ -869,7 +834,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -962,7 +927,7 @@ ...@@ -962,7 +927,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1047,7 +1012,7 @@ ...@@ -1047,7 +1012,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1140,7 +1105,7 @@ ...@@ -1140,7 +1105,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1225,7 +1190,7 @@ ...@@ -1225,7 +1190,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1318,7 +1283,7 @@ ...@@ -1318,7 +1283,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1403,7 +1368,7 @@ ...@@ -1403,7 +1368,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1496,7 +1461,7 @@ ...@@ -1496,7 +1461,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 2, "fill": 2,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1581,7 +1546,7 @@ ...@@ -1581,7 +1546,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1675,7 +1640,7 @@ ...@@ -1675,7 +1640,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1762,7 +1727,7 @@ ...@@ -1762,7 +1727,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1856,7 +1821,7 @@ ...@@ -1856,7 +1821,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -1943,7 +1908,7 @@ ...@@ -1943,7 +1908,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2037,7 +2002,7 @@ ...@@ -2037,7 +2002,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2124,7 +2089,7 @@ ...@@ -2124,7 +2089,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2218,7 +2183,7 @@ ...@@ -2218,7 +2183,7 @@
"bars": true, "bars": true,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_POSTGRES_TEST}", "datasource": "gdev-postgres-ds-tests",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {
"h": 8, "h": 8,
...@@ -2304,22 +2269,46 @@ ...@@ -2304,22 +2269,46 @@
"refresh": false, "refresh": false,
"schemaVersion": 16, "schemaVersion": 16,
"style": "dark", "style": "dark",
"tags": [], "tags": ["gdev", "postgres"],
"templating": { "templating": {
"list": [ "list": [
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {
"datasource": "${DS_POSTGRES_TEST}", "selected": true,
"tags": [],
"text": "All",
"value": [
"$__all"
]
},
"datasource": "gdev-postgres-ds-tests",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Metric", "label": "Metric",
"multi": true, "multi": true,
"name": "metric", "name": "metric",
"options": [], "options": [
{
"selected": true,
"text": "All",
"value": "$__all"
},
{
"selected": false,
"text": "Metric A",
"value": "Metric A"
},
{
"selected": false,
"text": "Metric B",
"value": "Metric B"
}
],
"query": "SELECT DISTINCT measurement FROM metric_values", "query": "SELECT DISTINCT measurement FROM metric_values",
"refresh": 1, "refresh": 0,
"regex": "", "regex": "",
"skipUrlSync": false,
"sort": 1, "sort": 1,
"tagValuesQuery": "", "tagValuesQuery": "",
"tags": [], "tags": [],
...@@ -2372,6 +2361,7 @@ ...@@ -2372,6 +2361,7 @@
], ],
"query": "1s,10s,30s,1m,5m,10m", "query": "1s,10s,30s,1m,5m,10m",
"refresh": 2, "refresh": 2,
"skipUrlSync": false,
"type": "interval" "type": "interval"
} }
] ]
...@@ -2406,7 +2396,7 @@ ...@@ -2406,7 +2396,7 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Postgres Data Source Test", "title": "Datasource tests - Postgres (unittest)",
"uid": "vHQdlVziz", "uid": "vHQdlVziz",
"version": 14 "version": 17
} }
\ No newline at end of file
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