From a7294ec673a003aad9fe2304d2ec260c1b1326bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toralf=20F=C3=B6rster?= Date: Sat, 20 Apr 2024 19:11:53 +0200 Subject: [PATCH] adapt to latest metrics --- dashboards/tor-ddos.json | 29 ++++++++++------- dashboards/tor-relay.json | 54 ++++++++++++-------------------- dashboards/tor-snowflake-1m.json | 12 +++---- 3 files changed, 43 insertions(+), 52 deletions(-) diff --git a/dashboards/tor-ddos.json b/dashboards/tor-ddos.json index da863b3..bf006cc 100644 --- a/dashboards/tor-ddos.json +++ b/dashboards/tor-ddos.json @@ -27,7 +27,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.4.0" + "version": "10.4.2" }, { "type": "datasource", @@ -169,7 +169,7 @@ "overrides": [] }, "gridPos": { - "h": 4, + "h": 3, "w": 7, "x": 0, "y": 1 @@ -188,10 +188,13 @@ "values": false }, "showPercentChange": false, + "text": { + "titleSize": 13 + }, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.4.0", + "pluginVersion": "10.4.2", "targets": [ { "datasource": { @@ -201,7 +204,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "tor_bug_reached{nickname=~\"$Nickname\"}", + "expr": "tor_bug_reached_count{nickname=~\"$Nickname\"}", "format": "time_series", "fullMetaSearch": false, "includeNullMetadata": true, @@ -276,7 +279,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.4.0", + "pluginVersion": "10.4.2", "targets": [ { "datasource": { @@ -336,10 +339,10 @@ "overrides": [] }, "gridPos": { - "h": 5, + "h": 6, "w": 7, "x": 0, - "y": 5 + "y": 4 }, "id": 83, "options": { @@ -355,9 +358,12 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, - "sizing": "auto" + "sizing": "auto", + "text": { + "titleSize": 13 + } }, - "pluginVersion": "10.4.0", + "pluginVersion": "10.4.2", "targets": [ { "datasource": { @@ -909,8 +915,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -3170,6 +3175,6 @@ "timezone": "utc", "title": "Tor DDoS", "uid": "FgvRNta4k", - "version": 444, + "version": 446, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/tor-relay.json b/dashboards/tor-relay.json index b27f51c..86820de 100644 --- a/dashboards/tor-relay.json +++ b/dashboards/tor-relay.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.4.0" + "version": "10.4.2" }, { "type": "datasource", @@ -231,6 +231,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 100, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -265,10 +266,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, @@ -736,6 +733,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -1105,8 +1103,9 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_bug_reached{instance=~\"$Instance\"})", + "expr": "avg by(instance) (tor_bug_reached_count{instance=~\"$Instance\"})", "fullMetaSearch": false, + "hide": false, "includeNullMetadata": true, "legendFormat": "__auto", "range": true, @@ -1286,8 +1285,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -1386,8 +1384,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -1486,8 +1483,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -1586,8 +1582,7 @@ } ] }, - "unit": "short", - "unitScale": true + "unit": "short" }, "overrides": [] }, @@ -1686,8 +1681,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -1786,8 +1780,7 @@ } ] }, - "unit": "short", - "unitScale": true + "unit": "short" }, "overrides": [] }, @@ -1827,7 +1820,7 @@ "useBackend": false } ], - "title": "Connection", + "title": "Connections", "type": "timeseries" }, { @@ -1887,8 +1880,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -1987,8 +1979,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -2087,8 +2078,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -2187,8 +2177,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -2287,8 +2276,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -2387,8 +2375,7 @@ } ] }, - "unit": "bytes", - "unitScale": true + "unit": "bytes" }, "overrides": [] }, @@ -2487,8 +2474,7 @@ } ] }, - "unit": "none", - "unitScale": true + "unit": "none" }, "overrides": [] }, @@ -3059,6 +3045,6 @@ "timezone": "", "title": "Tor Relay", "uid": "bb0ac200-1fab-4d04-a3b0-859d35ec9ee6", - "version": 303, + "version": 313, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/tor-snowflake-1m.json b/dashboards/tor-snowflake-1m.json index 85f75d0..5fa2362 100644 --- a/dashboards/tor-snowflake-1m.json +++ b/dashboards/tor-snowflake-1m.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.4.0" + "version": "10.4.2" }, { "type": "datasource", @@ -415,7 +415,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisSoftMax": 0.5, + "axisSoftMax": 0.3, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -758,7 +758,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -766,8 +767,7 @@ } ] }, - "unit": "bytes", - "unitScale": true + "unit": "bytes" }, "overrides": [] }, @@ -874,6 +874,6 @@ "timezone": "", "title": "Tor Snowflake 1m", "uid": "b1cf61bb-53e2-44e9-9f96-af33116dee8a", - "version": 56, + "version": 57, "weekStart": "" } \ No newline at end of file