diff --git a/dashboards/tor-ddos.json b/dashboards/tor-ddos.json index 9365342..3cf919b 100644 --- a/dashboards/tor-ddos.json +++ b/dashboards/tor-ddos.json @@ -27,7 +27,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "11.2.0" + "version": "11.3.0" }, { "type": "datasource", @@ -75,6 +75,7 @@ }, "enable": true, "expr": "changes(node_boot_time_seconds[$__rate_interval])", + "hide": false, "iconColor": "red", "name": "Reboot" } @@ -122,7 +123,6 @@ "url": "https://zwiebeltoralf.de/torserver.html" } ], - "liveNow": false, "panels": [ { "collapsed": false, @@ -198,7 +198,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.2.0", + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -277,7 +277,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.2.0", + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -358,7 +358,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.2.0", + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -439,7 +439,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.2.0", + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -523,7 +523,7 @@ "sizing": "auto", "text": {} }, - "pluginVersion": "11.2.0", + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -645,6 +645,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -765,6 +766,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -854,7 +856,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -887,6 +890,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1005,7 +1009,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1038,6 +1043,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -2576,8 +2582,7 @@ } ], "refresh": "auto", - "revision": 1, - "schemaVersion": 39, + "schemaVersion": 40, "tags": [], "templating": { "list": [ @@ -2588,10 +2593,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(torutils_dropped_state_packets,instance)", - "hide": 0, "includeAll": false, "label": "Instance", - "multi": false, "name": "Instance", "options": [], "query": { @@ -2601,7 +2604,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2612,10 +2614,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections{instance=~\"$Instance\"},nickname)", - "hide": 0, "includeAll": true, "label": "Nickname", - "multi": false, "name": "Nickname", "options": [], "query": { @@ -2625,7 +2625,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } diff --git a/dashboards/tor-relay.json b/dashboards/tor-relay.json index c2ef8c9..f03051b 100644 --- a/dashboards/tor-relay.json +++ b/dashboards/tor-relay.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "11.2.0" + "version": "11.3.0" }, { "type": "datasource", @@ -51,6 +51,7 @@ }, "enable": true, "expr": "changes(node_boot_time_seconds[$__rate_interval])", + "hide": false, "iconColor": "red", "name": "Reboot" } @@ -98,7 +99,6 @@ "url": "https://zwiebeltoralf.de/torserver.html" } ], - "liveNow": false, "panels": [ { "collapsed": false, @@ -196,6 +196,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -296,6 +297,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -412,6 +414,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -512,6 +515,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -583,7 +587,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -615,6 +620,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -685,7 +691,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -717,6 +724,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -786,7 +794,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -818,6 +827,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -889,7 +899,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -921,6 +932,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -959,6 +971,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -989,14 +1002,16 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", "value": 80 } ] - } + }, + "unit": "none" }, "overrides": [] }, @@ -1006,7 +1021,7 @@ "x": 0, "y": 34 }, - "id": 13, + "id": 2, "options": { "legend": { "calcs": [], @@ -1020,6 +1035,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1028,7 +1044,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(type, nickname) (rate(tor_relay_streams_total{nickname=~\"$Nickname\", type=~\"$Type_stre\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "avg by(action, nickname, state) (rate(tor_relay_congestion_control_total{nickname=~\"$Nickname\", action=~\"$Action_cong_tot\", state=~\"$State_cong_tot\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1037,7 +1053,7 @@ "useBackend": false } ], - "title": "Streams", + "title": "Congestion Control Total", "type": "timeseries" }, { @@ -1058,6 +1074,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1088,15 +1105,15 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", "value": 80 } ] - }, - "unit": "none" + } }, "overrides": [] }, @@ -1106,7 +1123,7 @@ "x": 12, "y": 34 }, - "id": 2, + "id": 13, "options": { "legend": { "calcs": [], @@ -1120,6 +1137,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1128,7 +1146,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(action, nickname, state) (rate(tor_relay_congestion_control_total{nickname=~\"$Nickname\", action=~\"$Action_cong_tot\", state=~\"$State_cong_tot\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(type, nickname) (rate(tor_relay_streams_total{nickname=~\"$Nickname\", type=~\"$Type_stre\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1137,7 +1155,7 @@ "useBackend": false } ], - "title": "Congestion Control Total", + "title": "Streams", "type": "timeseries" }, { @@ -1156,9 +1174,9 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1184,13 +1202,13 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1198,7 +1216,7 @@ } ] }, - "unit": "none" + "unit": "short" }, "overrides": [] }, @@ -1208,7 +1226,7 @@ "x": 0, "y": 42 }, - "id": 25, + "id": 15, "options": { "legend": { "calcs": [], @@ -1222,6 +1240,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1230,17 +1249,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname) (rate(tor_relay_load_socket_total{nickname=~\"$Nickname\", state=~\"$State_load_socket_tot\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(action, state, nickname, state) (rate(tor_relay_congestion_control{nickname=~\"$Nickname\", state=~\"$State_cong\", action=~\"$Action_cong\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": false, - "instant": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Load Sockets (5m)", + "title": "Congestion Control", "type": "timeseries" }, { @@ -1259,8 +1277,10 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1286,12 +1306,14 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1299,7 +1321,7 @@ } ] }, - "unit": "short" + "unit": "none" }, "overrides": [] }, @@ -1309,7 +1331,7 @@ "x": 12, "y": 42 }, - "id": 15, + "id": 25, "options": { "legend": { "calcs": [], @@ -1323,6 +1345,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1331,16 +1354,17 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, state, nickname, state) (rate(tor_relay_congestion_control{nickname=~\"$Nickname\", state=~\"$State_cong\", action=~\"$Action_cong\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(nickname) (rate(tor_relay_load_socket_total{nickname=~\"$Nickname\", state=~\"$State_load_socket_tot\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, + "instant": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Congestion Control", + "title": "Load Sockets (5m)", "type": "timeseries" }, { @@ -1362,6 +1386,7 @@ "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1392,7 +1417,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1424,6 +1450,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1460,8 +1487,10 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1492,7 +1521,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1510,7 +1540,7 @@ "x": 12, "y": 50 }, - "id": 1, + "id": 8, "options": { "legend": { "calcs": [], @@ -1524,6 +1554,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1532,7 +1563,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname, action) (rate(tor_relay_intro1_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(nickname, state) (rate(tor_relay_circuits_total{nickname=~\"$Nickname\", state=~\"$State_circ_tot\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1541,7 +1572,7 @@ "useBackend": false } ], - "title": "Intro1", + "title": "Circuits", "type": "timeseries" }, { @@ -1562,6 +1593,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1592,7 +1624,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1624,6 +1657,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1662,6 +1696,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1692,7 +1727,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1710,7 +1746,7 @@ "x": 12, "y": 58 }, - "id": 3, + "id": 1, "options": { "legend": { "calcs": [], @@ -1724,6 +1760,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1732,7 +1769,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(action, nickname) (rate(tor_relay_est_intro_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(nickname, action) (rate(tor_relay_intro1_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1741,7 +1778,7 @@ "useBackend": false } ], - "title": "Est Intro", + "title": "Intro1", "type": "timeseries" }, { @@ -1760,9 +1797,9 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1793,7 +1830,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1811,7 +1849,7 @@ "x": 0, "y": 66 }, - "id": 8, + "id": 4, "options": { "legend": { "calcs": [], @@ -1825,6 +1863,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1833,7 +1872,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname, state) (rate(tor_relay_circuits_total{nickname=~\"$Nickname\", state=~\"$State_circ_tot\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "avg by(action, nickname) (rate(tor_relay_est_rend_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1842,7 +1881,7 @@ "useBackend": false } ], - "title": "Circuits", + "title": "Est Rend", "type": "timeseries" }, { @@ -1863,6 +1902,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1888,13 +1928,13 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1912,7 +1952,7 @@ "x": 12, "y": 66 }, - "id": 12, + "id": 3, "options": { "legend": { "calcs": [], @@ -1926,6 +1966,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1934,7 +1975,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, nickname) (rate(tor_relay_rend1_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "avg by(action, nickname) (rate(tor_relay_est_intro_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1943,7 +1984,7 @@ "useBackend": false } ], - "title": "Rend1", + "title": "Est Intro", "type": "timeseries" }, { @@ -1964,6 +2005,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2012,7 +2054,7 @@ "x": 0, "y": 74 }, - "id": 4, + "id": 28, "options": { "legend": { "calcs": [], @@ -2034,16 +2076,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(action, nickname) (rate(tor_relay_est_rend_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(nickname) (rate(tor_relay_drop_cell_total{nickname=~\"$Nickname\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Est Rend", + "title": "Drop Cell Total", "type": "timeseries" }, { @@ -2064,6 +2106,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2089,6 +2132,7 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -2112,7 +2156,7 @@ "x": 12, "y": 74 }, - "id": 7, + "id": 12, "options": { "legend": { "calcs": [], @@ -2134,16 +2178,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(nickname) (tor_relay_load_tcp_exhaustion_total{nickname=~\"$Nickname\", job=~\"$Job\"})", + "expr": "sum by(action, nickname) (rate(tor_relay_rend1_total{nickname=~\"$Nickname\", action=~\"$Action_circ\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Load Tcp Exhaustion", + "title": "Rend1", "type": "timeseries" }, { @@ -2164,6 +2208,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2212,7 +2257,7 @@ "x": 0, "y": 82 }, - "id": 28, + "id": 16, "options": { "legend": { "calcs": [], @@ -2234,16 +2279,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname) (rate(tor_relay_drop_cell_total{nickname=~\"$Nickname\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(action, type, nickname) (rate(tor_relay_load_onionskins_total{nickname=~\"$Nickname\", action=~\"$Action_load\", type=~\"$Type_load\", job=~\"$Job\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Drop Cell Total", + "title": "Load Onionskins", "type": "timeseries" }, { @@ -2264,6 +2309,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2312,7 +2358,7 @@ "x": 12, "y": 82 }, - "id": 11, + "id": 7, "options": { "legend": { "calcs": [], @@ -2334,16 +2380,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(nickname) (tor_relay_load_global_rate_limit_reached_total{nickname=~\"$Nickname\", job=~\"$Job\"})", + "expr": "avg by(nickname) (tor_relay_load_tcp_exhaustion_total{nickname=~\"$Nickname\", job=~\"$Job\"})", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Load Global Rate Limit Reached", + "title": "Load Tcp Exhaustion", "type": "timeseries" }, { @@ -2364,6 +2410,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2402,7 +2449,7 @@ } ] }, - "unit": "none" + "unit": "bytes" }, "overrides": [] }, @@ -2412,7 +2459,7 @@ "x": 0, "y": 90 }, - "id": 16, + "id": 5, "options": { "legend": { "calcs": [], @@ -2434,7 +2481,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, type, nickname) (rate(tor_relay_load_onionskins_total{nickname=~\"$Nickname\", action=~\"$Action_load\", type=~\"$Type_load\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "avg by(subsys, nickname) (tor_relay_load_oom_bytes_total{nickname=~\"$Nickname\", subsys=~\"$Subsys\", job=~\"$Job\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -2443,7 +2490,7 @@ "useBackend": false } ], - "title": "Load Onionskins", + "title": "Load Oom Bytes", "type": "timeseries" }, { @@ -2464,6 +2511,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2512,7 +2560,7 @@ "x": 12, "y": 90 }, - "id": 19, + "id": 11, "options": { "legend": { "calcs": [], @@ -2534,16 +2582,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(nickname) (tor_relay_exit_dns_query_total{nickname=~\"$Nickname\", job=~\"$Job\"})", + "expr": "avg by(nickname) (tor_relay_load_global_rate_limit_reached_total{nickname=~\"$Nickname\", job=~\"$Job\"})", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Exit Dns Query", + "title": "Load Global Rate Limit Reached", "type": "timeseries" }, { @@ -2564,6 +2612,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2602,7 +2651,7 @@ } ] }, - "unit": "bytes" + "unit": "none" }, "overrides": [] }, @@ -2612,7 +2661,7 @@ "x": 0, "y": 98 }, - "id": 5, + "id": 17, "options": { "legend": { "calcs": [], @@ -2634,7 +2683,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(subsys, nickname) (tor_relay_load_oom_bytes_total{nickname=~\"$Nickname\", subsys=~\"$Subsys\", job=~\"$Job\"})", + "expr": "avg by(reason, nickname) (tor_relay_exit_dns_error_total{nickname=~\"$Nickname\", reason=~\"$Reason\", job=~\"$Job\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -2643,7 +2692,7 @@ "useBackend": false } ], - "title": "Load Oom Bytes", + "title": "Exit Dns Error", "type": "timeseries" }, { @@ -2664,6 +2713,7 @@ "axisPlacement": "auto", "axisWidth": 80, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2712,7 +2762,7 @@ "x": 12, "y": 98 }, - "id": 17, + "id": 19, "options": { "legend": { "calcs": [], @@ -2734,21 +2784,21 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(reason, nickname) (tor_relay_exit_dns_error_total{nickname=~\"$Nickname\", reason=~\"$Reason\", job=~\"$Job\"})", + "expr": "avg by(nickname) (tor_relay_exit_dns_query_total{nickname=~\"$Nickname\", job=~\"$Job\"})", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Exit Dns Error", + "title": "Exit Dns Query", "type": "timeseries" } ], "refresh": "auto", - "schemaVersion": 39, + "schemaVersion": 40, "tags": [], "templating": { "list": [ @@ -2759,10 +2809,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections,job)", - "hide": 0, "includeAll": true, "label": "Job", - "multi": false, "name": "Job", "options": [], "query": { @@ -2771,7 +2819,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2782,10 +2829,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values({job=~\"$Job\"},instance)", - "hide": 0, "includeAll": true, "label": "Instance", - "multi": false, "name": "Instance", "options": [], "query": { @@ -2795,7 +2840,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2806,10 +2850,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections{job=~\"$Job\", instance=~\"$Instance\"},nickname)", - "hide": 0, "includeAll": true, "label": "Nickname", - "multi": false, "name": "Nickname", "options": [], "query": { @@ -2819,7 +2861,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2830,10 +2871,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(family)", - "hide": 0, "includeAll": true, "label": "Family", - "multi": false, "name": "Family", "options": [], "query": { @@ -2842,8 +2881,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { @@ -2853,10 +2890,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_flag,type)", - "hide": 0, "includeAll": true, "label": "Flag", - "multi": false, "name": "Flag", "options": [], "query": { @@ -2866,8 +2901,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { @@ -2877,10 +2910,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_intro1_total,action)", - "hide": 0, "includeAll": true, "label": "Action circuits", - "multi": false, "name": "Action_circ", "options": [], "query": { @@ -2889,7 +2920,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2900,10 +2930,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_congestion_control,action)", - "hide": 0, "includeAll": true, "label": "Action cong", - "multi": false, "name": "Action_cong", "options": [], "query": { @@ -2912,7 +2940,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2923,10 +2950,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_congestion_control_total,action)", - "hide": 0, "includeAll": true, "label": "Action cong total", - "multi": false, "name": "Action_cong_tot", "options": [], "query": { @@ -2935,7 +2960,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2946,10 +2970,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_load_onionskins_total,action)", - "hide": 0, "includeAll": true, "label": "Action load", - "multi": false, "name": "Action_load", "options": [], "query": { @@ -2958,7 +2980,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2969,10 +2990,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections,direction)", - "hide": 0, "includeAll": true, "label": "Dir conn", - "multi": false, "name": "Dir_conn", "options": [], "query": { @@ -2981,7 +3000,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -2992,10 +3010,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_traffic_bytes,direction)", - "hide": 0, "includeAll": true, "label": "Dir traffic", - "multi": false, "name": "Dir_traf", "options": [], "query": { @@ -3004,7 +3020,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3015,10 +3030,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_exit_dns_error_total,reason)", - "hide": 0, "includeAll": true, "label": "Reason", - "multi": false, "name": "Reason", "options": [], "query": { @@ -3027,7 +3040,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3038,10 +3050,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_circuits_total,state)", - "hide": 0, "includeAll": true, "label": "State circ total", - "multi": false, "name": "State_circ_tot", "options": [], "query": { @@ -3051,7 +3061,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3062,10 +3071,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_congestion_control,state)", - "hide": 0, "includeAll": true, "label": "State cong", - "multi": false, "name": "State_cong", "options": [], "query": { @@ -3074,7 +3081,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3085,10 +3091,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_congestion_control_total,state)", - "hide": 0, "includeAll": true, "label": "State cong total", - "multi": false, "name": "State_cong_tot", "options": [], "query": { @@ -3097,7 +3101,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3108,10 +3111,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections,state)", - "hide": 0, "includeAll": true, "label": "State conn", - "multi": false, "name": "State_conn", "options": [], "query": { @@ -3121,7 +3122,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3132,10 +3132,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections_total,state)", - "hide": 0, "includeAll": true, "label": "State conn tot", - "multi": false, "name": "State_conn_tot", "options": [], "query": { @@ -3145,7 +3143,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3156,10 +3153,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_load_socket_total,state)", - "hide": 0, "includeAll": true, "label": "State load socket tot", - "multi": false, "name": "State_load_socket_tot", "options": [], "query": { @@ -3169,7 +3164,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3180,10 +3174,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_load_oom_bytes_total,subsys)", - "hide": 0, "includeAll": true, "label": "Subsys", - "multi": false, "name": "Subsys", "options": [], "query": { @@ -3192,7 +3184,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3203,10 +3194,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_connections,type)", - "hide": 0, "includeAll": true, "label": "Type conn", - "multi": false, "name": "Type_conn", "options": [], "query": { @@ -3215,7 +3204,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3226,10 +3214,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_dos_total,type)", - "hide": 0, "includeAll": true, "label": "Type dos", - "multi": false, "name": "Type_dos", "options": [], "query": { @@ -3238,7 +3224,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3249,10 +3234,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_load_onionskins_total,type)", - "hide": 0, "includeAll": true, "label": "Type load", - "multi": false, "name": "Type_load", "options": [], "query": { @@ -3261,7 +3244,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -3272,10 +3254,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_relay_streams_total,type)", - "hide": 0, "includeAll": true, "label": "Type stream", - "multi": false, "name": "Type_stre", "options": [], "query": { @@ -3284,7 +3264,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -3298,6 +3277,6 @@ "timezone": "", "title": "Tor Relay", "uid": "bb0ac200-1fab-4d04-a3b0-859d35ec9ee6", - "version": 379, + "version": 382, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/tor-snowflake.json b/dashboards/tor-snowflake.json index 8094710..3093002 100644 --- a/dashboards/tor-snowflake.json +++ b/dashboards/tor-snowflake.json @@ -7,14 +7,6 @@ "type": "datasource", "pluginId": "prometheus", "pluginName": "Prometheus" - }, - { - "name": "DS_PROMETHEUS-1M", - "label": "Prometheus-1m", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" } ], "__elements": {}, @@ -23,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "11.2.0" + "version": "11.3.0" }, { "type": "datasource", @@ -55,10 +47,11 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS-1M}" + "uid": "${DS_PROMETHEUS}" }, "enable": true, "expr": "changes(node_boot_time_seconds[$__rate_interval])", + "hide": false, "iconColor": "red", "name": "Reboot" } @@ -94,10 +87,9 @@ "url": "https://zwiebeltoralf.de/torserver.html" } ], - "liveNow": false, "panels": [ { - "collapsed": true, + "collapsed": false, "gridPos": { "h": 1, "w": 24, @@ -105,235 +97,239 @@ "y": 0 }, "id": 9, - "panels": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "panels": [], + "title": "Sum", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMax": 150, - "axisSoftMin": 0, - "axisWidth": 80, - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "decimals": 0, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMax": 150, + "axisSoftMin": 0, + "axisWidth": 80, + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 1 - }, - "id": 10, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" }, - "tooltip": { - "maxHeight": 600, - "mode": "single", - "sort": "none" + "thresholdsStyle": { + "mode": "off" } }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "decimals": 0, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum(rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\", job=~\"$Job\"}[5m])) * 3600", - "fullMetaSearch": false, - "includeNullMetadata": false, - "instant": false, - "legendFormat": "{{label_name}}", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Proxy Connections per hr", - "type": "timeseries" + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 10, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "11.3.0", + "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "axisSoftMin": 0, - "axisWidth": 80, - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "KiBs" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 1 + "disableTextWrap": false, + "editorMode": "builder", + "expr": "sum(rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\", job=~\"$Job\"}[5m])) * 3600", + "fullMetaSearch": false, + "includeNullMetadata": false, + "instant": false, + "legendFormat": "{{label_name}}", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Proxy Connections per hr", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" }, - "id": 12, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMin": 0, + "axisWidth": 80, + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - "tooltip": { - "maxHeight": 600, - "mode": "single", - "sort": "none" + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" } }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum(rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", - "fullMetaSearch": false, - "includeNullMetadata": false, - "instant": false, - "legendFormat": "inbound", - "range": true, - "refId": "A", - "useBackend": false - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum(rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[10m]))", - "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": false, - "instant": false, - "legendFormat": "outbound", - "range": true, - "refId": "B", - "useBackend": false - } - ], - "type": "timeseries" + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "KiBs" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 1 + }, + "id": 12, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "11.3.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "sum(rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", + "fullMetaSearch": false, + "includeNullMetadata": false, + "instant": false, + "legendFormat": "inbound", + "range": true, + "refId": "A", + "useBackend": false + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "sum(rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", + "fullMetaSearch": false, + "hide": false, + "includeNullMetadata": false, + "instant": false, + "legendFormat": "outbound", + "range": true, + "refId": "B", + "useBackend": false } ], - "title": "Sum", - "type": "row" + "title": "Traffic", + "type": "timeseries" }, { "collapsed": false, @@ -341,7 +337,7 @@ "h": 1, "w": 24, "x": 0, - "y": 1 + "y": 9 }, "id": 15, "panels": [], @@ -417,7 +413,7 @@ "h": 8, "w": 12, "x": 0, - "y": 2 + "y": 10 }, "id": 16, "options": { @@ -433,6 +429,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -522,7 +519,7 @@ "h": 8, "w": 12, "x": 12, - "y": 2 + "y": 10 }, "id": 17, "options": { @@ -538,6 +535,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -562,7 +560,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg(rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[10m]))", + "expr": "avg(rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": false, @@ -573,6 +571,7 @@ "useBackend": false } ], + "title": "Traffic", "type": "timeseries" }, { @@ -642,7 +641,7 @@ "h": 8, "w": 12, "x": 12, - "y": 10 + "y": 18 }, "id": 11, "options": { @@ -658,6 +657,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -685,7 +685,7 @@ "h": 1, "w": 24, "x": 0, - "y": 18 + "y": 26 }, "id": 8, "panels": [], @@ -744,7 +744,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -760,7 +761,7 @@ "h": 8, "w": 12, "x": 0, - "y": 19 + "y": 27 }, "id": 1, "options": { @@ -776,6 +777,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -784,7 +786,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\", job=~\"$Job\"}[1h])) * 3600", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\", job=~\"$Job\"}[5m])) * 3600", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -848,7 +850,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -864,7 +867,7 @@ "h": 8, "w": 12, "x": 12, - "y": 19 + "y": 27 }, "id": 3, "options": { @@ -880,6 +883,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -888,7 +892,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[1h]))", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -952,7 +956,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -968,7 +973,7 @@ "h": 8, "w": 12, "x": 0, - "y": 27 + "y": 35 }, "id": 4, "options": { @@ -984,6 +989,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1056,7 +1062,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1072,7 +1079,7 @@ "h": 8, "w": 12, "x": 12, - "y": 27 + "y": 35 }, "id": 5, "options": { @@ -1088,6 +1095,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1096,7 +1104,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[10m]))", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1158,7 +1166,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1174,7 +1183,7 @@ "h": 8, "w": 12, "x": 0, - "y": 35 + "y": 43 }, "id": 6, "options": { @@ -1190,6 +1199,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1261,7 +1271,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1277,7 +1288,7 @@ "h": 8, "w": 12, "x": 12, - "y": 35 + "y": 43 }, "id": 7, "options": { @@ -1293,6 +1304,7 @@ "sort": "none" } }, + "pluginVersion": "11.3.0", "targets": [ { "datasource": { @@ -1316,7 +1328,7 @@ } ], "refresh": "auto", - "schemaVersion": 39, + "schemaVersion": 40, "tags": [], "templating": { "list": [ @@ -1327,10 +1339,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_snowflake_proxy_connections_total,job)", - "hide": 0, "includeAll": true, "label": "Job", - "multi": false, "name": "Job", "options": [], "query": { @@ -1340,7 +1350,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -1351,10 +1360,9 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(tor_snowflake_proxy_connections_total{job=~\"$Job\"},instance)", - "hide": 0, "includeAll": true, "label": "Instance (Tor)", - "multi": false, + "multi": true, "name": "Instance", "options": [], "query": { @@ -1363,7 +1371,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -1377,6 +1384,6 @@ "timezone": "", "title": "Tor Snowflake", "uid": "bdsk0bz0y9n9cc", - "version": 43, + "version": 61, "weekStart": "" } \ No newline at end of file