diff --git a/dashboards/tor-ddos.json b/dashboards/tor-ddos.json index 5bfd9ca..c154b39 100644 --- a/dashboards/tor-ddos.json +++ b/dashboards/tor-ddos.json @@ -27,7 +27,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.2.3" + "version": "10.3.1" }, { "type": "datasource", @@ -164,7 +164,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -187,10 +188,11 @@ "fields": "", "values": false }, + "showPercentChange": false, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.3", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -235,7 +237,7 @@ "value": null }, { - "color": "transparent", + "color": "super-light-blue", "value": 0 }, { @@ -244,7 +246,8 @@ } ] }, - "unit": "bool_yes_no" + "unit": "bool_yes_no", + "unitScale": true }, "overrides": [] }, @@ -267,6 +270,7 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": { "titleSize": 13, "valueSize": 13 @@ -274,7 +278,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.3", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -329,7 +333,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -355,7 +360,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "10.2.3", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -451,7 +456,8 @@ } ] }, - "unit": "pps" + "unit": "pps", + "unitScale": true }, "overrides": [] }, @@ -483,7 +489,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(node_network_receive_packets_total{device=\"enp8s0\", instance=~\"$Instance\"}[$__rate_interval])", + "expr": "sum by(device) (rate(node_network_receive_packets_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "rx", @@ -498,7 +504,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(node_network_transmit_packets_total{device=\"enp8s0\", instance=~\"$Instance\"}[$__rate_interval])", + "expr": "sum by(device) (rate(node_network_transmit_packets_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -569,7 +575,8 @@ } ] }, - "unit": "binBps" + "unit": "binBps", + "unitScale": true }, "overrides": [] }, @@ -601,7 +608,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(node_network_receive_bytes_total{device=\"enp8s0\", instance=~\"$Instance\"}[$__rate_interval])", + "expr": "sum by(device) (rate(node_network_receive_bytes_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "rx", @@ -616,7 +623,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "rate(node_network_transmit_bytes_total{device=\"enp8s0\", instance=~\"$Instance\"}[$__rate_interval])", + "expr": "sum by(device) (rate(node_network_transmit_bytes_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -690,7 +697,8 @@ } ] }, - "unit": "percent" + "unit": "percent", + "unitScale": true }, "overrides": [] }, @@ -792,7 +800,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -840,7 +849,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "node_sockstat_TCP6_inuse{instance=\"localhost:9100\"}", + "expr": "node_sockstat_TCP6_inuse{instance=~\"$Instance\"}", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -907,7 +916,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -980,6 +990,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 34000000, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -1021,228 +1032,8 @@ } ] }, - "unit": "none" - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "443" - }, - "properties": [ - { - "id": "custom.axisLabel", - "value": "tor1" - }, - { - "id": "custom.axisLabel", - "value": "" - } - ] - } - ] - }, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 33 - }, - "id": 74, - "options": { - "legend": { - "calcs": [], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Name", - "sortDesc": false, - "width": 80 - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum by(nickname, family, direction) (tor_relay_connections{family=\"ipv4\", direction=\"initiated\", nickname=~\"$Nickname\"})", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "{{nickname}}", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Connections Initiated IPv4", - "type": "timeseries" - }, - { - "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, - "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": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 33 - }, - "id": 75, - "options": { - "legend": { - "calcs": [], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "width": 80 - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum by(family, direction, nickname) (tor_relay_connections{family=\"ipv6\", direction=\"initiated\", nickname=~\"$Nickname\"})", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "{{nickname}}", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Connections Initiated IPv6", - "type": "timeseries" - }, - { - "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, - "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": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" + "unit": "binBps", + "unitScale": true }, "overrides": [] }, @@ -1250,209 +1041,7 @@ "h": 7, "w": 12, "x": 0, - "y": 40 - }, - "id": 73, - "options": { - "legend": { - "calcs": [], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "width": 80 - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum by(family, direction, nickname) (tor_relay_connections{family=\"ipv4\", direction=\"received\", nickname=~\"$Nickname\"})", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "{{nickname}}", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Connections Received IPv4", - "type": "timeseries" - }, - { - "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, - "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": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 40 - }, - "id": 95, - "options": { - "legend": { - "calcs": [], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "width": 80 - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "sum by(family, direction, nickname) (tor_relay_connections{family=\"ipv6\", direction=\"received\", nickname=~\"$Nickname\"})", - "fullMetaSearch": false, - "includeNullMetadata": true, - "legendFormat": "{{nickname}}", - "range": true, - "refId": "A", - "useBackend": false - } - ], - "title": "Connections Received IPv6", - "type": "timeseries" - }, - { - "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, - "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": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "binBps" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 47 + "y": 33 }, "id": 94, "options": { @@ -1476,7 +1065,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname, direction) (rate(tor_relay_traffic_bytes{direction=\"read\", nickname=~\"$Nickname\"}[$__rate_interval]))", + "expr": "sum by(nickname, direction) (rate(tor_relay_traffic_bytes{direction=\"read\", nickname=~\"$Nickname\", instance=~\"$Nickname\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -1545,7 +1134,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1553,7 +1143,7 @@ "h": 7, "w": 12, "x": 12, - "y": 47 + "y": 33 }, "id": 2, "options": { @@ -1577,7 +1167,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "max by(nickname, state) (tor_relay_load_socket_total{state=\"opened\", nickname=~\"$Nickname\"})", + "expr": "max by(nickname, state) (tor_relay_load_socket_total{state=\"opened\", nickname=~\"$Nickname\", instance=~\"$Nickname\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{label_name}}{{nickname}}", @@ -1605,6 +1195,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 34000000, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -1646,7 +1237,8 @@ } ] }, - "unit": "binBps" + "unit": "binBps", + "unitScale": true }, "overrides": [] }, @@ -1654,7 +1246,7 @@ "h": 7, "w": 12, "x": 0, - "y": 54 + "y": 40 }, "id": 87, "options": { @@ -1678,7 +1270,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(nickname, direction) (rate(tor_relay_traffic_bytes{direction=\"written\", nickname=~\"$Nickname\"}[$__rate_interval]))", + "expr": "sum by(nickname, direction) (rate(tor_relay_traffic_bytes{direction=\"written\", nickname=~\"$Nickname\", instance=~\"$Nickname\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -1696,7 +1288,7 @@ "h": 1, "w": 24, "x": 0, - "y": 61 + "y": 47 }, "id": 37, "panels": [], @@ -1760,7 +1352,8 @@ } ] }, - "unit": "pps" + "unit": "pps", + "unitScale": true }, "overrides": [] }, @@ -1768,7 +1361,7 @@ "h": 7, "w": 12, "x": 0, - "y": 62 + "y": 48 }, "id": 79, "options": { @@ -1878,7 +1471,8 @@ } ] }, - "unit": "pps" + "unit": "pps", + "unitScale": true }, "overrides": [] }, @@ -1886,7 +1480,7 @@ "h": 7, "w": 12, "x": 12, - "y": 62 + "y": 48 }, "id": 80, "options": { @@ -1996,7 +1590,8 @@ } ] }, - "unit": "pps" + "unit": "pps", + "unitScale": true }, "overrides": [] }, @@ -2004,7 +1599,7 @@ "h": 7, "w": 12, "x": 0, - "y": 69 + "y": 55 }, "id": 24, "options": { @@ -2114,7 +1709,8 @@ } ] }, - "unit": "pps" + "unit": "pps", + "unitScale": true }, "overrides": [] }, @@ -2122,7 +1718,7 @@ "h": 7, "w": 12, "x": 12, - "y": 69 + "y": 55 }, "id": 81, "options": { @@ -2241,9 +1837,9 @@ "h": 7, "w": 12, "x": 0, - "y": 76 + "y": 62 }, - "id": 30, + "id": 27, "options": { "legend": { "calcs": [], @@ -2265,7 +1861,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_ipset_total{ipver=\"4\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", + "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -2274,7 +1870,7 @@ "useBackend": false } ], - "title": "Ipset DDoS IPv4", + "title": "Hashlimit DDoS IPv4", "type": "timeseries" }, { @@ -2343,9 +1939,9 @@ "h": 7, "w": 12, "x": 12, - "y": 76 + "y": 62 }, - "id": 31, + "id": 28, "options": { "legend": { "calcs": [], @@ -2367,7 +1963,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_ipset_total{ipver=\"6\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", + "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -2376,7 +1972,7 @@ "useBackend": false } ], - "title": "Ipset DDoS IPv6", + "title": "Hashlimit DDoS IPv6", "type": "timeseries" }, { @@ -2445,9 +2041,9 @@ "h": 7, "w": 12, "x": 0, - "y": 83 + "y": 69 }, - "id": 27, + "id": 30, "options": { "legend": { "calcs": [], @@ -2469,7 +2065,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"4\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", + "expr": "torutils_ipset_total{ipver=\"4\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -2478,7 +2074,7 @@ "useBackend": false } ], - "title": "Hashlimit DDoS IPv4", + "title": "Ipset DDoS IPv4", "type": "timeseries" }, { @@ -2547,9 +2143,9 @@ "h": 7, "w": 12, "x": 12, - "y": 83 + "y": 69 }, - "id": 28, + "id": 31, "options": { "legend": { "calcs": [], @@ -2571,7 +2167,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "torutils_hashlimit_total{ipver=\"6\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", + "expr": "torutils_ipset_total{ipver=\"6\", mode=\"ddos\", nickname=~\"$Nickname\", instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{nickname}}", @@ -2580,7 +2176,7 @@ "useBackend": false } ], - "title": "Hashlimit DDoS IPv6", + "title": "Ipset DDoS IPv6", "type": "timeseries" }, { @@ -2649,7 +2245,7 @@ "h": 7, "w": 12, "x": 0, - "y": 90 + "y": 76 }, "id": 91, "options": { @@ -2751,7 +2347,7 @@ "h": 7, "w": 12, "x": 12, - "y": 90 + "y": 76 }, "id": 92, "options": { @@ -2793,7 +2389,7 @@ "h": 1, "w": 24, "x": 0, - "y": 97 + "y": 83 }, "id": 39, "panels": [], @@ -2826,9 +2422,9 @@ "h": 5, "w": 12, "x": 0, - "y": 98 + "y": 84 }, - "id": 41, + "id": 95, "options": { "displayMode": "gradient", "maxVizHeight": 300, @@ -2896,7 +2492,7 @@ "h": 5, "w": 12, "x": 12, - "y": 98 + "y": 84 }, "id": 44, "options": { @@ -2966,7 +2562,7 @@ "h": 5, "w": 12, "x": 0, - "y": 103 + "y": 89 }, "id": 53, "options": { @@ -3036,7 +2632,7 @@ "h": 5, "w": 12, "x": 12, - "y": 103 + "y": 89 }, "id": 55, "options": { @@ -3106,7 +2702,7 @@ "h": 5, "w": 12, "x": 0, - "y": 108 + "y": 94 }, "id": 52, "options": { @@ -3176,7 +2772,7 @@ "h": 5, "w": 12, "x": 12, - "y": 108 + "y": 94 }, "id": 89, "options": { @@ -3246,7 +2842,7 @@ "h": 5, "w": 12, "x": 0, - "y": 113 + "y": 99 }, "id": 76, "options": { @@ -3316,7 +2912,7 @@ "h": 5, "w": 12, "x": 12, - "y": 113 + "y": 99 }, "id": 77, "options": { @@ -3386,7 +2982,7 @@ "h": 5, "w": 12, "x": 0, - "y": 118 + "y": 104 }, "id": 88, "options": { @@ -3456,7 +3052,7 @@ "h": 5, "w": 12, "x": 12, - "y": 118 + "y": 104 }, "id": 54, "options": { @@ -3565,6 +3161,6 @@ "timezone": "utc", "title": "Tor DDoS", "uid": "FgvRNta4k", - "version": 408, + "version": 426, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/tor-relay.json b/dashboards/tor-relay.json index 8522960..c521286 100644 --- a/dashboards/tor-relay.json +++ b/dashboards/tor-relay.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.2.3" + "version": "10.3.1" }, { "type": "datasource", @@ -101,6 +101,7 @@ "liveNow": false, "panels": [ { + "collapsed": false, "gridPos": { "h": 1, "w": 24, @@ -108,6 +109,7 @@ "y": 0 }, "id": 22, + "panels": [], "title": "Overview", "type": "row" }, @@ -169,7 +171,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -272,7 +275,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -303,7 +307,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_relay_load_socket_total{instance=~\"$Instance\", state=\"opened\"})", + "expr": "avg by(instance, state) (tor_relay_load_socket_total{instance=~\"$Instance\", state=~\"$State_load_socket_tot\"})", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -313,7 +317,7 @@ "useBackend": false } ], - "title": "Load Sockets (state == opened)", + "title": "Load Sockets", "type": "timeseries" }, { @@ -373,7 +377,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -474,7 +479,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -575,7 +581,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -606,7 +613,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_relay_circuits_total{instance=~\"$Instance\", state=\"opened\"}[$__rate_interval]))", + "expr": "sum by(instance, state) (rate(tor_relay_circuits_total{instance=~\"$Instance\", state=~\"$State_circ_tot\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -615,7 +622,7 @@ "useBackend": false } ], - "title": "Circuits (state == opened)", + "title": "Circuits", "type": "timeseries" }, { @@ -675,7 +682,7 @@ } ] }, - "unit": "short" + "unitScale": true }, "overrides": [] }, @@ -685,7 +692,7 @@ "x": 12, "y": 17 }, - "id": 9, + "id": 13, "options": { "legend": { "calcs": [], @@ -706,7 +713,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(type, direction, instance, family) (rate(tor_relay_connections{family=~\"$Family\", type=~\"$Type_conn\", instance=~\"$Instance\", direction=~\"$Dir_conn\", state=\"opened\"}[$__rate_interval]))", + "expr": "sum by(type, instance) (rate(tor_relay_streams_total{instance=~\"$Instance\", type=~\"$Type_stre\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -715,21 +722,109 @@ "useBackend": false } ], - "title": "Connection (state == opened)", + "title": "Streams", "type": "timeseries" }, { - "collapsed": false, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisWidth": 80, + "barAlignment": 0, + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [] + }, "gridPos": { - "h": 1, - "w": 24, + "h": 8, + "w": 12, "x": 0, "y": 25 }, - "id": 21, - "panels": [], - "title": "Details", - "type": "row" + "id": 30, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "sum by(instance) (rate(tor_relay_circ_proto_violation_total{instance=~\"$Instance\"}[$__rate_interval]))", + "fullMetaSearch": false, + "includeNullMetadata": false, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Circ Proto Violation", + "type": "timeseries" }, { "datasource": { @@ -747,6 +842,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -774,12 +870,14 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -787,17 +885,18 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 26 + "x": 12, + "y": 25 }, - "id": 16, + "id": 26, "options": { "legend": { "calcs": [], @@ -818,7 +917,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, type, instance) (rate(tor_relay_load_onionskins_total{instance=~\"$Instance\", action=~\"$Action_load\", type=~\"$Type_load\"}[$__rate_interval]))", + "expr": "avg by(instance) (tor_bug_reached{instance=~\"$Instance\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -827,7 +926,7 @@ "useBackend": false } ], - "title": "Load Onionskins", + "title": "Bug counter", "type": "timeseries" }, { @@ -878,7 +977,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -886,17 +986,18 @@ } ] }, - "unit": "short" + "unit": "none", + "unitScale": true }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 26 + "x": 0, + "y": 33 }, - "id": 15, + "id": 29, "options": { "legend": { "calcs": [], @@ -917,16 +1018,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, state, instance, state) (rate(tor_relay_congestion_control{instance=~\"$Instance\", state=~\"$State_cong\", action=~\"$Action_cong\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(tor_relay_destroy_cell_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Congestion Control", + "title": "Destroy Cell Total", "type": "timeseries" }, { @@ -977,7 +1078,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -985,17 +1087,18 @@ } ] }, - "unit": "none" + "unit": "bool_yes_no", + "unitScale": true }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 34 + "x": 12, + "y": 33 }, - "id": 1, + "id": 27, "options": { "legend": { "calcs": [], @@ -1016,16 +1119,17 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance, action) (rate(tor_relay_intro1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", + "expr": "tor_relay_flag{instance=~\"$Instance\", type=~\"$Flag\"}", "fullMetaSearch": false, "includeNullMetadata": true, + "instant": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Intro1", + "title": "Flags", "type": "timeseries" }, { @@ -1076,7 +1180,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1084,17 +1189,18 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 34 + "x": 0, + "y": 41 }, - "id": 2, + "id": 28, "options": { "legend": { "calcs": [], @@ -1115,18 +1221,31 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(action, instance, state) (rate(tor_relay_congestion_control_total{instance=~\"$Instance\", action=~\"$Action_cong_tot\", state=~\"$State_cong_tot\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(tor_relay_drop_cell_total{instance=~\"$Instance\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Congestion Control Total", + "title": "Drop Cell Total", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 49 + }, + "id": 21, + "panels": [], + "title": "Details", + "type": "row" + }, { "datasource": { "type": "prometheus", @@ -1170,13 +1289,13 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1184,7 +1303,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1192,9 +1312,9 @@ "h": 8, "w": 12, "x": 0, - "y": 42 + "y": 50 }, - "id": 12, + "id": 16, "options": { "legend": { "calcs": [], @@ -1215,7 +1335,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(action, instance) (rate(tor_relay_rend1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", + "expr": "sum by(action, type, instance) (rate(tor_relay_load_onionskins_total{instance=~\"$Instance\", action=~\"$Action_load\", type=~\"$Type_load\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1224,7 +1344,7 @@ "useBackend": false } ], - "title": "Rend1", + "title": "Load Onionskins", "type": "timeseries" }, { @@ -1275,14 +1395,17 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", "value": 80 } ] - } + }, + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1290,9 +1413,9 @@ "h": 8, "w": 12, "x": 12, - "y": 42 + "y": 50 }, - "id": 13, + "id": 2, "options": { "legend": { "calcs": [], @@ -1313,7 +1436,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(type, instance) (rate(tor_relay_streams_total{instance=~\"$Instance\", type=~\"$Type_stre\"}[$__rate_interval]))", + "expr": "avg by(action, instance, state) (rate(tor_relay_congestion_control_total{instance=~\"$Instance\", action=~\"$Action_cong_tot\", state=~\"$State_cong_tot\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1322,7 +1445,7 @@ "useBackend": false } ], - "title": "Streams", + "title": "Congestion Control Total", "type": "timeseries" }, { @@ -1373,7 +1496,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1381,7 +1505,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1389,7 +1514,7 @@ "h": 8, "w": 12, "x": 0, - "y": 50 + "y": 58 }, "id": 3, "options": { @@ -1472,7 +1597,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1480,7 +1606,8 @@ } ] }, - "unit": "none" + "unit": "short", + "unitScale": true }, "overrides": [] }, @@ -1488,9 +1615,9 @@ "h": 8, "w": 12, "x": 12, - "y": 50 + "y": 58 }, - "id": 4, + "id": 9, "options": { "legend": { "calcs": [], @@ -1511,7 +1638,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(action, instance) (rate(tor_relay_est_rend_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", + "expr": "sum by(type, direction, instance, family, state) (rate(tor_relay_connections{family=~\"$Family\", type=~\"$Type_conn\", instance=~\"$Instance\", direction=~\"$Dir_conn\", state=~\"$State_conn\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1520,7 +1647,7 @@ "useBackend": false } ], - "title": "Est Rend", + "title": "Connection", "type": "timeseries" }, { @@ -1579,7 +1706,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1587,9 +1715,9 @@ "h": 8, "w": 12, "x": 0, - "y": 58 + "y": 66 }, - "id": 17, + "id": 4, "options": { "legend": { "calcs": [], @@ -1610,7 +1738,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(reason, instance) (tor_relay_exit_dns_error_total{instance=~\"$Instance\", reason=~\"$Reason\"})", + "expr": "avg by(action, instance) (rate(tor_relay_est_rend_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1619,7 +1747,7 @@ "useBackend": false } ], - "title": "Exit Dns Error", + "title": "Est Rend", "type": "timeseries" }, { @@ -1678,7 +1806,8 @@ } ] }, - "unit": "none" + "unit": "short", + "unitScale": true }, "overrides": [] }, @@ -1686,9 +1815,9 @@ "h": 8, "w": 12, "x": 12, - "y": 58 + "y": 66 }, - "id": 7, + "id": 15, "options": { "legend": { "calcs": [], @@ -1709,16 +1838,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_relay_load_tcp_exhaustion_total{instance=~\"$Instance\"})", + "expr": "sum by(action, state, instance, state) (rate(tor_relay_congestion_control{instance=~\"$Instance\", state=~\"$State_cong\", action=~\"$Action_cong\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Load Tcp Exhaustion", + "title": "Congestion Control", "type": "timeseries" }, { @@ -1764,6 +1893,7 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -1777,7 +1907,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1785,9 +1916,9 @@ "h": 8, "w": 12, "x": 0, - "y": 66 + "y": 74 }, - "id": 19, + "id": 12, "options": { "legend": { "calcs": [], @@ -1808,16 +1939,16 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_relay_exit_dns_query_total{instance=~\"$Instance\"})", + "expr": "sum by(action, instance) (rate(tor_relay_rend1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Exit Dns Query", + "title": "Rend1", "type": "timeseries" }, { @@ -1876,7 +2007,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1884,9 +2016,9 @@ "h": 8, "w": 12, "x": 12, - "y": 66 + "y": 74 }, - "id": 11, + "id": 1, "options": { "legend": { "calcs": [], @@ -1907,7 +2039,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_relay_load_global_rate_limit_reached_total{instance=~\"$Instance\"})", + "expr": "sum by(instance, action) (rate(tor_relay_intro1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -1916,7 +2048,7 @@ "useBackend": false } ], - "title": "Load Global Rate Limit Reached", + "title": "Intro1", "type": "timeseries" }, { @@ -1975,7 +2107,8 @@ } ] }, - "unit": "bytes" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1983,9 +2116,9 @@ "h": 8, "w": 12, "x": 0, - "y": 74 + "y": 82 }, - "id": 5, + "id": 17, "options": { "legend": { "calcs": [], @@ -2006,7 +2139,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(subsys, instance) (tor_relay_load_oom_bytes_total{instance=~\"$Instance\", subsys=~\"$Subsys\"})", + "expr": "avg by(reason, instance) (tor_relay_exit_dns_error_total{instance=~\"$Instance\", reason=~\"$Reason\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -2015,7 +2148,7 @@ "useBackend": false } ], - "title": "Load Oom Bytes", + "title": "Exit Dns Error", "type": "timeseries" }, { @@ -2034,7 +2167,6 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", @@ -2062,7 +2194,6 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -2076,7 +2207,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -2084,9 +2216,9 @@ "h": 8, "w": 12, "x": 12, - "y": 74 + "y": 82 }, - "id": 26, + "id": 7, "options": { "legend": { "calcs": [], @@ -2107,24 +2239,324 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "avg by(instance) (tor_bug_reached{instance=~\"$Instance\"})", + "expr": "avg by(instance) (tor_relay_load_tcp_exhaustion_total{instance=~\"$Instance\"})", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], - "title": "Bug counter", + "title": "Load Tcp Exhaustion", "type": "timeseries" - } - ], - "refresh": "5m", - "schemaVersion": 39, - "tags": [], - "templating": { - "list": [ + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisWidth": 80, + "barAlignment": 0, + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 90 + }, + "id": 19, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "avg by(instance) (tor_relay_exit_dns_query_total{instance=~\"$Instance\"})", + "fullMetaSearch": false, + "includeNullMetadata": false, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Exit Dns Query", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisWidth": 80, + "barAlignment": 0, + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 90 + }, + "id": 5, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "avg by(subsys, instance) (tor_relay_load_oom_bytes_total{instance=~\"$Instance\", subsys=~\"$Subsys\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Load Oom Bytes", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisWidth": 80, + "barAlignment": 0, + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 98 + }, + "id": 11, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "avg by(instance) (tor_relay_load_global_rate_limit_reached_total{instance=~\"$Instance\"})", + "fullMetaSearch": false, + "includeNullMetadata": true, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Load Global Rate Limit Reached", + "type": "timeseries" + } + ], + "refresh": "5m", + "schemaVersion": 39, + "tags": [], + "templating": { + "list": [ { "current": {}, "datasource": { @@ -2195,6 +2627,30 @@ "sort": 0, "type": "query" }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(tor_relay_flag,type)", + "hide": 0, + "includeAll": true, + "label": "Flag", + "multi": false, + "name": "Flag", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(tor_relay_flag,type)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, { "current": {}, "datasource": { @@ -2356,6 +2812,30 @@ "sort": 1, "type": "query" }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "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": { + "qryType": 1, + "query": "label_values(tor_relay_circuits_total,state)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": {}, "datasource": { @@ -2402,6 +2882,30 @@ "sort": 1, "type": "query" }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(tor_relay_connections,state)", + "hide": 0, + "includeAll": true, + "label": "State conn", + "multi": false, + "name": "State_conn", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(tor_relay_connections,state)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": {}, "datasource": { @@ -2426,6 +2930,30 @@ "sort": 1, "type": "query" }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "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": { + "qryType": 1, + "query": "label_values(tor_relay_load_socket_total,state)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": {}, "datasource": { @@ -2544,13 +3072,13 @@ ] }, "time": { - "from": "now-7d", + "from": "now-3h", "to": "now" }, "timepicker": {}, "timezone": "", "title": "Tor Relay", "uid": "bb0ac200-1fab-4d04-a3b0-859d35ec9ee6", - "version": 259, + "version": 285, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/tor-snowflake-1m.json b/dashboards/tor-snowflake-1m.json index 2fb2f35..6b984d8 100644 --- a/dashboards/tor-snowflake-1m.json +++ b/dashboards/tor-snowflake-1m.json @@ -7,14 +7,6 @@ "type": "datasource", "pluginId": "prometheus", "pluginName": "Prometheus" - }, - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" } ], "__elements": {}, @@ -23,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.2.3" + "version": "10.3.1" }, { "type": "datasource", @@ -55,7 +47,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${DS_PROMETHEUS-1M}" }, "enable": true, "expr": "changes(node_boot_time_seconds[$__rate_interval])", @@ -112,6 +104,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 0.5, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -140,7 +133,6 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -155,7 +147,8 @@ } ] }, - "unit": "none" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -165,7 +158,7 @@ "x": 0, "y": 0 }, - "id": 1, + "id": 7, "options": { "legend": { "calcs": [], @@ -186,7 +179,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\"}[1h])) * 3600", + "expr": "sum by(instance) (rate(process_cpu_seconds_total{instance=~\"$Instance\"}[1h]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -196,7 +189,7 @@ "useBackend": false } ], - "title": "Proxy Connections / hr", + "title": "CPU seconds (in perc)", "type": "timeseries" }, { @@ -215,6 +208,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 300, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -243,6 +237,7 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -257,7 +252,8 @@ } ] }, - "unit": "percentunit" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -267,7 +263,7 @@ "x": 12, "y": 0 }, - "id": 7, + "id": 4, "options": { "legend": { "calcs": [], @@ -288,9 +284,9 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(process_cpu_seconds_total{instance=~\"$Instance\"}[$__rate_interval]))", + "expr": "process_open_fds{instance=~\"$Instance\"}", "fullMetaSearch": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "instant": false, "legendFormat": "{{instance}}", "range": true, @@ -298,7 +294,7 @@ "useBackend": false } ], - "title": "CPU seconds (in perc)", + "title": "Open Fds", "type": "timeseries" }, { @@ -317,6 +313,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 120, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -345,8 +342,8 @@ "mode": "off" } }, + "decimals": 0, "mappings": [], - "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -360,7 +357,8 @@ } ] }, - "unit": "KiBs" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -370,7 +368,7 @@ "x": 0, "y": 8 }, - "id": 3, + "id": 1, "options": { "legend": { "calcs": [], @@ -391,7 +389,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_connections_total{instance=~\"$Instance\"}[1h])) * 3600", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -401,7 +399,7 @@ "useBackend": false } ], - "title": "Traffic Inbound", + "title": "Proxy Connections per hr", "type": "timeseries" }, { @@ -420,8 +418,8 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 110000000, "axisSoftMin": 0, - "axisWidth": 80, "barAlignment": 0, "drawStyle": "line", "fillOpacity": 0, @@ -448,7 +446,6 @@ "mode": "off" } }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -463,7 +460,8 @@ } ] }, - "unit": "none" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -473,7 +471,7 @@ "x": 12, "y": 8 }, - "id": 4, + "id": 6, "options": { "legend": { "calcs": [], @@ -494,7 +492,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "process_open_fds{instance=~\"$Instance\"}", + "expr": "process_resident_memory_bytes{instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -504,7 +502,7 @@ "useBackend": false } ], - "title": "Open Fds", + "title": "Process Resident Memory", "type": "timeseries" }, { @@ -523,6 +521,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 3500, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -566,7 +565,8 @@ } ] }, - "unit": "KiBs" + "unit": "KiBs", + "unitScale": true }, "overrides": [] }, @@ -576,7 +576,7 @@ "x": 0, "y": 16 }, - "id": 5, + "id": 3, "options": { "legend": { "calcs": [], @@ -597,7 +597,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\"}[$__rate_interval]))", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_inbound_bytes_total{instance=~\"$Instance\", job=~\"$Job\"}[5m]))", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -607,7 +607,7 @@ "useBackend": false } ], - "title": "Traffic Outbound", + "title": "Traffic Inbound", "type": "timeseries" }, { @@ -626,6 +626,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 1500000000, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -668,7 +669,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -678,7 +680,7 @@ "x": 12, "y": 16 }, - "id": 6, + "id": 8, "options": { "legend": { "calcs": [], @@ -699,7 +701,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "process_resident_memory_bytes{instance=~\"$Instance\"}", + "expr": "process_virtual_memory_bytes{instance=~\"$Instance\"}", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -709,7 +711,7 @@ "useBackend": false } ], - "title": "Process Resident Memory", + "title": "Process Virtual Memory", "type": "timeseries" }, { @@ -728,6 +730,7 @@ "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 1025, "axisSoftMin": 0, "axisWidth": 80, "barAlignment": 0, @@ -757,12 +760,12 @@ } }, "mappings": [], + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -770,17 +773,17 @@ } ] }, - "unit": "bytes" + "unit": "KiBs" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, + "x": 0, "y": 24 }, - "id": 8, + "id": 5, "options": { "legend": { "calcs": [], @@ -801,9 +804,9 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "process_virtual_memory_bytes{instance=~\"$Instance\"}", + "expr": "sum by(instance) (rate(tor_snowflake_proxy_traffic_outbound_bytes_total{instance=~\"$Instance\"}[5m]))", "fullMetaSearch": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "instant": false, "legendFormat": "{{instance}}", "range": true, @@ -811,11 +814,11 @@ "useBackend": false } ], - "title": "Process Virtual Memory", + "title": "Traffic Outbound", "type": "timeseries" } ], - "refresh": "5m", + "refresh": "", "schemaVersion": 39, "tags": [], "templating": { @@ -828,7 +831,7 @@ }, "definition": "label_values(tor_snowflake_proxy_connections_total{job=\"Tor-Snowflake-1m\"},job)", "hide": 0, - "includeAll": false, + "includeAll": true, "label": "Job", "multi": false, "name": "Job", @@ -877,6 +880,6 @@ "timezone": "", "title": "Tor Snowflake 1m", "uid": "b1cf61bb-53e2-44e9-9f96-af33116dee8a", - "version": 33, + "version": 48, "weekStart": "" } \ No newline at end of file