From 2f49aae2b73860e3de936f77b66129cd0a3c26c4 Mon Sep 17 00:00:00 2001 From: Simon-Pierre Vivier Date: Tue, 22 Apr 2025 08:37:11 -0400 Subject: [PATCH] feat: Waku Sync dashboard new panel & update (#3379) --- metrics/waku-fleet-dashboard.json | 816 ++++++++++++++------- waku/waku_store_sync/protocols_metrics.nim | 6 +- waku/waku_store_sync/reconciliation.nim | 10 +- waku/waku_store_sync/transfer.nim | 4 +- 4 files changed, 570 insertions(+), 266 deletions(-) diff --git a/metrics/waku-fleet-dashboard.json b/metrics/waku-fleet-dashboard.json index ad9ef040a..230fcc8d0 100644 --- a/metrics/waku-fleet-dashboard.json +++ b/metrics/waku-fleet-dashboard.json @@ -55,7 +55,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -139,7 +140,8 @@ "mode": "absolute", "steps": [ { - "color": "blue" + "color": "blue", + "value": null } ] }, @@ -209,7 +211,8 @@ "mode": "percentage", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -292,7 +295,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -310,7 +314,7 @@ "properties": [ { "id": "custom.width", - "value": 122 + "value": 166 } ] }, @@ -430,7 +434,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -445,7 +450,7 @@ "h": 9, "w": 12, "x": 0, - "y": 145 + "y": 1312 }, "id": 81, "options": { @@ -526,7 +531,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -541,7 +547,7 @@ "h": 9, "w": 12, "x": 12, - "y": 145 + "y": 1312 }, "id": 82, "options": { @@ -624,7 +630,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -640,7 +647,7 @@ "h": 9, "w": 12, "x": 0, - "y": 154 + "y": 1321 }, "id": 78, "interval": "15s", @@ -727,7 +734,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -743,7 +751,7 @@ "h": 9, "w": 12, "x": 12, - "y": 154 + "y": 1321 }, "id": 79, "options": { @@ -827,7 +835,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -843,7 +852,7 @@ "h": 10, "w": 12, "x": 0, - "y": 192 + "y": 1330 }, "id": 124, "options": { @@ -931,7 +940,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -947,7 +957,7 @@ "h": 10, "w": 12, "x": 12, - "y": 192 + "y": 1330 }, "id": 126, "options": { @@ -982,6 +992,204 @@ "title": "Relay traffic per shard (out) - average of all peers", "type": "timeseries" }, + { + "datasource": { + "type": "prometheus", + "uid": "P6693426190CB2316" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 10, + "w": 12, + "x": 0, + "y": 1340 + }, + "id": 169, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": false, + "expr": "avg by (protocol)(waku_connected_peers{direction=\"In\", instance=~\"[[host]].([[dc:pipe]]).([[fleet:pipe]])\"})", + "instant": false, + "legendFormat": "{{protocol}}", + "range": true, + "refId": "A" + } + ], + "title": "# peers per protocol (in)", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "P6693426190CB2316" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "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": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 10, + "w": 12, + "x": 12, + "y": 1340 + }, + "id": 170, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": false, + "expr": "avg by (protocol)(waku_connected_peers{direction=\"Out\", instance=~\"[[host]].([[dc:pipe]]).([[fleet:pipe]])\"})", + "instant": false, + "legendFormat": "{{protocol}}", + "range": true, + "refId": "A" + } + ], + "title": "# peers per protocol (out)", + "type": "timeseries" + }, { "datasource": { "type": "prometheus", @@ -1032,7 +1240,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1048,7 +1257,7 @@ "h": 9, "w": 12, "x": 0, - "y": 202 + "y": 1350 }, "id": 11, "options": { @@ -1131,7 +1340,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1146,7 +1356,7 @@ "h": 9, "w": 12, "x": 12, - "y": 202 + "y": 1350 }, "id": 54, "options": { @@ -1229,7 +1439,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1244,7 +1455,7 @@ "h": 8, "w": 12, "x": 0, - "y": 211 + "y": 1359 }, "id": 66, "options": { @@ -1325,7 +1536,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1340,7 +1552,7 @@ "h": 9, "w": 12, "x": 12, - "y": 211 + "y": 1359 }, "id": 122, "options": { @@ -1454,7 +1666,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1463,38 +1676,13 @@ ] } }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "store-02.ac-cn-hongkong-c.status.staging:v0.34.0-rc.1" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 220 + "y": 1368 }, "id": 68, "options": { @@ -1592,7 +1780,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1607,7 +1796,7 @@ "h": 6, "w": 12, "x": 0, - "y": 396 + "y": 2 }, "id": 48, "options": { @@ -1688,7 +1877,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1703,7 +1893,7 @@ "h": 6, "w": 12, "x": 12, - "y": 396 + "y": 2 }, "id": 50, "options": { @@ -1784,7 +1974,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1799,7 +1990,7 @@ "h": 6, "w": 12, "x": 0, - "y": 402 + "y": 343 }, "id": 60, "options": { @@ -1905,7 +2096,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1920,7 +2112,7 @@ "h": 6, "w": 12, "x": 12, - "y": 402 + "y": 343 }, "id": 8, "options": { @@ -2004,7 +2196,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2019,7 +2212,7 @@ "h": 6, "w": 12, "x": 0, - "y": 408 + "y": 349 }, "id": 2, "options": { @@ -2106,7 +2299,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2122,7 +2316,7 @@ "h": 6, "w": 12, "x": 12, - "y": 408 + "y": 349 }, "id": 83, "options": { @@ -2205,7 +2399,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2220,7 +2415,7 @@ "h": 6, "w": 12, "x": 0, - "y": 414 + "y": 355 }, "id": 3, "options": { @@ -2304,7 +2499,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2319,7 +2515,7 @@ "h": 6, "w": 12, "x": 12, - "y": 414 + "y": 355 }, "id": 9, "options": { @@ -2429,7 +2625,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2444,7 +2641,7 @@ "h": 6, "w": 12, "x": 0, - "y": 420 + "y": 361 }, "id": 6, "options": { @@ -2526,7 +2723,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2541,7 +2739,7 @@ "h": 6, "w": 12, "x": 12, - "y": 420 + "y": 361 }, "id": 7, "options": { @@ -2650,7 +2848,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2666,7 +2865,7 @@ "h": 8, "w": 12, "x": 0, - "y": 426 + "y": 367 }, "id": 44, "options": { @@ -2772,7 +2971,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2788,7 +2988,7 @@ "h": 6, "w": 12, "x": 12, - "y": 426 + "y": 367 }, "id": 10, "options": { @@ -2871,7 +3071,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2881,38 +3082,13 @@ }, "unit": "decbytes" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "boot-01.ac-cn-hongkong-c.status.staging seq[byte]" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 432 + "y": 373 }, "id": 64, "options": { @@ -2999,7 +3175,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3014,7 +3191,7 @@ "h": 6, "w": 12, "x": 0, - "y": 434 + "y": 375 }, "id": 4, "options": { @@ -3096,7 +3273,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3111,7 +3289,7 @@ "h": 6, "w": 12, "x": 12, - "y": 440 + "y": 381 }, "id": 5, "options": { @@ -3207,7 +3385,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3222,7 +3401,7 @@ "h": 8, "w": 8, "x": 0, - "y": 447 + "y": 3 }, "id": 159, "options": { @@ -3246,7 +3425,7 @@ "uid": "P6693426190CB2316" }, "editorMode": "code", - "expr": "waku_rln_proofs_generated_total{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"}", + "expr": "waku_rln_total_generated_proofs", "legendFormat": "{{instance}}", "range": true, "refId": "A" @@ -3303,7 +3482,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3318,7 +3498,7 @@ "h": 8, "w": 8, "x": 8, - "y": 447 + "y": 3 }, "id": 117, "options": { @@ -3400,7 +3580,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3415,7 +3596,7 @@ "h": 8, "w": 8, "x": 16, - "y": 447 + "y": 3 }, "id": 160, "options": { @@ -3439,7 +3620,7 @@ "uid": "P6693426190CB2316" }, "editorMode": "code", - "expr": "waku_rln_proofs_remaining{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"}", + "expr": "waku_rln_remaining_proofs_per_epoch", "legendFormat": "{{instance}}", "range": true, "refId": "A" @@ -3496,7 +3677,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3512,7 +3694,7 @@ "h": 8, "w": 12, "x": 0, - "y": 455 + "y": 306 }, "id": 119, "options": { @@ -3593,7 +3775,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3608,7 +3791,7 @@ "h": 8, "w": 12, "x": 12, - "y": 455 + "y": 306 }, "id": 121, "options": { @@ -3689,7 +3872,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3704,7 +3888,7 @@ "h": 8, "w": 8, "x": 0, - "y": 463 + "y": 314 }, "id": 113, "options": { @@ -3786,7 +3970,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3801,7 +3986,7 @@ "h": 8, "w": 8, "x": 8, - "y": 463 + "y": 314 }, "id": 115, "options": { @@ -3908,7 +4093,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3923,7 +4109,7 @@ "h": 6, "w": 12, "x": 0, - "y": 472 + "y": 4 }, "id": 36, "options": { @@ -4004,7 +4190,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4019,7 +4206,7 @@ "h": 6, "w": 12, "x": 12, - "y": 472 + "y": 4 }, "id": 38, "options": { @@ -4115,7 +4302,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4130,7 +4318,7 @@ "h": 6, "w": 12, "x": 0, - "y": 478 + "y": 212 }, "id": 62, "options": { @@ -4213,7 +4401,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4228,7 +4417,7 @@ "h": 6, "w": 12, "x": 12, - "y": 478 + "y": 212 }, "id": 40, "options": { @@ -4329,7 +4518,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4341,7 +4531,7 @@ "h": 11, "w": 12, "x": 0, - "y": 484 + "y": 218 }, "id": 144, "options": { @@ -4433,7 +4623,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4445,7 +4636,7 @@ "h": 11, "w": 12, "x": 12, - "y": 484 + "y": 218 }, "id": 145, "options": { @@ -4538,7 +4729,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4550,7 +4742,7 @@ "h": 8, "w": 12, "x": 0, - "y": 495 + "y": 229 }, "id": 146, "options": { @@ -4642,7 +4834,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4654,7 +4847,7 @@ "h": 8, "w": 12, "x": 12, - "y": 495 + "y": 229 }, "id": 148, "options": { @@ -4746,7 +4939,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4758,7 +4952,7 @@ "h": 8, "w": 12, "x": 0, - "y": 503 + "y": 237 }, "id": 158, "options": { @@ -4849,7 +5043,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4861,7 +5056,7 @@ "h": 8, "w": 12, "x": 12, - "y": 503 + "y": 237 }, "id": 157, "options": { @@ -4951,7 +5146,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4963,7 +5159,7 @@ "h": 8, "w": 12, "x": 0, - "y": 511 + "y": 245 }, "id": 149, "options": { @@ -5049,7 +5245,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -5086,7 +5283,7 @@ "h": 8, "w": 12, "x": 12, - "y": 511 + "y": 245 }, "id": 147, "options": { @@ -5148,7 +5345,7 @@ "h": 7, "w": 12, "x": 0, - "y": 519 + "y": 253 }, "id": 77, "maxDataPoints": 60, @@ -5247,7 +5444,7 @@ "h": 7, "w": 12, "x": 12, - "y": 519 + "y": 253 }, "id": 75, "maxDataPoints": 60, @@ -5393,7 +5590,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5409,7 +5607,7 @@ "h": 13, "w": 12, "x": 0, - "y": 526 + "y": 260 }, "id": 142, "options": { @@ -5494,7 +5692,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5510,7 +5709,7 @@ "h": 13, "w": 12, "x": 12, - "y": 526 + "y": 260 }, "id": 130, "options": { @@ -5558,11 +5757,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -5571,6 +5772,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -5592,7 +5794,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5608,7 +5811,7 @@ "h": 13, "w": 12, "x": 0, - "y": 539 + "y": 273 }, "id": 132, "options": { @@ -5624,10 +5827,12 @@ "sortDesc": false }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -5656,11 +5861,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -5669,6 +5876,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -5690,7 +5898,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5706,7 +5915,7 @@ "h": 13, "w": 12, "x": 12, - "y": 539 + "y": 273 }, "id": 143, "options": { @@ -5722,10 +5931,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -5754,11 +5965,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -5767,6 +5980,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -5788,7 +6002,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5804,7 +6019,7 @@ "h": 13, "w": 12, "x": 0, - "y": 552 + "y": 286 }, "id": 128, "options": { @@ -5820,10 +6035,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -5852,11 +6069,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -5865,6 +6084,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -5886,7 +6106,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -5902,7 +6123,7 @@ "h": 13, "w": 12, "x": 12, - "y": 552 + "y": 286 }, "id": 141, "options": { @@ -5918,10 +6139,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -6006,14 +6229,10 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, - "unit": "binBps" + "unit": "deckbytes" }, "overrides": [] }, @@ -6046,7 +6265,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(direction, protocol) (rate(total_bytes_exchanged_sum[$__rate_interval]))", + "expr": "sum by(direction, protocol) (total_bytes_exchanged_total{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"})", "fullMetaSearch": false, "includeNullMetadata": false, "legendFormat": "__auto", @@ -6055,7 +6274,7 @@ "useBackend": false } ], - "title": "Bytes Exchanged Rate", + "title": "Bytes Exchanged", "type": "timeseries" }, { @@ -6063,7 +6282,7 @@ "type": "prometheus", "uid": "P6693426190CB2316" }, - "description": "the number of messages sent and received by the transfer protocol per second.", + "description": "the number of messages sent and received by the transfer protocol.", "fieldConfig": { "defaults": { "color": { @@ -6109,10 +6328,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -6148,7 +6363,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(direction) (rate(total_transfer_messages_exchanged_total[$__rate_interval]))", + "expr": "sum by(direction) (total_transfer_messages_exchanged_total{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"})", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -6157,7 +6372,7 @@ "useBackend": false } ], - "title": "Messages Exchanged Rate", + "title": "Messages Exchanged", "type": "timeseries" }, { @@ -6225,7 +6440,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": false, - "expr": "sum by(le) (reconciliation_roundtrips_bucket)", + "expr": "sum by(le) (reconciliation_roundtrips_bucket{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"})", "format": "heatmap", "fullMetaSearch": false, "hide": false, @@ -6240,6 +6455,78 @@ "title": "Distribution of Round-Trips per Reconciliation", "type": "bargauge" }, + { + "datasource": { + "type": "prometheus", + "uid": "P6693426190CB2316" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 13 + }, + "id": 171, + "options": { + "displayMode": "lcd", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "maxVizHeight": 300, + "minVizHeight": 16, + "minVizWidth": 8, + "namePlacement": "left", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showUnfilled": true, + "sizing": "auto", + "valueMode": "hidden" + }, + "pluginVersion": "11.5.2", + "targets": [ + { + "disableTextWrap": false, + "editorMode": "builder", + "expr": "sum by(le) (reconciliation_differences_bucket{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"})", + "format": "heatmap", + "fullMetaSearch": false, + "includeNullMetadata": true, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Distribution of differences per reconciliation.", + "type": "bargauge" + }, { "collapsed": true, "gridPos": { @@ -6298,7 +6585,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -6313,7 +6601,7 @@ "h": 8, "w": 8, "x": 0, - "y": 156 + "y": 51 }, "id": 93, "options": { @@ -6397,7 +6685,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -6412,7 +6701,7 @@ "h": 8, "w": 8, "x": 8, - "y": 156 + "y": 51 }, "id": 89, "options": { @@ -6493,7 +6782,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -6508,7 +6798,7 @@ "h": 8, "w": 8, "x": 16, - "y": 156 + "y": 51 }, "id": 91, "options": { @@ -6565,7 +6855,7 @@ "h": 8, "w": 12, "x": 0, - "y": 164 + "y": 59 }, "id": 95, "options": { @@ -6647,7 +6937,7 @@ "h": 8, "w": 12, "x": 12, - "y": 164 + "y": 59 }, "id": 97, "options": { @@ -6753,7 +7043,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -6763,39 +7054,13 @@ }, "unit": "reqps" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "boot-01.ac-cn-hongkong-c.status.prod - rejected", - "boot-01.ac-cn-hongkong-c.status.prod - served" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 13, "w": 12, "x": 0, - "y": 172 + "y": 67 }, "id": 134, "options": { @@ -6882,7 +7147,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -6898,7 +7164,7 @@ "h": 13, "w": 12, "x": 12, - "y": 172 + "y": 67 }, "id": 136, "options": { @@ -6996,7 +7262,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7011,7 +7278,7 @@ "h": 8, "w": 12, "x": 0, - "y": 82 + "y": 126 }, "id": 30, "options": { @@ -7092,7 +7359,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7107,7 +7375,7 @@ "h": 8, "w": 12, "x": 12, - "y": 82 + "y": 126 }, "id": 32, "options": { @@ -7189,7 +7457,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7205,7 +7474,7 @@ "h": 12, "w": 12, "x": 0, - "y": 129 + "y": 134 }, "id": 138, "options": { @@ -7292,7 +7561,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7308,7 +7578,7 @@ "h": 12, "w": 12, "x": 12, - "y": 129 + "y": 134 }, "id": 140, "options": { @@ -7371,11 +7641,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -7384,6 +7656,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -7405,7 +7678,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7421,7 +7695,7 @@ "h": 12, "w": 12, "x": 0, - "y": 760 + "y": 147 }, "id": 153, "options": { @@ -7437,10 +7711,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -7469,11 +7745,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -7482,6 +7760,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -7503,7 +7782,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7519,7 +7799,7 @@ "h": 12, "w": 12, "x": 12, - "y": 760 + "y": 147 }, "id": 154, "options": { @@ -7535,10 +7815,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -7571,7 +7853,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7587,13 +7870,21 @@ "h": 12, "w": 12, "x": 0, - "y": 772 + "y": 159 }, "id": 156, "options": { "displayMode": "basic", + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, + "namePlacement": "auto", "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -7602,9 +7893,11 @@ "fields": "", "values": false }, - "showUnfilled": true + "showUnfilled": true, + "sizing": "auto", + "valueMode": "color" }, - "pluginVersion": "9.2.5", + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -7633,11 +7926,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -7646,6 +7941,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -7667,7 +7963,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7683,7 +7980,7 @@ "h": 12, "w": 12, "x": 12, - "y": 772 + "y": 159 }, "id": 155, "options": { @@ -7699,10 +7996,12 @@ "sortDesc": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.2", "targets": [ { "datasource": { @@ -7782,7 +8081,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7797,7 +8097,7 @@ "h": 7, "w": 8, "x": 0, - "y": 84 + "y": 172 }, "id": 13, "options": { @@ -7880,7 +8180,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -7895,7 +8196,7 @@ "h": 7, "w": 8, "x": 8, - "y": 84 + "y": 172 }, "id": 18, "options": { @@ -8056,7 +8357,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -8071,7 +8373,7 @@ "h": 7, "w": 8, "x": 16, - "y": 84 + "y": 172 }, "id": 42, "options": { @@ -8152,7 +8454,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -8164,7 +8467,7 @@ "h": 8, "w": 12, "x": 0, - "y": 91 + "y": 179 }, "id": 103, "options": { @@ -8248,7 +8551,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -8260,7 +8564,7 @@ "h": 8, "w": 12, "x": 12, - "y": 91 + "y": 179 }, "id": 102, "options": { @@ -8311,7 +8615,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -8323,7 +8628,7 @@ "h": 8, "w": 24, "x": 0, - "y": 99 + "y": 187 }, "id": 101, "options": { @@ -8385,7 +8690,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -8397,7 +8703,7 @@ "h": 8, "w": 12, "x": 0, - "y": 107 + "y": 195 }, "id": 105, "options": { @@ -8456,7 +8762,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -8468,7 +8775,7 @@ "h": 8, "w": 12, "x": 12, - "y": 107 + "y": 195 }, "id": 104, "options": { @@ -8574,7 +8881,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -8590,7 +8898,7 @@ "h": 8, "w": 12, "x": 0, - "y": 116 + "y": 204 }, "id": 109, "options": { @@ -8742,6 +9050,6 @@ "timezone": "browser", "title": "Nim-Waku V2", "uid": "qrp_ZCTGz", - "version": 169, + "version": 178, "weekStart": "" } \ No newline at end of file diff --git a/waku/waku_store_sync/protocols_metrics.nim b/waku/waku_store_sync/protocols_metrics.nim index bb22f11c7..4195500e9 100644 --- a/waku/waku_store_sync/protocols_metrics.nim +++ b/waku/waku_store_sync/protocols_metrics.nim @@ -8,13 +8,13 @@ const declarePublicHistogram reconciliation_roundtrips, "the nubmer of roundtrips for each reconciliation", - buckets = [0.0, 1.0, 2.0, 3.0, 5.0, 10.0, Inf] + buckets = [1.0, 2.0, 3.0, 5.0, 8.0, 13.0, Inf] declarePublicHistogram reconciliation_differences, "the nubmer of differences for each reconciliation", - buckets = [0.0, 10.0, 50.0, 100.0, 500.0, 1000.0, 10000.0, Inf] + buckets = [0.0, 10.0, 50.0, 100.0, 500.0, 1000.0, 5000.0, Inf] -declarePublicSummary total_bytes_exchanged, +declarePublicCounter total_bytes_exchanged, "the number of bytes sent and received by the protocols", ["protocol", "direction"] declarePublicCounter total_transfer_messages_exchanged, diff --git a/waku/waku_store_sync/reconciliation.nim b/waku/waku_store_sync/reconciliation.nim index f7c13d42c..19dff363b 100644 --- a/waku/waku_store_sync/reconciliation.nim +++ b/waku/waku_store_sync/reconciliation.nim @@ -108,7 +108,7 @@ proc processRequest( await conn.close() return err("remote " & $conn.peerId & " connection read error: " & error.msg) - total_bytes_exchanged.observe(buffer.len, labelValues = [Reconciliation, Receiving]) + total_bytes_exchanged.inc(buffer.len, labelValues = [Reconciliation, Receiving]) let recvPayload = RangesData.deltaDecode(buffer).valueOr: await conn.close() @@ -148,9 +148,7 @@ proc processRequest( rawPayload = sendPayload.deltaEncode() - total_bytes_exchanged.observe( - rawPayload.len, labelValues = [Reconciliation, Sending] - ) + total_bytes_exchanged.inc(rawPayload.len, labelValues = [Reconciliation, Sending]) let writeRes = catch: await conn.writeLP(rawPayload) @@ -197,9 +195,7 @@ proc initiate( let sendPayload = initPayload.deltaEncode() - total_bytes_exchanged.observe( - sendPayload.len, labelValues = [Reconciliation, Sending] - ) + total_bytes_exchanged.inc(sendPayload.len, labelValues = [Reconciliation, Sending]) let writeRes = catch: await connection.writeLP(sendPayload) diff --git a/waku/waku_store_sync/transfer.nim b/waku/waku_store_sync/transfer.nim index 81bed5ece..5a52cac9c 100644 --- a/waku/waku_store_sync/transfer.nim +++ b/waku/waku_store_sync/transfer.nim @@ -51,7 +51,7 @@ proc sendMessage( ): Future[Result[void, string]] {.async.} = let rawPayload = payload.encode().buffer - total_bytes_exchanged.observe(rawPayload.len, labelValues = [Transfer, Sending]) + total_bytes_exchanged.inc(rawPayload.len, labelValues = [Transfer, Sending]) let writeRes = catch: await conn.writeLP(rawPayload) @@ -144,7 +144,7 @@ proc initProtocolHandler(self: SyncTransfer) = # connection closed normally break - total_bytes_exchanged.observe(buffer.len, labelValues = [Transfer, Receiving]) + total_bytes_exchanged.inc(buffer.len, labelValues = [Transfer, Receiving]) let payload = WakuMessageAndTopic.decode(buffer).valueOr: error "decoding error", error = $error