From 66fe812e9712c4293bf59185e150a28f78df0a34 Mon Sep 17 00:00:00 2001 From: Eldwan Brianne Date: Mon, 2 Nov 2020 23:27:01 +0100 Subject: [PATCH] Updated dashboard and link to it in README --- README.md | 2 +- grafana/dashboard.json | 92 ++++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 1771e1c..0ba4712 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ It is based on the famous pihole-exporter [available here](https://github.com/ek ![Grafana dashboard](https://raw.githubusercontent.com/ebrianne/adguard-exporter/master/grafana/dashboard.png) -Grafana dashboard is [available here](https://grafana.com/dashboards/10176) on the Grafana dashboard website and also [here](https://raw.githubusercontent.com/ebrianne/adguard-exporter/master/grafana/dashboard.json) on the GitHub repository. +Grafana dashboard is [available here](https://grafana.com/dashboards/13330) on the Grafana dashboard website and also [here](https://raw.githubusercontent.com/ebrianne/adguard-exporter/master/grafana/dashboard.json) on the GitHub repository. ## Prerequisites diff --git a/grafana/dashboard.json b/grafana/dashboard.json index c299c7f..630ee47 100644 --- a/grafana/dashboard.json +++ b/grafana/dashboard.json @@ -1,9 +1,57 @@ { + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "7.3.1" + }, + { + "type": "panel", + "id": "graph", + "name": "Graph", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "table-old", + "name": "Table (old)", + "version": "" + } + ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "Prometheus", + "datasource": "${DS_PROMETHEUS}", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -16,13 +64,13 @@ "editable": true, "gnetId": 10176, "graphTooltip": 0, - "id": 25, - "iteration": 1604354495921, + "id": null, + "iteration": 1604355788357, "links": [], "panels": [ { "collapsed": false, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "gridPos": { "h": 1, "w": 24, @@ -36,7 +84,7 @@ }, { "cacheTimeout": null, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {}, @@ -132,7 +180,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -224,7 +272,7 @@ "rgba(237, 129, 40, 0.89)", "#d44a3a" ], - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "decimals": null, "fieldConfig": { "defaults": { @@ -309,7 +357,7 @@ }, { "cacheTimeout": null, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "color": { @@ -393,7 +441,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -466,6 +514,7 @@ }, "yaxes": [ { + "$$hashKey": "object:100", "format": "short", "label": null, "logBase": 1, @@ -474,6 +523,7 @@ "show": true }, { + "$$hashKey": "object:101", "format": "short", "label": null, "logBase": 1, @@ -489,7 +539,7 @@ }, { "columns": [], - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -557,7 +607,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -631,6 +681,7 @@ }, "yaxes": [ { + "$$hashKey": "object:302", "format": "short", "label": null, "logBase": 1, @@ -639,6 +690,7 @@ "show": true }, { + "$$hashKey": "object:303", "format": "short", "label": null, "logBase": 1, @@ -654,7 +706,7 @@ }, { "columns": [], - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -725,7 +777,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -798,6 +850,7 @@ }, "yaxes": [ { + "$$hashKey": "object:355", "format": "percent", "label": null, "logBase": 1, @@ -806,6 +859,7 @@ "show": true }, { + "$$hashKey": "object:356", "format": "short", "label": null, "logBase": 1, @@ -821,7 +875,7 @@ }, { "columns": [], - "datasource": null, + "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { "custom": {} @@ -896,12 +950,8 @@ "list": [ { "allValue": null, - "current": { - "selected": false, - "text": "192.168.10.252", - "value": "192.168.10.252" - }, - "datasource": "Prometheus", + "current": {}, + "datasource": "${DS_PROMETHEUS}", "definition": "label_values(adguard_num_dns_queries, hostname)", "error": null, "hide": 0, @@ -958,4 +1008,4 @@ "title": "Adguard Exporter", "uid": "MIBVglomg", "version": 10 -} +} \ No newline at end of file