diff --git a/grafana-dashboard-details.json b/grafana-dashboard-details.json index 151f9fa..e4f725d 100644 --- a/grafana-dashboard-details.json +++ b/grafana-dashboard-details.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "9.5.3" + "version": "10.1.1" }, { "type": "datasource", @@ -88,6 +88,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -147,7 +148,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action, type) (rate(tor_relay_load_onionskins_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action, type) (rate(tor_relay_load_onionskins_total{orport=~\"$Orport\", action=~\"$Action\", type=~\"$Type\"}[$__rate_interval]))", "legendFormat": "{{action}} {{type}}", "range": true, "refId": "A" @@ -171,6 +172,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -181,6 +183,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -240,7 +243,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(state) (rate(tor_relay_circuits_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(state) (rate(tor_relay_circuits_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -274,6 +277,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -333,7 +337,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action) (rate(tor_relay_intro1_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action) (rate(tor_relay_intro1_total{orport=~\"$Orport\", action=~\"$Action\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -357,6 +361,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -367,6 +372,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -426,7 +432,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(state) (rate(tor_relay_load_socket_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(state) (rate(tor_relay_load_socket_total{orport=~\"$Orport\", state=~\"opened\"}[$__rate_interval]))", "legendFormat": "{{state}}", "range": true, "refId": "A" @@ -460,6 +466,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -519,7 +526,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type) (rate(tor_relay_dos_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(type) (rate(tor_relay_dos_total{orport=~\"$Orport\", type=~\"$Type\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -553,6 +560,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -612,8 +620,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type, direction, state) (rate(tor_relay_connections{orport=\"$Orport\", family=\"ipv4\"}[$__rate_interval]))", - "legendFormat": "{{type}} {{direction}} {{ſtate}}", + "expr": "sum by(type, direction, state) (rate(tor_relay_connections{orport=~\"$Orport\", family=\"ipv4\", type=~\"$Type\", state=~\"$State\", direction=~\"$Direction\"}[$__rate_interval]))", + "legendFormat": "__auto", "range": true, "refId": "A" } @@ -646,6 +654,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -704,7 +713,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action) (rate(tor_relay_rend1_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action) (rate(tor_relay_rend1_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -738,6 +747,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -796,7 +806,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type, direction, state) (rate(tor_relay_connections{orport=\"$Orport\", family=\"ipv6\"}[$__rate_interval]))", + "expr": "sum by(type, direction, state) (rate(tor_relay_connections{orport=~\"$Orport\", family=\"ipv6\", type=~\"$Type\", state=~\"$State\", direction=~\"$Direction\"}[$__rate_interval]))", "legendFormat": "{{type}} {{direction}} {{ſtate}}", "range": true, "refId": "A" @@ -830,6 +840,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -888,7 +899,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type) (rate(tor_relay_streams_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(type) (rate(tor_relay_streams_total{orport=~\"$Orport\", type=~\"$Type\"}[$__rate_interval]))", "legendFormat": "{{type}}", "range": true, "refId": "A" @@ -922,6 +933,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -981,7 +993,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type, state, direction) (rate(tor_relay_connections_total{orport=\"$Orport\", family=\"ipv4\"}[$__rate_interval]))", + "expr": "sum by(type, state, direction) (rate(tor_relay_connections_total{orport=~\"$Orport\", family=\"ipv4\", type=~\"$Type\", state=~\"$State\", direction=~\"$Direction\"}[$__rate_interval]))", "legendFormat": "{{type}} {{state}} {{direction}}", "range": true, "refId": "A" @@ -1015,6 +1027,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1073,7 +1086,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action) (rate(tor_relay_est_intro_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action) (rate(tor_relay_est_intro_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1107,6 +1120,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1166,7 +1180,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(type, state, direction) (rate(tor_relay_connections_total{orport=\"$Orport\", family=\"ipv6\"}[$__rate_interval]))", + "expr": "sum by(type, state, direction) (rate(tor_relay_connections_total{orport=~\"$Orport\", family=\"ipv6\", type=~\"$Type\", state=~\"$State\", direction=~\"$Direction\"}[$__rate_interval]))", "legendFormat": "{{type}} {{state}} {{direction}}", "range": true, "refId": "A" @@ -1200,6 +1214,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1258,7 +1273,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action) (rate(tor_relay_est_rend_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action) (rate(tor_relay_est_rend_total{orport=~\"$Orport\", action=~\"$Action\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1292,6 +1307,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1350,7 +1366,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action, state) (rate(tor_relay_congestion_control{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action, state) (rate(tor_relay_congestion_control{orport=~\"$Orport\", action=~\"$Action\", state=~\"$State\"}[$__rate_interval]))", "legendFormat": "{{action}} {{state}}", "range": true, "refId": "A" @@ -1442,7 +1458,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(side) (rate(tor_relay_load_global_rate_limit_reached_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(side) (rate(tor_relay_load_global_rate_limit_reached_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1534,7 +1550,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(action, state) (rate(tor_relay_congestion_control_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(action, state) (rate(tor_relay_congestion_control_total{orport=~\"$Orport\", action=~\"$Action\", state=~\"$State\"}[$__rate_interval]))", "legendFormat": "{{action}} {{state}}", "range": true, "refId": "A" @@ -1627,7 +1643,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "tor_relay_exit_dns_query_total{orport=\"$Orport\"}", + "expr": "tor_relay_exit_dns_query_total{orport=~\"$Orport\"}", "legendFormat": "{{orport}}", "range": true, "refId": "A" @@ -1719,7 +1735,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "tor_relay_load_tcp_exhaustion_total{orport=\"$Orport\"}", + "expr": "tor_relay_load_tcp_exhaustion_total{orport=~\"$Orport\"}", "legendFormat": "{{orport}}", "range": true, "refId": "A" @@ -1812,7 +1828,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "tor_relay_exit_dns_error_total{orport=\"$Orport\"}", + "expr": "sum by(reason) (rate(tor_relay_exit_dns_error_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "{{reason}}", "range": true, "refId": "A" @@ -1905,7 +1921,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "builder", - "expr": "sum by(subsys, ) (rate(tor_relay_load_oom_bytes_total{orport=\"$Orport\"}[$__rate_interval]))", + "expr": "sum by(subsys) (rate(tor_relay_load_oom_bytes_total{orport=~\"$Orport\"}[$__rate_interval]))", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1931,7 +1947,7 @@ }, "definition": "label_values(orport)", "hide": 0, - "includeAll": false, + "includeAll": true, "multi": false, "name": "Orport", "options": [], @@ -1939,7 +1955,7 @@ "query": "label_values(orport)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, - "refresh": 1, + "refresh": 2, "regex": "", "skipUrlSync": false, "sort": 3, @@ -1951,22 +1967,91 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(job)", + "definition": "label_values(type)", + "hide": 0, + "includeAll": true, + "label": "Type", + "multi": false, + "name": "Type", + "options": [], + "query": { + "query": "label_values(type)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(direction)", + "hide": 0, + "includeAll": true, + "label": "Direction", + "multi": false, + "name": "Direction", + "options": [], + "query": { + "query": "label_values(direction)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(state)", "hide": 0, - "includeAll": false, - "label": "Job", + "includeAll": true, + "label": "State", "multi": false, - "name": "job", + "name": "State", "options": [], "query": { - "query": "label_values(job)", + "query": "label_values(state)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, - "refresh": 1, + "refresh": 2, "regex": "", "skipUrlSync": false, "sort": 0, "type": "query" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(action)", + "hide": 0, + "includeAll": true, + "label": "Action", + "multi": false, + "name": "Action", + "options": [], + "query": { + "query": "label_values(action)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" } ] }, @@ -1978,6 +2063,6 @@ "timezone": "", "title": "Tor details", "uid": "bb0ac200-1fab-4d04-a3b0-859d35ec9ee6", - "version": 50, + "version": 76, "weekStart": "" } \ No newline at end of file diff --git a/grafana-dashboard.json b/grafana-dashboard.json index 9f2a553..6154405 100644 --- a/grafana-dashboard.json +++ b/grafana-dashboard.json @@ -27,7 +27,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "9.5.3" + "version": "10.1.1" }, { "type": "datasource", @@ -155,7 +155,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -234,20 +234,24 @@ }, "textMode": "auto" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", "exemplar": false, "expr": "tor_relay_flag", + "fullMetaSearch": false, + "includeNullMetadata": true, "instant": true, "legendFormat": "{{orport}} {{type}}", "range": false, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Flags", @@ -292,6 +296,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -399,6 +404,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineStyle": { "fill": "solid" @@ -511,6 +517,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -619,6 +626,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -741,6 +749,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -803,6 +812,8 @@ "displayMode": "table", "placement": "right", "showLegend": true, + "sortBy": "Name", + "sortDesc": false, "width": 80 }, "tooltip": { @@ -816,11 +827,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (tor_relay_connections{family=\"ipv4\", direction=\"initiated\", job=\"Tor\"})", + "expr": "sum by(orport) (tor_relay_connections{family=\"ipv4\", direction=\"initiated\", job=\"Tor\", orport=~\"$orport\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Connections init IPv4", @@ -852,6 +867,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -910,11 +926,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (tor_relay_connections{family=\"ipv6\", direction=\"initiated\", job=\"Tor\"})", + "expr": "sum by(orport) (tor_relay_connections{family=\"ipv6\", direction=\"initiated\", job=\"Tor\", orport=~\"$orport\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Connections init IPv6", @@ -946,6 +966,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1004,11 +1025,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (tor_relay_connections{family=\"ipv4\", direction=\"received\", job=\"Tor\"})", + "expr": "sum by(orport) (tor_relay_connections{family=\"ipv4\", direction=\"received\", job=\"Tor\", orport=~\"$orport\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Connections recv IPv4", @@ -1040,6 +1065,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1098,11 +1124,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (tor_relay_connections{family=\"ipv6\", direction=\"received\", job=\"Tor\"})", + "expr": "sum by(orport) (tor_relay_connections{family=\"ipv6\", direction=\"received\", job=\"Tor\", orport=~\"$orport\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Connections recv IPv6", @@ -1134,6 +1164,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1193,11 +1224,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (rate(tor_relay_traffic_bytes{direction=\"read\", job=\"Tor\"}[$__rate_interval]))", + "expr": "sum by(orport) (rate(tor_relay_traffic_bytes{direction=\"read\", job=\"Tor\", orport=~\"$orport\"}[$__rate_interval]))", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Traffic read", @@ -1229,6 +1264,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1287,11 +1323,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "max by(orport) (tor_relay_load_socket_total{state=\"opened\", job=\"Tor\"})", + "expr": "max by(orport) (tor_relay_load_socket_total{state=\"opened\", job=\"Tor\", orport=~\"$orport\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{label_name}}{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Opened sockets", @@ -1323,6 +1363,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1382,11 +1423,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (rate(tor_relay_traffic_bytes{direction=\"written\", job=\"Tor\"}[$__rate_interval]))", + "expr": "sum by(orport) (rate(tor_relay_traffic_bytes{direction=\"written\", job=\"Tor\", orport=~\"$orport\"}[$__rate_interval]))", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "Traffic written", @@ -1431,6 +1476,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1490,12 +1536,16 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (rate(torutils_syn_packets{ipver=\"4\"}[$__rate_interval]))", + "expr": "sum by(orport) (rate(torutils_syn_packets{ipver=\"4\", orport=~\"$orport\"}[$__rate_interval]))", + "fullMetaSearch": false, "hide": false, + "includeNullMetadata": true, "legendFormat": "{{dpt}}", "range": true, - "refId": "D" + "refId": "D", + "useBackend": false } ], "title": "DROP syn IPv4", @@ -1527,6 +1577,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1586,12 +1637,16 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(orport) (rate(torutils_syn_packets{ipver=\"6\"}[$__rate_interval]))", + "expr": "sum by(orport) (rate(torutils_syn_packets{ipver=\"6\", orport=~\"$orport\"}[$__rate_interval]))", + "fullMetaSearch": false, "hide": false, + "includeNullMetadata": true, "legendFormat": "{{dpt}}", "range": true, - "refId": "D" + "refId": "D", + "useBackend": false } ], "title": "DROP syn IPv6", @@ -1623,6 +1678,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1719,6 +1775,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1786,7 +1843,7 @@ "refId": "D" } ], - "title": "DROP state Pv6", + "title": "DROP state IPv6", "type": "timeseries" }, { @@ -1814,6 +1871,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1872,11 +1930,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_ipset_total{ipver=\"4\", mode=\"ddos\"}", + "expr": "torutils_ipset_total{ipver=\"4\", mode=\"ddos\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "ipset ddos IPv4", @@ -1908,6 +1970,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1966,11 +2029,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_ipset_total{ipver=\"6\", mode=\"ddos\"}", + "expr": "torutils_ipset_total{ipver=\"6\", mode=\"ddos\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "ipset ddos IPv6", @@ -2001,6 +2068,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2059,11 +2127,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"ddos\"}", + "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"ddos\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "hashlimit ddos IPv4", @@ -2094,6 +2166,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2152,11 +2225,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"ddos\"}", + "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"ddos\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "hashlimit ddos IPv6", @@ -2187,6 +2264,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2245,11 +2323,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"rate\"}", + "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"rate\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "hashlimit rate IPv4", @@ -2280,6 +2362,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2338,11 +2421,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"rate\"}", + "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"rate\", orport=~\"$orport\"}", + "fullMetaSearch": false, + "includeNullMetadata": true, "legendFormat": "{{orport}}", "range": true, - "refId": "A" + "refId": "A", + "useBackend": false } ], "title": "hashlimit rate IPv6", @@ -2410,7 +2497,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2477,7 +2564,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2544,7 +2631,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2611,7 +2698,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2678,7 +2765,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2745,7 +2832,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2812,7 +2899,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2879,7 +2966,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -2946,7 +3033,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -3013,7 +3100,7 @@ "text": {}, "valueMode": "color" }, - "pluginVersion": "9.5.3", + "pluginVersion": "10.1.1", "targets": [ { "datasource": { @@ -3032,7 +3119,7 @@ "type": "bargauge" } ], - "refresh": "15m", + "refresh": "5m", "revision": 1, "schemaVersion": 38, "style": "dark", @@ -3040,7 +3127,31 @@ "tor" ], "templating": { - "list": [] + "list": [ + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(orport)", + "hide": 0, + "includeAll": true, + "label": "Orport", + "multi": false, + "name": "orport", + "options": [], + "query": { + "query": "label_values(orport)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 3, + "type": "query" + } + ] }, "time": { "from": "now-7d", @@ -3050,6 +3161,6 @@ "timezone": "utc", "title": "Tor", "uid": "FgvRNta4k", - "version": 265, + "version": 274, "weekStart": "" } \ No newline at end of file