From f481e7b938209a28e5e85f0d99413fb25f435ecc Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Wed, 16 Nov 2022 08:42:36 -0800 Subject: [PATCH] Update blocky dashboards --- .../dashboards/default/blocky-query.json | 472 ++++++++---------- .../dashboards/default/blocky.json | 375 ++++++-------- 2 files changed, 348 insertions(+), 499 deletions(-) diff --git a/core/metrics/grafana/provisioning/dashboards/default/blocky-query.json b/core/metrics/grafana/provisioning/dashboards/default/blocky-query.json index f21dfa6..cd78fe1 100644 --- a/core/metrics/grafana/provisioning/dashboards/default/blocky-query.json +++ b/core/metrics/grafana/provisioning/dashboards/default/blocky-query.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -20,21 +23,17 @@ }, "description": "Query report for blocky (MySQL)", "editable": true, + "fiscalYearStartMonth": 0, "gnetId": 14980, "graphTooltip": 0, - "id": 9, - "iteration": 1668211080361, "links": [], + "liveNow": false, "panels": [ { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" }, - "datasource": "Blocky logs", "description": "", "fieldConfig": { "defaults": { @@ -48,14 +47,12 @@ "viz": false } }, - "displayName": "${__field.labels.response_type}", + "decimals": 0, "mappings": [], "unit": "short" }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 8, "w": 6, @@ -63,20 +60,38 @@ "y": 0 }, "id": 14, - "interval": null, - "legend": { - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], - "nullPointMode": "connected", - "pieType": "pie", + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "values": [ + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "pluginVersion": "8.1.2", "repeatDirection": "v", - "strokeWidth": 1, "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -103,22 +118,15 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Query count by response type", "transformations": [], - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" }, - "datasource": "Blocky logs", "fieldConfig": { "defaults": { "color": { @@ -131,12 +139,12 @@ "viz": false } }, - "mappings": [] + "decimals": 0, + "mappings": [], + "unit": "short" }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 8, "w": 6, @@ -144,18 +152,36 @@ "y": 0 }, "id": 16, - "interval": null, - "legend": { - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "values": [ + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -185,22 +211,19 @@ } ], "title": "Blocked by Blacklist", - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "cacheTimeout": null, - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": { - "align": null, - "filterable": false - }, "displayName": "$__cell_1", "mappings": [], "thresholds": { @@ -223,10 +246,11 @@ "y": 0 }, "id": 13, - "interval": null, "links": [], "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -238,10 +262,14 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "repeatDirection": "v", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "table", "group": [], "metricColumn": "f", @@ -268,35 +296,21 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Query count by client", "transformations": [], "type": "bargauge" }, { - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "description": "Top 20 effective top level domain plus one more label", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": { - "align": null, - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMin": 0, - "fillOpacity": 67, - "filterable": false, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineWidth": 2 - }, "displayName": "$__cell_0", "mappings": [], "thresholds": { @@ -321,6 +335,8 @@ "id": 11, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -331,9 +347,13 @@ }, "showUnfilled": true }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "table", "group": [], "hide": false, @@ -356,34 +376,20 @@ "where": [] } ], - "timeFrom": null, - "timeShift": null, "title": "Top 20 effective TLD+1", "type": "bargauge" }, { - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": { - "align": null, - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMin": 0, - "fillOpacity": 67, - "filterable": false, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineWidth": 2 - }, "displayName": "$__cell_0", "mappings": [], "thresholds": { @@ -408,6 +414,8 @@ "id": 8, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -418,9 +426,13 @@ }, "showUnfilled": true }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "table", "group": [], "hide": false, @@ -443,17 +455,14 @@ "where": [] } ], - "timeFrom": null, - "timeShift": null, "title": "Top 20 queried domains", "type": "bargauge" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "description": "", "fieldConfig": { "defaults": { @@ -461,30 +470,27 @@ "mode": "palette-classic" }, "custom": { - "align": null, - "axisLabel": "queries count", + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", - "fillOpacity": 35, - "filterable": false, - "gradientMode": "hue", + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, "lineWidth": 1, - "pointSize": 12, + "pointSize": 5, "scaleDistribution": { "type": "linear" }, "showPoints": "never", - "spanNulls": 3600000, + "spanNulls": false, "stacking": { "group": "A", "mode": "none" @@ -506,46 +512,37 @@ "value": 80 } ] - } + }, + "unit": "short" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 24, "x": 0, "y": 16 }, - "hiddenSeries": false, "id": 12, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.3.6", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "9.2.4", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -574,87 +571,47 @@ ] } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Queries number per client (30m)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "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 - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "barAlignment": -1, - "drawStyle": "bars", - "fillOpacity": 0, + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "stepBefore", - "lineStyle": { - "fill": "solid" - }, + "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", - "spanNulls": true, + "showPoints": "never", + "spanNulls": false, "stacking": { "group": "A", "mode": "none" }, "thresholdsStyle": { - "mode": "line" + "mode": "off" } }, "mappings": [], @@ -664,6 +621,10 @@ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] }, @@ -671,42 +632,32 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 8, "w": 24, "x": 0, "y": 23 }, - "hiddenSeries": false, "id": 10, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.3.6", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "9.2.4", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -735,56 +686,21 @@ ] } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Query duration", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "dtdurationms", - "label": null, - "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 - } + "type": "timeseries" }, { - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "description": "Last 100 queries, newest on top", "fieldConfig": { "defaults": { "custom": { - "align": null, "displayMode": "auto", - "filterable": false + "filterable": false, + "inspect": false }, "mappings": [], "thresholds": { @@ -820,11 +736,22 @@ }, "id": 4, "options": { + "footer": { + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, "showHeader": true }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "format": "table", "group": [], "metricColumn": "none", @@ -851,14 +778,12 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Last queries", "type": "table" } ], "refresh": "", - "schemaVersion": 26, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { @@ -870,10 +795,11 @@ "text": "All", "value": "$__all" }, - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "definition": "select distinct client_name from log_entries", - "description": null, - "error": null, "hide": 0, "includeAll": true, "label": "Client name", @@ -886,16 +812,13 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": { "selected": true, - "tags": [], "text": [ "All" ], @@ -903,10 +826,11 @@ "$__all" ] }, - "datasource": "Blocky logs", + "datasource": { + "type": "mysql", + "uid": "DN2DNsD4z" + }, "definition": "select distinct response_type from log_entries", - "description": null, - "error": null, "hide": 0, "includeAll": true, "label": "Response type", @@ -919,7 +843,6 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -930,8 +853,6 @@ "text": "", "value": "" }, - "description": null, - "error": null, "hide": 0, "label": "Domain (contains)", "name": "question", @@ -956,5 +877,6 @@ "timezone": "", "title": "Blocky query", "uid": "AVmWSVWgz", - "version": 11 + "version": 1, + "weekStart": "" } diff --git a/core/metrics/grafana/provisioning/dashboards/default/blocky.json b/core/metrics/grafana/provisioning/dashboards/default/blocky.json index 7017115..14f212e 100644 --- a/core/metrics/grafana/provisioning/dashboards/default/blocky.json +++ b/core/metrics/grafana/provisioning/dashboards/default/blocky.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -19,10 +22,9 @@ ] }, "editable": true, + "fiscalYearStartMonth": 0, "gnetId": 13768, "graphTooltip": 0, - "id": 8, - "iteration": 1668206111766, "links": [ { "icon": "external link", @@ -33,13 +35,16 @@ "url": "https://github.com/0xERR0R/blocky" } ], + "liveNow": false, "panels": [ { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "current service state", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [ { "options": { @@ -91,7 +96,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -112,11 +117,13 @@ "type": "stat" }, { - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "description": "Is blocking enabled?", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [ { "options": { @@ -174,7 +181,7 @@ }, "textMode": "value" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -199,12 +206,6 @@ "uid": "Prometheus" }, "description": "Enable Ad disable blocking", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "gridPos": { "h": 5, "w": 12, @@ -213,20 +214,35 @@ }, "id": 42, "options": { + "code": { + "language": "plaintext", + "showLineNumbers": false, + "showMiniMap": false + }, "content": "\n
\n ×Done!\n
\n
\n \n \n \n
\n\n\n", "mode": "html" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", + "targets": [ + { + "datasource": { + "uid": "Prometheus" + }, + "refId": "A" + } + ], "title": "Blocking status", "transparent": true, "type": "text" }, { - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "description": "Blocky [version](https://github.com/0xERR0R/blocky) number", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -265,7 +281,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "repeatDirection": "v", "targets": [ { @@ -288,6 +304,10 @@ "id": "labelsToFields", "options": {} }, + { + "id": "merge", + "options": {} + }, { "id": "merge", "options": {} @@ -297,11 +317,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Average query response time for all query types", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [ { "options": { @@ -353,7 +375,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -374,11 +396,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Number of blacklist entries", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [ { "options": { @@ -426,7 +450,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -447,10 +471,12 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "fieldConfig": { "defaults": { - "custom": {}, "decimals": 2, "mappings": [ { @@ -499,7 +525,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -520,11 +546,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Percentage of blocked queries", "fieldConfig": { "defaults": { - "custom": {}, "decimals": 2, "mappings": [ { @@ -579,7 +607,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -600,11 +628,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Number of all queries. Shows the last value", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [ { "options": { @@ -653,7 +683,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -674,11 +704,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Number of entries in the cache. Shows the last value", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -713,7 +745,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -734,14 +766,16 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Cache Hit/Miss ratio. 100 % means, all queries could be answered from the cache, 0% - all queries must be resolved via external DNS", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [], "max": 1, "min": 0, @@ -779,7 +813,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -800,11 +834,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Number of occured errors", "fieldConfig": { "defaults": { - "custom": {}, "decimals": 0, "mappings": [ { @@ -860,7 +896,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -881,11 +917,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Amount of performed DNS queries to prefetch cached queries", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -920,7 +958,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -940,11 +978,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Amount of prefetch queries per minute", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -983,7 +1023,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -1003,14 +1043,16 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "How many of cached entries were prefetched automatically", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [], "max": 1, "min": 0, @@ -1048,7 +1090,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -1069,11 +1111,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Time since last list refresh", "fieldConfig": { "defaults": { - "custom": {}, "decimals": 0, "mappings": [], "thresholds": { @@ -1110,7 +1154,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -1131,11 +1175,13 @@ "type": "stat" }, { - "datasource": "Prometheus", + "datasource": { + "type": "prometheus", + "uid": "rS2OIfv4z" + }, "description": "Amount of unique domains in the prefetched cache", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -1170,7 +1216,7 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "targets": [ { "datasource": { @@ -1194,55 +1240,13 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "avg requests / min", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, "unit": "short" }, "overrides": [] @@ -1273,7 +1277,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1297,9 +1301,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Request rate", "tooltip": { "shared": true, @@ -1309,33 +1311,24 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "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 + "align": false } }, { @@ -1343,55 +1336,13 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "avg requests / min", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "bars", - "fillOpacity": 100, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, "unit": "short" }, "overrides": [] @@ -1422,7 +1373,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.6", + "pluginVersion": "9.2.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1446,9 +1397,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Request rate per client", "tooltip": { "shared": true, @@ -1458,40 +1407,28 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "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 + "align": false } }, { - "cards": { - "cardPadding": null, - "cardRound": null - }, + "cards": {}, "color": { "cardColor": "#FADE2A", "colorScale": "sqrt", @@ -1500,7 +1437,10 @@ "mode": "opacity" }, "dataFormat": "tsbuckets", - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "custom": {} @@ -1546,30 +1486,24 @@ "xAxis": { "show": true }, - "xBucketNumber": null, - "xBucketSize": null, "yAxis": { - "decimals": null, "format": "ms", "logBase": 1, - "max": null, - "min": null, - "show": true, - "splitFactor": null + "show": true }, - "yBucketBound": "auto", - "yBucketNumber": null, - "yBucketSize": null + "yBucketBound": "auto" }, { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1597,7 +1531,6 @@ "y": 38 }, "id": 2, - "interval": null, "legend": { "show": true, "values": true @@ -1632,12 +1565,14 @@ { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1665,7 +1600,6 @@ "y": 38 }, "id": 8, - "interval": null, "legend": { "show": true, "values": true @@ -1700,12 +1634,14 @@ { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1733,7 +1669,6 @@ "y": 46 }, "id": 32, - "interval": null, "legend": { "show": true, "values": true @@ -1768,12 +1703,14 @@ { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1801,7 +1738,6 @@ "y": 46 }, "id": 14, - "interval": null, "legend": { "show": true, "values": true @@ -1835,12 +1771,14 @@ { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1902,12 +1840,14 @@ { "aliasColors": {}, "breakPoint": "50%", - "cacheTimeout": null, "combine": { "label": "Others", "threshold": 0 }, - "datasource": null, + "datasource": { + "type": "prometheus", + "uid": "Prometheus" + }, "fieldConfig": { "defaults": { "color": { @@ -1935,7 +1875,6 @@ "y": 54 }, "id": 12, - "interval": null, "legend": { "show": true, "values": true @@ -1968,28 +1907,15 @@ } ], "refresh": false, - "schemaVersion": 26, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { "list": [ { - "current": { - "selected": false, - "text": "https://blocky-api.thefij.rocks/", - "value": "https://blocky-api.thefij.rocks/" - }, - "error": null, "hide": 2, "label": "blocky API URL", "name": "blocky_url", - "options": [ - { - "selected": false, - "text": "https://blocky-api.thefij.rocks/", - "value": "https://blocky-api.thefij.rocks/" - } - ], "query": "https://blocky-api.thefij.rocks/", "skipUrlSync": false, "type": "constant" @@ -2015,7 +1941,8 @@ ] }, "timezone": "", - "title": "blocky", + "title": "Blocky", "uid": "JvOqE4gRk", - "version": 3 + "version": 1, + "weekStart": "" }