From 0b107dafec1841aef10dd3838624e11dafaf89b6 Mon Sep 17 00:00:00 2001 From: jm-clius Date: Wed, 3 Feb 2021 16:03:28 +0000 Subject: [PATCH] deploy: d546526544f475e21a822294c21a1cc058596be4 --- .update.timestamp | 2 +- metrics/waku-grafana-dashboard.json | 733 ++++++++++-------- .../vendor/libbacktrace-upstream/config.log | 6 +- .../vendor/libbacktrace-upstream/libtool | 2 +- 4 files changed, 412 insertions(+), 331 deletions(-) diff --git a/.update.timestamp b/.update.timestamp index 5d18bc455..b76d149cf 100644 --- a/.update.timestamp +++ b/.update.timestamp @@ -1 +1 @@ -1612265639 \ No newline at end of file +1612367374 \ No newline at end of file diff --git a/metrics/waku-grafana-dashboard.json b/metrics/waku-grafana-dashboard.json index 2880917db..20b57a382 100644 --- a/metrics/waku-grafana-dashboard.json +++ b/metrics/waku-grafana-dashboard.json @@ -14,8 +14,8 @@ }, "editable": true, "gnetId": null, - "graphTooltip": 0, - "id": 2, + "graphTooltip": 2, + "id": 5, "links": [], "panels": [ { @@ -46,8 +46,8 @@ "overrides": [] }, "gridPos": { - "h": 4, - "w": 6, + "h": 5, + "w": 12, "x": 0, "y": 0 }, @@ -64,199 +64,38 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "7.0.3", + "pluginVersion": "7.3.7", "targets": [ { - "expr": "connected_peers{node=\"0\"}", + "expr": "libp2p_pubsub_peers{node=\"0\"}", + "interval": "", + "legendFormat": "LibP2P PubSub Peers", "refId": "A" + }, + { + "expr": "waku_filter_peers{node=\"0\"}", + "interval": "", + "legendFormat": "Filter Peers", + "refId": "B" + }, + { + "expr": "waku_store_peers{node=\"0\"}", + "interval": "", + "legendFormat": "Store Peers", + "refId": "C" + }, + { + "expr": "waku_swap_peers{node=\"0\"}", + "interval": "", + "legendFormat": "Swap Peers", + "refId": "D" } ], "timeFrom": null, "timeShift": null, - "title": "Connected Peers #0", + "title": "Waku Peers #0", "type": "gauge" }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 6, - "y": 0 - }, - "id": 22, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false, - "ymax": null, - "ymin": null - }, - "tableColumn": "envelopes_valid_total{instance=\"127.0.0.1:8010\", job=\"wakusim\", node=\"0\"}", - "targets": [ - { - "expr": "envelopes_valid_total{node=\"0\"}", - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Valid Envelopes #0", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 10, - "y": 0 - }, - "id": 20, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "pluginVersion": "6.4.5", - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false, - "ymax": null, - "ymin": null - }, - "tableColumn": "Dropped envelopes", - "targets": [ - { - "expr": "sum(envelopes_dropped_total{node=\"0\"})", - "interval": "", - "legendFormat": "Dropped envelopes", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Dropped Envelopes #0", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, { "datasource": null, "fieldConfig": { @@ -286,9 +125,9 @@ "overrides": [] }, "gridPos": { - "h": 4, - "w": 5, - "x": 14, + "h": 5, + "w": 6, + "x": 12, "y": 0 }, "id": 14, @@ -304,7 +143,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "7.0.3", + "pluginVersion": "7.3.7", "targets": [ { "expr": "rate(process_cpu_seconds_total{node=\"0\"}[5s]) * 100", @@ -346,9 +185,9 @@ "overrides": [] }, "gridPos": { - "h": 4, - "w": 5, - "x": 19, + "h": 5, + "w": 6, + "x": 18, "y": 0 }, "id": 18, @@ -364,7 +203,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "7.0.3", + "pluginVersion": "7.3.7", "targets": [ { "expr": "process_resident_memory_bytes{node=\"0\"}", @@ -384,7 +223,8 @@ "datasource": null, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -392,9 +232,9 @@ "fillGradient": 0, "gridPos": { "h": 9, - "w": 12, + "w": 8, "x": 0, - "y": 4 + "y": 5 }, "hiddenSeries": false, "id": 6, @@ -411,10 +251,10 @@ "linewidth": 1, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "6.4.5", + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -424,19 +264,19 @@ "steppedLine": false, "targets": [ { - "expr": "envelopes_valid_total{node=\"0\"}", + "expr": "waku_node_messages_total{node=\"0\"}", "hide": false, "instant": false, "interval": "", - "legendFormat": "Valid", + "legendFormat": "{{type}}", "refId": "A" }, { - "expr": "envelopes_dropped_total{node=\"0\"}", + "expr": "waku_store_messages{node=\"0\"}", "hide": false, "instant": false, "interval": "", - "legendFormat": "Dropped {{reason}}", + "legendFormat": "store", "refId": "B" } ], @@ -444,7 +284,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Waku Envelopes #0", + "title": "Waku Messages #0", "tooltip": { "shared": true, "sort": 1, @@ -489,7 +329,8 @@ "datasource": null, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -497,9 +338,249 @@ "fillGradient": 0, "gridPos": { "h": 9, - "w": 12, - "x": 12, - "y": 4 + "w": 8, + "x": 8, + "y": 5 + }, + "hiddenSeries": false, + "id": 19, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.3.7", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "libp2p_pubsub_peers{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "LibP2P PubSub Peers", + "refId": "A" + }, + { + "expr": "waku_filter_peers{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "Filter Peers", + "refId": "B" + }, + { + "expr": "waku_store_peers{node=\"0\"}", + "interval": "", + "legendFormat": "Store Peers", + "refId": "C" + }, + { + "expr": "waku_swap_peers{node=\"0\"}", + "interval": "", + "legendFormat": "Swap Peers", + "refId": "D" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Waku Peers #0", + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 8, + "x": 16, + "y": 5 + }, + "hiddenSeries": false, + "id": 20, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.3.7", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "waku_node_errors{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "Node: {{type}}", + "refId": "A" + }, + { + "expr": "waku_filter_errors{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "Filter: {{type}}", + "refId": "B" + }, + { + "expr": "waku_store_errors{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "Store: {{type}}", + "refId": "C" + }, + { + "expr": "waku_swap_errors{node=\"0\"}", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "Swap: {{type}}", + "refId": "D" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Waku Errors #0", + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 14 }, "hiddenSeries": false, "id": 2, @@ -516,9 +597,10 @@ "linewidth": 1, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -533,20 +615,15 @@ "steppedLine": false, "targets": [ { - "expr": "connected_peers{node=\"0\"}", - "intervalFactor": 1, - "legendFormat": "Connected Peers", - "refId": "A" - }, - { - "expr": "process_resident_memory_bytes{node=\"0\"}", + "expr": "process_resident_memory_bytes{node=\"0\"} / (1024 * 1024)", "interval": "", "intervalFactor": 1, - "legendFormat": "RSS Memory", + "legendFormat": "RSS Memory (MB)", "refId": "B" }, { "expr": "rate(process_cpu_seconds_total{node=\"0\"}[15s]) * 100", + "hide": false, "legendFormat": "CPU usage %", "refId": "C" } @@ -600,7 +677,8 @@ "datasource": null, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -608,107 +686,9 @@ "fillGradient": 0, "gridPos": { "h": 8, - "w": 12, - "x": 0, - "y": 13 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "process_max_fds{node=\"0\"}", - "legendFormat": "Maximum file descriptors", - "refId": "A" - }, - { - "expr": "process_open_fds{node=\"0\"}", - "legendFormat": "Open file descriptors", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "File Descriptors #0", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 13 + "w": 8, + "x": 8, + "y": 14 }, "hiddenSeries": false, "id": 4, @@ -725,9 +705,10 @@ "linewidth": 1, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -797,10 +778,110 @@ "align": false, "alignLevel": null } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 14 + }, + "hiddenSeries": false, + "id": 8, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.3.7", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "process_max_fds{node=\"0\"}", + "legendFormat": "Maximum file descriptors", + "refId": "A" + }, + { + "expr": "process_open_fds{node=\"0\"}", + "legendFormat": "Open file descriptors", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "File Descriptors #0", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], - "refresh": "5s", - "schemaVersion": 25, + "refresh": "30s", + "schemaVersion": 26, "style": "dark", "tags": [], "templating": { @@ -826,5 +907,5 @@ "timezone": "", "title": "Waku Node2", "uid": "K7Z6IoBZk", - "version": 5 -} + "version": 8 +} \ No newline at end of file diff --git a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/config.log b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/config.log index a0324ad73..f9cf18052 100644 --- a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/config.log +++ b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/config.log @@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was ## Platform. ## ## --------- ## -hostname = fv-az67-453 +hostname = fv-az276-164 uname -m = x86_64 uname -r = 5.4.0-1036-azure uname -s = Linux @@ -841,7 +841,7 @@ configure:12482: $? = 0 configure:12482: result: yes configure:12499: checking for getexecname configure:12499: gcc -o conftest -g -O3 -std=gnu11 -pipe -Wall -Wextra -fPIC conftest.c >&5 -/tmp/cc5kAa6A.o: In function `main': +/tmp/ccSqUsqA.o: In function `main': /home/runner/work/nim-waku/nim-waku/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/conftest.c:73: undefined reference to `getexecname' collect2: error: ld returned 1 exit status configure:12499: $? = 1 @@ -1134,7 +1134,7 @@ generated by GNU Autoconf 2.69. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on fv-az67-453 +on fv-az276-164 config.status:1150: creating Makefile config.status:1150: creating backtrace-supported.h diff --git a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool index 953f22808..9beb34f7d 100755 --- a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool +++ b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool @@ -2,7 +2,7 @@ # libtool - Provide generalized library-building support services. # Generated automatically by config.status (libbacktrace) version-unused -# Libtool was configured on host fv-az67-453: +# Libtool was configured on host fv-az276-164: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,