From a398516373f918792586a15953ea1bd4e75f6c9c Mon Sep 17 00:00:00 2001 From: Dimitri Herzog Date: Mon, 20 Jan 2025 21:23:09 +0100 Subject: [PATCH] fix: fix queries in Grafana dashboard (#1693) --- docs/blocky-grafana.json | 608 ++++++++++++++++++++++++--------------- 1 file changed, 377 insertions(+), 231 deletions(-) diff --git a/docs/blocky-grafana.json b/docs/blocky-grafana.json index b5b2af563..5a062bfd8 100644 --- a/docs/blocky-grafana.json +++ b/docs/blocky-grafana.json @@ -16,13 +16,13 @@ "description": "" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.3" + "version": "11.3.1" }, { "type": "panel", @@ -65,7 +65,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -84,7 +87,6 @@ "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1641070862290, "links": [ { "icon": "external link", @@ -95,9 +97,12 @@ "url": "https://github.com/0xERR0R/blocky" } ], - "liveNow": false, "panels": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "current service state", "fieldConfig": { "defaults": { @@ -136,13 +141,13 @@ "overrides": [] }, "id": 26, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "none", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -150,9 +155,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -173,6 +180,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Is blocking enabled?", "fieldConfig": { "defaults": { @@ -217,13 +228,13 @@ "y": 0 }, "id": 43, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "none", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -231,9 +242,11 @@ "fields": "", "values": false }, - "textMode": "value" + "showPercentChange": false, + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -254,9 +267,6 @@ "type": "stat" }, { - "datasource": { - "uid": "${DS_PROMETHEUS}" - }, "description": "Enable Ad disable blocking", "gridPos": { "h": 5, @@ -266,15 +276,24 @@ }, "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": "8.3.3", + "pluginVersion": "11.3.1", "title": "Blocking status", "transparent": true, "type": "text" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Blocky [version](https://github.com/0xERR0R/blocky) number", "fieldConfig": { "defaults": { @@ -307,6 +326,7 @@ "graphMode": "area", "justifyMode": "center", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -314,10 +334,11 @@ "fields": "/^version$/", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", - "repeatDirection": "v", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -349,6 +370,7 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "Average query response time for all query types", @@ -389,13 +411,13 @@ "y": 3 }, "id": 24, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -403,17 +425,20 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "(histogram_avg(rate(blocky_blocky_request_duration_seconds[$__rate_interval]))\nor\n(sum(rate(blocky_blocky_request_duration_seconds_sum[$__rate_interval])) / sum(rate(blocky_blocky_request_duration_seconds_count[$__rate_interval])))\nor\n(sum(rate(blocky_request_duration_ms_sum[$__rate_interval])) / sum(rate(blocky_request_duration_ms_count[$__rate_interval])) / 1000)", + "expr": "(sum(rate(blocky_request_duration_seconds_sum[$__rate_interval])) / sum(rate(blocky_request_duration_seconds_count[$__rate_interval])))\nor\n(sum(rate(blocky_request_duration_ms_sum[$__rate_interval])) / sum(rate(blocky_request_duration_ms_count[$__rate_interval])) / 1000)", "format": "table", "instant": false, "interval": "", @@ -427,6 +452,7 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "Number of denylist entries", @@ -463,13 +489,13 @@ "y": 5 }, "id": 30, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -477,15 +503,18 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "(sum(blocky_denylist_cache_entries) or sum(blocky_denylist_cache)) / sum(up{job=~\"$job\"})", "format": "table", @@ -501,22 +530,14 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Time since last list refresh", "fieldConfig": { "defaults": { - "decimals": 2, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], + "decimals": 0, + "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -526,24 +547,23 @@ } ] }, - "unit": "bytes" + "unit": "s" }, "overrides": [] }, "gridPos": { "h": 3, "w": 6, - "x": 6, - "y": 12 + "x": 18, + "y": 5 }, - "id": 28, - "links": [], - "maxDataPoints": 100, + "id": 57, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", - "orientation": "horizontal", + "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -551,36 +571,39 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "exemplar": true, - "expr": "sum(go_memstats_sys_bytes{job=~\"$job\"})/sum(up{job=~\"$job\"})", + "editorMode": "code", + "exemplar": false, + "expr": "sum(time() -blocky_last_list_group_refresh_timestamp_seconds)/ sum(up{job=~\"$job\"})", "format": "table", - "instant": false, + "instant": true, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "Memory allocated", + "title": "Last list refresh", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Percentage of blocked queries", + "description": "Number of all queries. Shows the last value", "fieldConfig": { "defaults": { - "decimals": 2, "mappings": [ { "options": { @@ -592,39 +615,33 @@ "type": "special" } ], - "max": 1, - "min": 0, "thresholds": { "mode": "absolute", "steps": [ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, - "unit": "percentunit" + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 3, "w": 6, - "x": 6, + "x": 0, "y": 6 }, - "id": 34, - "links": [], + "id": 4, "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -632,9 +649,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -642,7 +661,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum(rate(blocky_response_total{response_type=\"BLOCKED\"}[$__rate_interval])) / sum(rate(blocky_query_total[$__rate_interval])) ", + "expr": "ceil(sum(increase(blocky_query_total[$__range]))) ", "format": "table", "instant": false, "interval": "", @@ -650,17 +669,19 @@ "refId": "A" } ], - "title": "Queries blocked", + "title": "Query Count Total", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Number of all queries. Shows the last value", + "description": "Percentage of blocked queries", "fieldConfig": { "defaults": { + "decimals": 2, "mappings": [ { "options": { @@ -672,34 +693,39 @@ "type": "special" } ], + "max": 1, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] }, - "unit": "none" + "unit": "percentunit" }, "overrides": [] }, "gridPos": { "h": 3, "w": 6, - "x": 0, + "x": 6, "y": 6 }, - "hideTimeOverride": true, - "id": 4, - "links": [], + "id": 34, "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -707,9 +733,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -717,20 +745,21 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "ceil(sum(increase(blocky_query_total[$__range])))", + "expr": "sum(increase(blocky_response_total{response_type=\"BLOCKED\"}[$__range])) / sum(increase(blocky_query_total[$__range])) ", "format": "table", - "instant": true, + "instant": false, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "Query Count Total", + "title": "Queries blocked", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "Number of entries in the cache. Shows the last value", @@ -761,6 +790,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "last" @@ -768,15 +798,18 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "(sum(blocky_cache_entries) or sum(blocky_cache_entry_count)) / sum(up{job=~\"$job\"})", "format": "table", @@ -792,6 +825,7 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "Cache Hit/Miss ratio. 100 % means, all queries could be answered from the cache, 0% - all queries must be resolved via external DNS", @@ -828,6 +862,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -835,17 +870,20 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "(\n sum(rate(blocky_cache_hits_total[$__rate_interval]))\n /\n (sum(rate(blocky_cache_hits_total[$__rate_interval])) + sum(rate(blocky_cache_misses_total[$__rate_interval]))\n)\nor\n(\n sum(rate(blocky_cache_hit_count[$__rate_interval]))\n /\n (sum(rate(blocky_cache_hit_count[$__rate_interval])) + sum(rate(blocky_cache_miss_count[$__rate_interval]))\n)", + "expr": "sum(increase(blocky_cache_hit_count[$__range])) / (sum(increase(blocky_cache_hit_count[$__range])) + sum(increase(blocky_cache_miss_count[$__range])))", "format": "table", "instant": false, "interval": "", @@ -859,40 +897,22 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Number of occured errors", + "description": "Amount of performed DNS queries to prefetch cached queries", "fieldConfig": { "defaults": { - "decimals": 0, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], + "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "#299c46", + "color": "green", "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 - }, - { - "color": "#d44a3a" } ] - }, - "unit": "short" + } }, "overrides": [] }, @@ -900,16 +920,15 @@ "h": 3, "w": 6, "x": 0, - "y": 12 + "y": 9 }, - "id": 36, - "links": [], - "maxDataPoints": 100, + "id": 53, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", - "orientation": "horizontal", + "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -917,33 +936,37 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "sum(increase(blocky_error_total[$__range]))", + "expr": "ceil(sum(increase(blocky_prefetches_total[$__range])) or sum(increase(blocky_prefetch_count[$__range])))", "format": "table", - "instant": true, "interval": "", "legendFormat": "", + "range": true, "refId": "A" } ], - "title": "Error count", + "title": "Prefetch count", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Amount of performed DNS queries to prefetch cached queries", + "description": "Amount of unique domains in the prefetched cache", "fieldConfig": { "defaults": { "mappings": [], @@ -962,15 +985,16 @@ "gridPos": { "h": 3, "w": 6, - "x": 0, + "x": 6, "y": 9 }, - "id": 53, + "id": 49, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -978,30 +1002,34 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "ceil(sum(increase(blocky_prefetches_total[$__range]) or sum(increase(blocky_prefetch_count[$__range])))", + "expr": "sum(blocky_prefetch_domain_name_cache_entries)/ sum(up{job=~\"$job\"})", "format": "table", - "instant": true, "interval": "", "legendFormat": "", + "range": true, "refId": "A" } ], - "title": "Prefetch count", + "title": "Prefetch domain count", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "Amount of prefetch queries per minute", @@ -1036,6 +1064,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -1043,21 +1072,24 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "(sum(rate(blocky_prefetchs_total[$__range])) or sum(rate(blocky_prefetch_count[$__range]))) * 60", "format": "table", - "instant": true, "interval": "", "legendFormat": "", + "range": true, "refId": "A" } ], @@ -1067,6 +1099,7 @@ }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "description": "How many of cached entries were prefetched automatically", @@ -1103,6 +1136,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -1110,9 +1144,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1133,36 +1169,59 @@ "type": "stat" }, { - "description": "Time since last list refresh", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of occured errors", "fieldConfig": { "defaults": { "decimals": 0, - "mappings": [], + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "#299c46", "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 1 + }, + { + "color": "#d44a3a" } ] }, - "unit": "s" + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 3, "w": 6, - "x": 18, - "y": 5 + "x": 0, + "y": 12 }, - "id": 57, + "id": 36, + "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", - "orientation": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -1170,36 +1229,49 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "exemplar": false, - "expr": "sum(time() -blocky_last_list_group_refresh)/ sum(up{job=~\"$job\"})", + "exemplar": true, + "expr": "sum(increase(blocky_error_total[$__range]))", "format": "table", - "instant": true, + "instant": false, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "Last list refresh", + "title": "Error count", "transparent": true, "type": "stat" }, { "datasource": { + "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Amount of unique domains in the prefetched cache", "fieldConfig": { "defaults": { - "mappings": [], + "decimals": 2, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], "thresholds": { "mode": "absolute", "steps": [ @@ -1208,7 +1280,8 @@ "value": null } ] - } + }, + "unit": "bytes" }, "overrides": [] }, @@ -1216,14 +1289,16 @@ "h": 3, "w": 6, "x": 6, - "y": 9 + "y": 12 }, - "id": 49, + "id": 28, + "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", - "orientation": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -1231,9 +1306,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1241,27 +1318,36 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum(blocky_prefetch_domain_name_cache_count)/ sum(up{job=~\"$job\"})", + "expr": "sum(go_memstats_sys_bytes{job=~\"$job\"})/sum(up{job=~\"$job\"})", "format": "table", + "instant": false, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "Prefetch domain count", + "title": "Memory allocated", "transparent": true, "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "avg requests / min", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1270,6 +1356,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1315,14 +1402,16 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1343,15 +1432,23 @@ "type": "timeseries" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "avg requests / min", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "bars", "fillOpacity": 100, "gradientMode": "none", @@ -1360,6 +1457,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1406,13 +1504,15 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.3.3", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1433,29 +1533,71 @@ "type": "timeseries" }, { - "cards": {}, - "color": { - "cardColor": "#FADE2A", - "colorScale": "sqrt", - "colorScheme": "interpolateYlOrBr", - "exponent": 0.5, - "mode": "opacity" - }, - "dataFormat": "tsbuckets", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, "gridPos": { "h": 9, "w": 24, "x": 0, "y": 29 }, - "heatmap": {}, - "hideZeroBuckets": false, - "highlightCards": true, "id": 22, - "legend": { - "show": true + "options": { + "calculate": false, + "calculation": {}, + "cellGap": 2, + "cellValues": {}, + "color": { + "exponent": 0.5, + "fill": "#FADE2A", + "mode": "opacity", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 128 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "showValue": "never", + "tooltip": { + "mode": "single", + "showColorScale": false, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false, + "unit": "ms" + } }, - "reverseYBuckets": false, + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1472,23 +1614,14 @@ } ], "title": "request duration (upstream)", - "tooltip": { - "show": true, - "showHistogram": false - }, "transparent": true, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "ms", - "logBase": 1, - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1514,13 +1647,13 @@ "y": 38 }, "id": 2, - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value", "percent" @@ -1535,10 +1668,11 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, - "pluginVersion": "6.6.2", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1559,6 +1693,10 @@ "type": "piechart" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1584,13 +1722,13 @@ "y": 38 }, "id": 8, - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value", "percent" @@ -1605,10 +1743,11 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, - "pluginVersion": "6.6.2", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1629,6 +1768,10 @@ "type": "piechart" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1654,13 +1797,13 @@ "y": 46 }, "id": 32, - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value" ] @@ -1674,18 +1817,20 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, - "pluginVersion": "6.6.2", + "pluginVersion": "11.3.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": false, - "expr": "topk(1, blocky_denylist_cache) by (group)", + "expr": "topk(1, blocky_denylist_cache_entries) by (group)", "format": "time_series", "instant": true, "interval": "", @@ -1698,6 +1843,10 @@ "type": "piechart" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1723,13 +1872,13 @@ "y": 46 }, "id": 14, - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value", "percent" @@ -1744,9 +1893,11 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1767,6 +1918,10 @@ "type": "piechart" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1792,14 +1947,13 @@ "y": 54 }, "id": 38, - "interval": "", - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value", "percent" @@ -1814,9 +1968,11 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1837,6 +1993,10 @@ "type": "piechart" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -1862,13 +2022,13 @@ "y": 54 }, "id": 12, - "links": [], "maxDataPoints": 3, "options": { "legend": { "calcs": [], "displayMode": "table", "placement": "right", + "showLegend": true, "values": [ "value", "percent" @@ -1883,9 +2043,11 @@ "values": false }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, + "pluginVersion": "11.3.1", "targets": [ { "datasource": { @@ -1906,9 +2068,8 @@ "type": "piechart" } ], - "refresh": false, - "schemaVersion": 34, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [], "templating": { "list": [ @@ -1917,7 +2078,7 @@ "label": "blocky API URL", "name": "blocky_url", "query": "${VAR_BLOCKY_URL}", - "skipUrlSync": false, + "skipUrlSync": true, "type": "constant", "current": { "value": "${VAR_BLOCKY_URL}", @@ -1935,13 +2096,12 @@ { "current": {}, "datasource": { - "type": "prometheus" + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(blocky_blocking_enabled,job)", - "hide": 0, "includeAll": true, "label": "job", - "multi": false, "name": "job", "options": [], "query": { @@ -1951,7 +2111,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -1961,23 +2120,10 @@ "from": "now-3h", "to": "now" }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ] - }, + "timepicker": {}, "timezone": "", - "title": "blocky", - "uid": "JvOqE4gRk", - "version": 1, + "title": "blocky1", + "uid": "JvOqE4gR1", + "version": 5, "weekStart": "" -} +} \ No newline at end of file