Browse Source

updated dashboard to new metric names

pull/4/head
sberk42 4 years ago
parent
commit
ec79d1d1c4
  1. 131
      grafana/Dashboard.json

131
grafana/Dashboard.json

@ -20,7 +20,7 @@
"type": "grafana", "type": "grafana",
"id": "grafana", "id": "grafana",
"name": "Grafana", "name": "Grafana",
"version": "7.3.5" "version": "7.3.6"
}, },
{ {
"type": "panel", "type": "panel",
@ -110,7 +110,7 @@
}, },
"textMode": "value" "textMode": "value"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"expr": "gateway_device_modelname", "expr": "gateway_device_modelname",
@ -184,7 +184,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -308,11 +308,11 @@
"showThresholdLabels": false, "showThresholdLabels": false,
"showThresholdMarkers": true "showThresholdMarkers": true
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_bytes_receive_rate*8", "expr": "gateway_traffic_rate{direction=\"Received\",interface=\"WAN\"}*8",
"format": "table", "format": "table",
"groupBy": [ "groupBy": [
{ {
@ -415,11 +415,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{direction=\"Received\",unit=\"Bytes\"}", "expr": "gateway_traffic{direction=\"Received\",unit=\"Bytes\",interface=\"WAN\"}",
"format": "time_series", "format": "time_series",
"groupBy": [], "groupBy": [],
"instant": false, "instant": false,
@ -526,11 +526,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{unit=\"Bytes\",direction=\"Received\"}", "expr": "gateway_traffic{unit=\"Bytes\",direction=\"Received\",interface=\"WAN\"}",
"groupBy": [], "groupBy": [],
"interval": "", "interval": "",
"legendFormat": "", "legendFormat": "",
@ -629,7 +629,7 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
@ -753,11 +753,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_connection_status", "expr": "gateway_connection_status{connection=\"IP\"}",
"groupBy": [ "groupBy": [
{ {
"params": [ "params": [
@ -797,7 +797,7 @@
"target": "" "target": ""
} }
], ],
"title": "WAN Connection Status", "title": "IP Connection Status",
"type": "stat" "type": "stat"
}, },
{ {
@ -862,11 +862,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_connection_uptime_seconds", "expr": "gateway_connection_uptime_seconds{connection=\"IP\"}",
"groupBy": [ "groupBy": [
{ {
"params": [ "params": [
@ -984,11 +984,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_layer1_link_status", "expr": "gateway_connection_status{connection=\"Physical Link\"}",
"groupBy": [ "groupBy": [
{ {
"params": [ "params": [
@ -1094,11 +1094,11 @@
"showThresholdLabels": false, "showThresholdLabels": false,
"showThresholdMarkers": true "showThresholdMarkers": true
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_bytes_send_rate*8", "expr": "gateway_traffic_rate{direction=\"Sent\",interface=\"WAN\"}*8",
"format": "table", "format": "table",
"groupBy": [ "groupBy": [
{ {
@ -1200,11 +1200,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{direction=\"Sent\",unit=\"Bytes\"}", "expr": "gateway_traffic{direction=\"Sent\",unit=\"Bytes\",interface=\"WAN\"}",
"groupBy": [], "groupBy": [],
"interval": "", "interval": "",
"legendFormat": "", "legendFormat": "",
@ -1302,11 +1302,11 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{direction=\"Sent\",unit=\"Bytes\"}", "expr": "gateway_traffic{direction=\"Sent\",unit=\"Bytes\",interface=\"WAN\"}",
"groupBy": [], "groupBy": [],
"interval": "", "interval": "",
"legendFormat": "", "legendFormat": "",
@ -1385,7 +1385,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1517,7 +1517,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1631,26 +1631,20 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
"seriesOverrides": [], "seriesOverrides": [],
"spaceLength": 10, "spaceLength": 10,
"stack": false, "stack": true,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "gateway_wlan_current_connections", "expr": "gateway_wlan_current_connections",
"interval": "", "interval": "",
"legendFormat": "2.4 GHz", "legendFormat": "{{wlan}}",
"refId": "A" "refId": "A"
},
{
"expr": "gateway_wlan2_current_connections",
"interval": "",
"legendFormat": "5 GHz",
"refId": "B"
} }
], ],
"thresholds": [], "thresholds": [],
@ -1674,7 +1668,8 @@
"yaxes": [ "yaxes": [
{ {
"$$hashKey": "object:167", "$$hashKey": "object:167",
"format": "short", "decimals": 0,
"format": "none",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
"max": null, "max": null,
@ -1730,12 +1725,12 @@
"id": 18, "id": 18,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": true,
"current": true, "current": false,
"max": false, "max": true,
"min": false, "min": true,
"rightSide": false, "rightSide": false,
"show": false, "show": true,
"total": false, "total": false,
"values": true "values": true
}, },
@ -1747,7 +1742,7 @@
"alertThreshold": false "alertThreshold": false
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1761,7 +1756,7 @@
{ {
"alias": "downstream", "alias": "downstream",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_layer1_downstream_max_bitrate", "expr": "gateway_connection_max_bitrate{direction=\"Down\"}",
"fields": [ "fields": [
{ {
"func": "mean", "func": "mean",
@ -1784,7 +1779,7 @@
], ],
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"legendFormat": "Max. Downstream", "legendFormat": "Limit",
"measurement": "fritzbox_value", "measurement": "fritzbox_value",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
@ -1817,7 +1812,7 @@
{ {
"alias": "upstream", "alias": "upstream",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_bytes_receive_rate*8", "expr": "gateway_traffic_rate{direction=\"Received\"}*8",
"fields": [ "fields": [
{ {
"func": "mean", "func": "mean",
@ -1840,7 +1835,7 @@
], ],
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"legendFormat": "Download", "legendFormat": "Used",
"measurement": "fritzbox_value", "measurement": "fritzbox_value",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
@ -1875,7 +1870,7 @@
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Download Bandwith Usage", "title": "Download Bandwith",
"tooltip": { "tooltip": {
"msResolution": false, "msResolution": false,
"query_as_alias": true, "query_as_alias": true,
@ -1955,7 +1950,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -2048,12 +2043,13 @@
"id": 27, "id": 27,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": true,
"current": true, "current": false,
"max": false, "max": true,
"min": false, "min": true,
"rightSide": false, "rightSide": false,
"show": false, "show": true,
"sideWidth": null,
"total": false, "total": false,
"values": true "values": true
}, },
@ -2065,7 +2061,7 @@
"alertThreshold": false "alertThreshold": false
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -2079,7 +2075,7 @@
{ {
"alias": "downstream max", "alias": "downstream max",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_layer1_upstream_max_bitrate", "expr": "gateway_connection_max_bitrate{direction=\"Up\"}",
"fields": [ "fields": [
{ {
"func": "mean", "func": "mean",
@ -2102,7 +2098,7 @@
], ],
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"legendFormat": "Upstream", "legendFormat": "Limit",
"measurement": "fritzbox_value", "measurement": "fritzbox_value",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
@ -2135,7 +2131,7 @@
{ {
"alias": "upstream max", "alias": "upstream max",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_bytes_send_rate*8", "expr": "gateway_traffic_rate{direction=\"Sent\"}*8",
"fields": [ "fields": [
{ {
"func": "mean", "func": "mean",
@ -2158,7 +2154,7 @@
], ],
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"legendFormat": "Upload", "legendFormat": "Used",
"measurement": "fritzbox_value", "measurement": "fritzbox_value",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
@ -2193,7 +2189,7 @@
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Upload Bandwith Usage", "title": "Upload Bandwith",
"tooltip": { "tooltip": {
"msResolution": false, "msResolution": false,
"query_as_alias": true, "query_as_alias": true,
@ -2390,7 +2386,7 @@
} }
] ]
}, },
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"targets": [ "targets": [
{ {
"expr": "gateway_host_active", "expr": "gateway_host_active",
@ -2488,7 +2484,7 @@
"hiddenSeries": false, "hiddenSeries": false,
"hideTimeOverride": false, "hideTimeOverride": false,
"id": 2, "id": 2,
"interval": "10s", "interval": "1h",
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -2505,13 +2501,12 @@
"lines": false, "lines": false,
"linewidth": 1, "linewidth": 1,
"links": [], "links": [],
"maxDataPoints": 12,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": false "alertThreshold": false
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.3.6",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -2523,7 +2518,7 @@
{ {
"alias": "Download", "alias": "Download",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{direction=\"Received\",unit=\"Bytes\"}", "expr": "increase(gateway_traffic{direction=\"Received\",unit=\"Bytes\", interface=\"WAN\"}[$__interval])",
"format": "time_series", "format": "time_series",
"groupBy": [ "groupBy": [
{ {
@ -2576,7 +2571,7 @@
{ {
"alias": "Upload", "alias": "Upload",
"dsType": "prometheus", "dsType": "prometheus",
"expr": "gateway_wan_traffic{direction=\"Sent\",unit=\"Bytes\"}", "expr": "increase(gateway_traffic{direction=\"Sent\",unit=\"Bytes\", interface=\"WAN\"}[$__interval])",
"groupBy": [ "groupBy": [
{ {
"params": [ "params": [
@ -2626,10 +2621,10 @@
} }
], ],
"thresholds": [], "thresholds": [],
"timeFrom": "24h", "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Daily Traffic", "title": "Hourly Traffic",
"tooltip": { "tooltip": {
"shared": true, "shared": true,
"sort": 0, "sort": 0,
@ -2678,7 +2673,7 @@
"list": [] "list": []
}, },
"time": { "time": {
"from": "now-6h", "from": "now-2d",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {
@ -2709,5 +2704,5 @@
"timezone": "", "timezone": "",
"title": "FRITZ!Box Status", "title": "FRITZ!Box Status",
"uid": "000000013", "uid": "000000013",
"version": 26 "version": 29
} }
Loading…
Cancel
Save