From 765bc45c494d55ab62b5ca971fac864b7015c6e7 Mon Sep 17 00:00:00 2001 From: tiny6996 Date: Tue, 19 May 2020 23:31:24 -0500 Subject: [PATCH] updated fields to match tail names --- pfSense-Grafana-Dashboard.json | 1966 +++++++++++++++++++------------- 1 file changed, 1189 insertions(+), 777 deletions(-) diff --git a/pfSense-Grafana-Dashboard.json b/pfSense-Grafana-Dashboard.json index 7a49887..3a99859 100755 --- a/pfSense-Grafana-Dashboard.json +++ b/pfSense-Grafana-Dashboard.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 0, "id": 7, - "iteration": 1589857465930, + "iteration": 1589949008186, "links": [], "panels": [ { @@ -45,6 +45,12 @@ "datasource": "$dataSource", "decimals": null, "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -141,6 +147,34 @@ }, { "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {}, + "displayName": "CPU", + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 70 + }, + { + "color": "red", + "value": 85 + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, "gridPos": { "h": 6, "w": 2, @@ -149,42 +183,17 @@ }, "id": 8, "options": { - "fieldOptions": { + "orientation": "auto", + "reduceOptions": { "calcs": [ "last" ], - "defaults": { - "mappings": [], - "max": 100, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "#EAB839", - "value": 70 - }, - { - "color": "red", - "value": 85 - } - ] - }, - "title": "CPU", - "unit": "percent" - }, - "overrides": [], "values": false }, - "orientation": "auto", "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "6.7.3", + "pluginVersion": "7.0.0", "targets": [ { "alias": "CPU Total", @@ -247,21 +256,814 @@ "title": "CPU Total", "type": "gauge" }, + { + "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {}, + "decimals": 2, + "displayName": "Load", + "mappings": [], + "max": 2.5, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 1 + }, + { + "color": "red", + "value": 1.5 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 4, + "y": 1 + }, + "id": 10, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "7.0.0", + "targets": [ + { + "alias": "Load", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "system", + "orderByTime": "ASC", + "policy": "autogen", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "load1" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "System Load", + "type": "gauge" + }, + { + "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {}, + "displayName": "Ram", + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "#EAB839", + "value": 75 + }, + { + "color": "red", + "value": 85 + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 6, + "y": 1 + }, + "id": 12, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "7.0.0", + "targets": [ + { + "alias": "Ram", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "mem", + "orderByTime": "ASC", + "policy": "autogen", + "query": "SELECT mean(\"value\") FROM \"measurement\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "used_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Memory Utilization", + "type": "gauge" + }, + { + "cacheTimeout": null, + "datasource": "$dataSource", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {}, + "displayName": "${__series.name}", + "mappings": [], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 60 + }, + { + "color": "#d44a3a", + "value": 85 + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 4, + "x": 8, + "y": 1 + }, + "id": 223, + "links": [], + "options": { + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "7.0.0", + "repeatDirection": "h", + "targets": [ + { + "alias": "$tag_device", + "groupBy": [ + { + "params": [ + "device" + ], + "type": "tag" + } + ], + "measurement": "disk", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT \"used_percent\" FROM \"disk\" WHERE (\"host\" =~ /^$Host$/ AND \"path\" = '/var/run' AND \"device\" =~ /^$Disk$/) AND $timeFilter GROUP BY \"device\"", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "used_percent" + ], + "type": "field" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + }, + { + "condition": "AND", + "key": "device", + "operator": "!=", + "value": "devfs" + } + ] + } + ], + "title": "Disk Utilization", + "type": "gauge" + }, + { + "columns": [], + "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fontSize": "100%", + "gridPos": { + "h": 3, + "w": 5, + "x": 12, + "y": 1 + }, + "id": 220, + "pageSize": null, + "showHeader": true, + "sort": { + "col": 6, + "desc": false + }, + "styles": [ + { + "alias": "Time", + "align": "auto", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "align": "right", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 0, + "pattern": "/.*/", + "thresholds": [], + "type": "number", + "unit": "locale" + } + ], + "targets": [ + { + "groupBy": [], + "measurement": "pf", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "match" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "Match" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "state-mismatch" + ], + "type": "field" + }, + { + "params": [ + "State Mismatch" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "state-insert" + ], + "type": "field" + }, + { + "params": [ + "State Insert" + ], + "type": "alias" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PF Information", + "transform": "table", + "type": "table-old" + }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 6, - "w": 6, - "x": 4, + "w": 7, + "x": 17, "y": 1 }, "hiddenSeries": false, + "id": 18, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "Load", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], + "measurement": "system", + "orderByTime": "ASC", + "policy": "autogen", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "load1" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Load", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 1, + "format": "none", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "$dataSource", + "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 0, + "y": 4 + }, + "hideTimeOverride": true, + "id": 45, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false + }, + "tableColumn": "", + "targets": [ + { + "alias": "Load 15m", + "groupBy": [], + "measurement": "system", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "uptime_format" + ], + "type": "field" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "thresholds": ".7,1.5", + "timeFrom": "30s", + "title": "Uptime", + "type": "singlestat", + "valueFontSize": "50%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "columns": [], + "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fontSize": "100%", + "gridPos": { + "h": 3, + "w": 5, + "x": 12, + "y": 4 + }, + "id": 219, + "pageSize": null, + "showHeader": true, + "sort": { + "col": 6, + "desc": false + }, + "styles": [ + { + "alias": "Time", + "align": "auto", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "align": "right", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 0, + "pattern": "/.*/", + "thresholds": [], + "type": "number", + "unit": "short" + } + ], + "targets": [ + { + "groupBy": [], + "measurement": "processes", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "running" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "Running" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "idle" + ], + "type": "field" + } + ], + [ + { + "params": [ + "sleeping" + ], + "type": "field" + } + ], + [ + { + "params": [ + "wait" + ], + "type": "field" + } + ], + [ + { + "params": [ + "blocked" + ], + "type": "field" + } + ], + [ + { + "params": [ + "zombies" + ], + "type": "field" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Process Information", + "transform": "table", + "type": "table-old" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 8, + "x": 0, + "y": 7 + }, + "hiddenSeries": false, "id": 6, "legend": { "alignAsTable": true, @@ -394,537 +1196,24 @@ "alignLevel": null } }, - { - "datasource": "pfsense", - "gridPos": { - "h": 6, - "w": 2, - "x": 10, - "y": 1 - }, - "id": 10, - "options": { - "fieldOptions": { - "calcs": [ - "last" - ], - "defaults": { - "decimals": 2, - "mappings": [], - "max": 2.5, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "#EAB839", - "value": 1 - }, - { - "color": "red", - "value": 1.5 - } - ] - }, - "title": "Load" - }, - "overrides": [], - "values": false - }, - "orientation": "auto", - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "6.7.3", - "targets": [ - { - "alias": "Load", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "previous" - ], - "type": "fill" - } - ], - "measurement": "system", - "orderByTime": "ASC", - "policy": "autogen", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "load1" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$Host$/" - } - ] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "", - "type": "gauge" - }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 6, "w": 6, - "x": 12, - "y": 1 - }, - "hiddenSeries": false, - "id": 18, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Load", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "previous" - ], - "type": "fill" - } - ], - "measurement": "system", - "orderByTime": "ASC", - "policy": "autogen", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "load1" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$Host$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Load", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 1, - "format": "none", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "$dataSource", - "decimals": null, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 0, - "y": 4 - }, - "hideTimeOverride": true, - "id": 45, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "alias": "Load 15m", - "groupBy": [], - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "table", - "select": [ - [ - { - "params": [ - "uptime_format" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$Host$/" - } - ] - } - ], - "thresholds": ".7,1.5", - "timeFrom": "30s", - "title": "Uptime", - "type": "singlestat", - "valueFontSize": "50%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "datasource": "$dataSource", - "description": "", - "gridPos": { - "h": 6, - "w": 2, - "x": 0, - "y": 7 - }, - "id": 47, - "links": [], - "options": { - "fieldOptions": { - "calcs": [ - "lastNotNull" - ], - "defaults": { - "mappings": [], - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 50 - }, - { - "color": "#d44a3a", - "value": 80 - } - ] - }, - "title": "${__series.name}", - "unit": "percent" - }, - "overrides": [], - "values": false - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "6.7.3", - "repeat": null, - "repeatDirection": "h", - "targets": [ - { - "alias": "$tag_device", - "groupBy": [ - { - "params": [ - "device" - ], - "type": "tag" - } - ], - "measurement": "disk", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT \"used_percent\" FROM \"disk\" WHERE (\"host\" =~ /^$Host$/ AND \"path\" = '/var/run' AND \"device\" =~ /^$Disk$/) AND $timeFilter GROUP BY \"device\"", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$Host$/" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/var/run" - } - ] - } - ], - "title": "Disk Utilization", - "type": "gauge" - }, - { - "datasource": "pfsense", - "gridPos": { - "h": 6, - "w": 2, - "x": 2, - "y": 7 - }, - "id": 12, - "options": { - "fieldOptions": { - "calcs": [ - "last" - ], - "defaults": { - "mappings": [], - "max": 100, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "#EAB839", - "value": 75 - }, - { - "color": "red", - "value": 85 - } - ] - }, - "title": "Ram", - "unit": "percent" - }, - "overrides": [], - "values": false - }, - "orientation": "auto", - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "6.7.3", - "targets": [ - { - "alias": "Ram", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "previous" - ], - "type": "fill" - } - ], - "measurement": "mem", - "orderByTime": "ASC", - "policy": "autogen", - "query": "SELECT mean(\"value\") FROM \"measurement\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$Host$/" - } - ] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Memory Utilization", - "type": "gauge" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "pfsense", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 4, + "x": 8, "y": 7 }, "hiddenSeries": false, @@ -935,7 +1224,7 @@ "current": true, "max": false, "min": false, - "rightSide": false, + "rightSide": true, "show": true, "total": false, "values": true @@ -1046,12 +1335,18 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 6, - "w": 8, - "x": 10, + "w": 10, + "x": 14, "y": 7 }, "hiddenSeries": false, @@ -1205,6 +1500,12 @@ "decimals": 0, "description": "https://www.reddit.com/r/pfBlockerNG/comments/bu0ms0/pfblockerngtelegrafinfluxdb_ip_block_list/", "esMetric": "Count", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 9, "w": 7, @@ -1232,7 +1533,7 @@ }, "targets": [ { - "alias": "[[tag_country-code]]", + "alias": "$tag_GeoIP", "groupBy": [ { "params": [ @@ -1242,7 +1543,7 @@ }, { "params": [ - "country-code" + "GeoIP" ], "type": "tag" } @@ -1258,7 +1559,7 @@ [ { "params": [ - "code" + "action" ], "type": "field" }, @@ -1288,21 +1589,36 @@ }, { "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], "datasource": "pfsense", - "format": "locale", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "locale" + }, + "overrides": [] }, "gridPos": { "h": 3, @@ -1313,40 +1629,25 @@ "id": 27, "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "values": false } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false, - "ymax": null, - "ymin": null }, - "tableColumn": "", + "pluginVersion": "7.0.0", "targets": [ { "groupBy": [], @@ -1361,7 +1662,7 @@ [ { "params": [ - "filter-type" + "hitormiss" ], "type": "field" }, @@ -1380,20 +1681,10 @@ ] } ], - "thresholds": "", "timeFrom": null, "timeShift": null, "title": "pfBlocker - DNS - Total Domains Blocked", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { "aliasColors": {}, @@ -1405,14 +1696,108 @@ }, "datasource": "pfsense", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "80%", "format": "locale", "gridPos": { "h": 9, - "w": 8, + "w": 5, "x": 10, "y": 14 }, + "id": 234, + "interval": null, + "legend": { + "percentage": true, + "percentageDecimals": 2, + "show": true, + "sideWidth": null, + "sort": "total", + "sortDesc": true, + "values": true + }, + "legendType": "Right side", + "links": [], + "maxDataPoints": 3, + "nullPointMode": "connected", + "pieType": "pie", + "strokeWidth": ".5", + "targets": [ + { + "alias": "[[tag_source]]", + "groupBy": [ + { + "params": [ + "source" + ], + "type": "tag" + } + ], + "measurement": "tail_dnsbl", + "orderByTime": "ASC", + "policy": "autogen", + "query": "SELECT count(\"hitormiss\") FROM \"autogen\".\"dnsbl_log\" WHERE (\"host\" =~ /^$Host$/) AND $timeFilter GROUP BY \"destination\"", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "hitormiss" + ], + "type": "field" + }, + { + "params": [], + "type": "count" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$Host$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "pfBlocker - DNS - Internal hosts - Blocked Queries", + "type": "grafana-piechart-panel", + "valueName": "total" + }, + { + "aliasColors": {}, + "breakPoint": "50%", + "cacheTimeout": null, + "combine": { + "label": "Others", + "threshold": 0 + }, + "datasource": "pfsense", + "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fontSize": "80%", + "format": "locale", + "gridPos": { + "h": 9, + "w": 9, + "x": 15, + "y": 14 + }, "id": 160, "interval": null, "legend": { @@ -1432,11 +1817,11 @@ "strokeWidth": ".5", "targets": [ { - "alias": "[[tag_domain]]", + "alias": "[[tag_destination]]", "groupBy": [ { "params": [ - "domain" + "destination" ], "type": "tag" } @@ -1452,7 +1837,7 @@ [ { "params": [ - "block-list" + "hitormiss" ], "type": "field" }, @@ -1479,22 +1864,37 @@ }, { "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], "datasource": "pfsense", - "decimals": 0, - "format": "locale", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "custom": {}, + "decimals": 0, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "locale" + }, + "overrides": [] }, "gridPos": { "h": 3, @@ -1505,40 +1905,25 @@ "id": 162, "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "values": false } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null }, - "tableColumn": "", + "pluginVersion": "7.0.0", "targets": [ { "groupBy": [], @@ -1572,20 +1957,10 @@ ] } ], - "thresholds": "", "timeFrom": null, "timeShift": null, "title": "pfBlocker - IP - Total IPs Blocked", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { "collapsed": false, @@ -1608,11 +1983,17 @@ "dashes": false, "datasource": "pfsense", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 8, - "w": 9, + "w": 15, "x": 0, "y": 24 }, @@ -1624,7 +2005,7 @@ "current": true, "max": true, "min": true, - "rightSide": false, + "rightSide": true, "show": true, "sideWidth": null, "total": false, @@ -1725,7 +2106,7 @@ { "format": "µs", "label": "", - "logBase": 1, + "logBase": 2, "max": null, "min": null, "show": true @@ -1749,11 +2130,17 @@ "columns": [], "datasource": "pfsense", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 8, "w": 9, - "x": 9, + "x": 15, "y": 24 }, "id": 194, @@ -1763,7 +2150,7 @@ "scroll": true, "showHeader": true, "sort": { - "col": 1, + "col": 2, "desc": false }, "styles": [ @@ -1913,7 +2300,7 @@ "timeShift": null, "title": "Interface summary", "transform": "table", - "type": "table" + "type": "table-old" }, { "collapsed": false, @@ -1943,11 +2330,17 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 8, - "w": 9, + "w": 12, "x": 0, "y": 33 }, @@ -2156,12 +2549,18 @@ "dashes": false, "datasource": "$dataSource", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "gridPos": { "h": 8, - "w": 9, - "x": 9, + "w": 12, + "x": 12, "y": 33 }, "hiddenSeries": false, @@ -2358,7 +2757,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -2398,7 +2797,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -2480,11 +2879,17 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, + "w": 12, "x": 0, "y": 42 }, @@ -2713,12 +3118,18 @@ "dashes": false, "datasource": "$dataSource", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, - "x": 9, + "w": 12, + "x": 12, "y": 42 }, "hiddenSeries": false, @@ -2952,7 +3363,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -2999,7 +3410,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -3067,16 +3478,22 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, + "w": 12, "x": 0, "y": 49 }, "hiddenSeries": false, - "id": 208, + "id": 235, "legend": { "alignAsTable": true, "avg": true, @@ -3100,7 +3517,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 38, "scopedVars": { "LAN_Interfaces": { @@ -3302,16 +3719,22 @@ "dashes": false, "datasource": "$dataSource", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, - "x": 9, + "w": 12, + "x": 12, "y": 49 }, "hiddenSeries": false, - "id": 211, + "id": 238, "legend": { "alignAsTable": true, "avg": true, @@ -3338,7 +3761,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 39, "scopedVars": { "LAN_Interfaces": { @@ -3543,7 +3966,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -3590,7 +4013,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -3658,16 +4081,22 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, + "w": 12, "x": 0, "y": 56 }, "hiddenSeries": false, - "id": 209, + "id": 236, "legend": { "alignAsTable": true, "avg": true, @@ -3691,7 +4120,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 38, "scopedVars": { "LAN_Interfaces": { @@ -3893,16 +4322,22 @@ "dashes": false, "datasource": "$dataSource", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, - "x": 9, + "w": 12, + "x": 12, "y": 56 }, "hiddenSeries": false, - "id": 212, + "id": 239, "legend": { "alignAsTable": true, "avg": true, @@ -3929,7 +4364,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 39, "scopedVars": { "LAN_Interfaces": { @@ -4134,7 +4569,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -4181,7 +4616,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -4249,16 +4684,22 @@ "dashLength": 10, "dashes": false, "datasource": "pfsense", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, + "w": 12, "x": 0, "y": 63 }, "hiddenSeries": false, - "id": 210, + "id": 237, "legend": { "alignAsTable": true, "avg": true, @@ -4282,7 +4723,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 38, "scopedVars": { "LAN_Interfaces": { @@ -4484,16 +4925,22 @@ "dashes": false, "datasource": "$dataSource", "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "gridPos": { "h": 7, - "w": 9, - "x": 9, + "w": 12, + "x": 12, "y": 63 }, "hiddenSeries": false, - "id": 213, + "id": 240, "legend": { "alignAsTable": true, "avg": true, @@ -4520,7 +4967,7 @@ "renderer": "flot", "repeat": null, "repeatDirection": "v", - "repeatIteration": 1589857465930, + "repeatIteration": 1589949008186, "repeatPanelId": 39, "scopedVars": { "LAN_Interfaces": { @@ -4725,7 +5172,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -4772,7 +5219,7 @@ }, { "params": [ - "10s" + "1s" ], "type": "derivative" } @@ -4835,8 +5282,8 @@ } } ], - "refresh": false, - "schemaVersion": 22, + "refresh": "30m", + "schemaVersion": 25, "style": "dark", "tags": [ "pfsense", @@ -4858,6 +5305,7 @@ "name": "dataSource", "options": [], "query": "influxdb", + "queryValue": "", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -4866,6 +5314,7 @@ { "allValue": null, "current": { + "selected": false, "text": "rose.local.mathiasp.me", "value": "rose.local.mathiasp.me" }, @@ -4873,7 +5322,6 @@ "definition": "SHOW TAG VALUES FROM \"pf\" WITH KEY = \"host\"", "hide": 0, "includeAll": false, - "index": -1, "label": "pfSense", "multi": false, "name": "Host", @@ -4897,15 +5345,14 @@ "value": "$__all" }, "datasource": "$dataSource", - "definition": "SHOW TAG VALUES FROM \"diskio\" WITH KEY = \"name\" WHERE \"host\" =~ /^$Host$/", + "definition": "SHOW TAG VALUES FROM \"disk\" WITH KEY = \"device\" WHERE \"host\" =~ /^$Host$/", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": false, "name": "Disk", "options": [], - "query": "SHOW TAG VALUES FROM \"diskio\" WITH KEY = \"name\" WHERE \"host\" =~ /^$Host$/", + "query": "SHOW TAG VALUES FROM \"disk\" WITH KEY = \"device\" WHERE \"host\" =~ /^$Host$/", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -4919,15 +5366,16 @@ { "allValue": null, "current": { - "selected": false, + "selected": true, "text": "All", - "value": "$__all" + "value": [ + "$__all" + ] }, "datasource": "$dataSource", "definition": "SHOW TAG VALUES FROM \"gateways\" WITH KEY = \"gateway_name\" WHERE \"host\" =~ /^$Host$/ ", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": true, "name": "Gateway", @@ -4946,51 +5394,20 @@ { "allValue": null, "current": { + "selected": false, "text": "vtnet1", "value": "vtnet1" }, - "datasource": "pfsense", + "datasource": "$dataSource", "definition": "SHOW TAG VALUES FROM \"net\" WITH KEY = \"interface\" WHERE \"host\" =~ /^$Host$/ ", "hide": 0, - "includeAll": true, - "index": -1, + "includeAll": false, "label": null, - "multi": true, + "multi": false, "name": "WAN", - "options": [ - { - "selected": false, - "text": "All", - "value": "$__all" - }, - { - "selected": false, - "text": "ovpns1", - "value": "ovpns1" - }, - { - "selected": false, - "text": "vtnet0", - "value": "vtnet0" - }, - { - "selected": false, - "text": "vtnet0.420", - "value": "vtnet0.420" - }, - { - "selected": false, - "text": "vtnet0.69", - "value": "vtnet0.69" - }, - { - "selected": true, - "text": "vtnet1", - "value": "vtnet1" - } - ], + "options": [], "query": "SHOW TAG VALUES FROM \"net\" WITH KEY = \"interface\" WHERE \"host\" =~ /^$Host$/ ", - "refresh": 0, + "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 0, @@ -5003,6 +5420,7 @@ { "allValue": null, "current": { + "selected": true, "text": "ovpns1 + vtnet0 + vtnet0.420 + vtnet0.69", "value": [ "ovpns1", @@ -5015,7 +5433,6 @@ "definition": "SHOW TAG VALUES FROM \"net\" WITH KEY = \"interface\" WHERE \"host\" =~ /^$Host$/ ", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": true, "name": "LAN_Interfaces", @@ -5042,7 +5459,6 @@ "definition": "SHOW TAG VALUES FROM \"cpu\" WITH KEY = \"cpu\" WHERE \"host\" =~ /^$Host$/ and cpu !~ /cpu-total/", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": true, "name": "CPU", @@ -5061,15 +5477,16 @@ { "allValue": null, "current": { - "selected": false, + "selected": true, "text": "All", - "value": "$__all" + "value": [ + "$__all" + ] }, "datasource": "$dataSource", "definition": "SHOW TAG VALUES FROM \"interface\" WITH KEY = \"name\" WHERE \"host\" =~ /^$Host$/ ", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": true, "name": "Interfaces", @@ -5096,7 +5513,6 @@ "definition": "SHOW TAG VALUES FROM \"temperature\" WITH KEY = \"sensor\" WHERE \"host\" =~ /^$Host$/", "hide": 0, "includeAll": true, - "index": -1, "label": null, "multi": true, "name": "Sensor", @@ -5115,12 +5531,11 @@ ] }, "time": { - "from": "2020-03-26T16:39:00.264Z", - "to": "2020-05-29T16:39:00.264Z" + "from": "now-15m", + "to": "now" }, "timepicker": { "refresh_intervals": [ - "5s", "10s", "30s", "1m", @@ -5135,8 +5550,5 @@ "timezone": "", "title": "pfSense System Dashboard", "uid": "t_qMZwrWk", - "variables": { - "list": [] - }, - "version": 13 + "version": 20 }