summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoss Marco <bossm8@bfh.ch>2022-05-10 14:00:47 +0200
committerBoss Marco <bossm8@bfh.ch>2022-05-10 14:00:47 +0200
commit4aee29141eec5af076004d5358f30ec2a5e4702f (patch)
treea071e16dfd891c67711edfbabc83c6357ee5fbea
parent4e424eb79a1c682034aa9f41a138dd081b71f98c (diff)
downloadgrid5k-4aee29141eec5af076004d5358f30ec2a5e4702f.tar.gz
grid5k-4aee29141eec5af076004d5358f30ec2a5e4702f.tar.bz2
grid5k-4aee29141eec5af076004d5358f30ec2a5e4702f.zip
recognize bench3 in promtail
-rw-r--r--additional/grafana/exchange.json34
-rw-r--r--additional/grafana/transactions.json557
-rw-r--r--configs/etc/monitor/promtail.yaml2
-rw-r--r--experiment/env2
-rwxr-xr-xexperiment/scripts/database.sh2
5 files changed, 512 insertions, 85 deletions
diff --git a/additional/grafana/exchange.json b/additional/grafana/exchange.json
index e60c581..e75dfab 100644
--- a/additional/grafana/exchange.json
+++ b/additional/grafana/exchange.json
@@ -29,7 +29,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
- "version": "8.4.3"
+ "version": "8.4.6"
},
{
"type": "datasource",
@@ -586,7 +586,7 @@
"showUnfilled": true,
"text": {}
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"exemplar": true,
@@ -657,7 +657,7 @@
"showUnfilled": true,
"text": {}
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"exemplar": true,
@@ -715,7 +715,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"exemplar": true,
@@ -784,7 +784,7 @@
},
"showUnfilled": true
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -868,7 +868,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -936,7 +936,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1011,7 +1011,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1074,7 +1074,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1143,7 +1143,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1218,7 +1218,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1286,7 +1286,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1357,7 +1357,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1436,20 +1436,20 @@
"showHeader": true,
"sortBy": []
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
"type": "loki",
"uid": "${DS_LOKI}"
},
- "expr": "sum by (query) (count_over_time({app=\"taler-database\", type=\"slow-query\"} | regexp \"(?P<query>.*)\" [$__range]))",
+ "expr": "sum by (query) (count_over_time({app=\"taler-database\", type=\"slow-query\"} | regexp \"(?P<query>.*)\" [5m]))",
"instant": true,
"range": false,
"refId": "A"
}
],
- "title": "Slow Query Occurences",
+ "title": "Slow Query Occurences [5m]",
"transformations": [
{
"id": "groupBy",
@@ -1533,6 +1533,6 @@
"timezone": "",
"title": "Exchange",
"uid": "NYO0EIE7k",
- "version": 38,
+ "version": 40,
"weekStart": ""
} \ No newline at end of file
diff --git a/additional/grafana/transactions.json b/additional/grafana/transactions.json
index eaea241..76c8e7a 100644
--- a/additional/grafana/transactions.json
+++ b/additional/grafana/transactions.json
@@ -21,6 +21,12 @@
"__requires": [
{
"type": "panel",
+ "id": "bargauge",
+ "name": "Bar gauge",
+ "version": ""
+ },
+ {
+ "type": "panel",
"id": "gauge",
"name": "Gauge",
"version": ""
@@ -29,7 +35,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
- "version": "8.4.3"
+ "version": "8.4.6"
},
{
"type": "datasource",
@@ -143,7 +149,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -208,7 +214,7 @@
"showThresholdMarkers": true,
"text": {}
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -269,7 +275,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -331,7 +337,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -391,7 +397,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -410,6 +416,7 @@
"type": "stat"
},
{
+ "description": "Number of wirewatch processes running",
"fieldConfig": {
"defaults": {
"color": {
@@ -445,7 +452,7 @@
"x": 14,
"y": 1
},
- "id": 46,
+ "id": 41,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -461,7 +468,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -469,14 +476,14 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": false,
- "expr": "sum(node_systemd_unit_state{name=~\"taler-exchange-aggregator(.*).service\", state=\"active\"})",
+ "expr": "sum(node_systemd_unit_state{name=~\"taler-exchange-wirewatch(.*).service\", state=\"active\"})",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "# Aggregator",
+ "title": "# Wirewatch",
"type": "stat"
},
{
@@ -533,7 +540,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -592,7 +599,7 @@
"x": 18,
"y": 1
},
- "id": 51,
+ "id": 52,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -608,22 +615,18 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
- "datasource": {
- "type": "prometheus",
- "uid": "${DS_PROMETHEUS}"
- },
- "exemplar": false,
- "expr": "node_systemd_unit_state{name=\"taler-exchange-secmod-eddsa.service\", state=\"active\"}",
+ "exemplar": true,
+ "expr": "node_systemd_unit_state{name=\"taler-exchange-secmod-rsa.service\", state=\"active\"}",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "EdDSA",
+ "title": "RSA",
"type": "stat"
},
{
@@ -684,7 +687,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -744,7 +747,7 @@
"x": 22,
"y": 1
},
- "id": 47,
+ "id": 48,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -760,18 +763,18 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"exemplar": true,
- "expr": "node_systemd_unit_state{name=\"loki.service\", state=\"active\"}",
+ "expr": "node_systemd_unit_state{name=\"promtail.service\", state=\"active\"}",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "Loki",
+ "title": "Promtail",
"type": "stat"
},
{
@@ -819,7 +822,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -838,7 +841,6 @@
"type": "stat"
},
{
- "description": "Number of wirewatch processes running",
"fieldConfig": {
"defaults": {
"color": {
@@ -874,7 +876,7 @@
"x": 14,
"y": 3
},
- "id": 41,
+ "id": 46,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -890,7 +892,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -898,14 +900,14 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": false,
- "expr": "sum(node_systemd_unit_state{name=~\"taler-exchange-wirewatch(.*).service\", state=\"active\"})",
+ "expr": "sum(node_systemd_unit_state{name=~\"taler-exchange-aggregator(.*).service\", state=\"active\"})",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "# Wirewatch",
+ "title": "# Aggregator",
"type": "stat"
},
{
@@ -960,7 +962,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1019,7 +1021,7 @@
"x": 18,
"y": 3
},
- "id": 52,
+ "id": 51,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -1035,18 +1037,22 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
- "exemplar": true,
- "expr": "node_systemd_unit_state{name=\"taler-exchange-secmod-rsa.service\", state=\"active\"}",
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": false,
+ "expr": "node_systemd_unit_state{name=\"taler-exchange-secmod-eddsa.service\", state=\"active\"}",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "RSA",
+ "title": "EdDSA",
"type": "stat"
},
{
@@ -1091,7 +1097,7 @@
"x": 22,
"y": 3
},
- "id": 48,
+ "id": 47,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -1107,18 +1113,18 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"exemplar": true,
- "expr": "node_systemd_unit_state{name=\"promtail.service\", state=\"active\"}",
+ "expr": "node_systemd_unit_state{name=\"loki.service\", state=\"active\"}",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
- "title": "Promtail",
+ "title": "Loki",
"type": "stat"
},
{
@@ -1131,7 +1137,7 @@
},
"id": 22,
"panels": [],
- "title": "Total TPS (Sucessful Requests)",
+ "title": "Total TPS (Successful Requests)",
"type": "row"
},
{
@@ -1177,7 +1183,7 @@
"showThresholdMarkers": true,
"text": {}
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1239,7 +1245,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1389,7 +1395,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1454,7 +1460,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1480,6 +1486,358 @@
"x": 0,
"y": 15
},
+ "id": 66,
+ "panels": [
+ {
+ "description": "Total successful (200) requests to /deposit and /withdraw per second, measured at the nginx proxy in a 2 minute interval.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "continuous-RdYlGr"
+ },
+ "mappings": [],
+ "max": 100000,
+ "min": 0,
+ "noValue": "0",
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 5,
+ "x": 0,
+ "y": 16
+ },
+ "id": 68,
+ "options": {
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showThresholdLabels": false,
+ "showThresholdMarkers": true,
+ "text": {}
+ },
+ "pluginVersion": "8.4.6",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": true,
+ "expr": "sum (rate(taler_requests_total_requests{endpoint=~\"reserves-batch-withdraw|coins-deposit\", status=\"200\"} [2m]))",
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "title": "Current TPS ",
+ "transformations": [],
+ "type": "gauge"
+ },
+ {
+ "description": "Total successful (200) requests per second to /withdraw per second, measured at the nginx proxy in a 5 minute interval.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "continuous-RdYlGr"
+ },
+ "mappings": [],
+ "max": 100000,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 5,
+ "x": 5,
+ "y": 16
+ },
+ "id": 71,
+ "options": {
+ "colorMode": "none",
+ "graphMode": "none",
+ "justifyMode": "center",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "auto"
+ },
+ "pluginVersion": "8.4.6",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": false,
+ "expr": "sum (rate(taler_requests_total_requests{endpoint=\"reserves-batch-withdraw\", status=\"200\"} [5m] ))",
+ "instant": true,
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "title": "Withdrawals per Second ",
+ "transformations": [],
+ "type": "stat"
+ },
+ {
+ "description": "Total number of successful requests to /deposit and /withdraw per second, measured at the nginx proxy and over a 2 minute interval.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisLabel": "TPS",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 47,
+ "gradientMode": "opacity",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "smooth",
+ "lineStyle": {
+ "fill": "solid"
+ },
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 14,
+ "x": 10,
+ "y": 16
+ },
+ "id": 69,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "hidden",
+ "placement": "bottom"
+ },
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": true,
+ "expr": "sum(rate(taler_requests_total_requests{endpoint=~\"reserves-batch-withdraw|coins-deposit\", status=\"200\"}[2m]))",
+ "interval": "",
+ "intervalFactor": 2,
+ "legendFormat": "TPS",
+ "refId": "A"
+ }
+ ],
+ "title": "TPS History",
+ "type": "timeseries"
+ },
+ {
+ "description": "Total successful (200) requests to /deposit per second, measured at the nginx proxy in a 5 minute interval.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "continuous-RdYlGr"
+ },
+ "mappings": [],
+ "max": 100000,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 5,
+ "x": 5,
+ "y": 19
+ },
+ "id": 72,
+ "options": {
+ "colorMode": "none",
+ "graphMode": "none",
+ "justifyMode": "center",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "auto"
+ },
+ "pluginVersion": "8.4.6",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": false,
+ "expr": "sum (rate(taler_requests_total_requests{endpoint=\"coins-deposit\", status=\"200\"} [5m] ))",
+ "instant": true,
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "title": "Payments per Second",
+ "transformations": [],
+ "type": "stat"
+ },
+ {
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 5,
+ "x": 5,
+ "y": 22
+ },
+ "id": 70,
+ "options": {
+ "colorMode": "none",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "auto"
+ },
+ "pluginVersion": "8.4.6",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": false,
+ "expr": "(sum(rate(taler_requests_total_requests{endpoint=\"coins-deposit\", status=\"200\"} [5m]))) / (sum (rate(taler_requests_total_requests{endpoint=\"reserves-batch-withdraw\", status=\"200\"} [5m])))",
+ "instant": true,
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "title": "Payments / Withdraw",
+ "type": "stat"
+ }
+ ],
+ "title": "Total TPS (Batch Withdraw)",
+ "type": "row"
+ },
+ {
+ "collapsed": true,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 16
+ },
"id": 20,
"panels": [
{
@@ -1501,7 +1859,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
}
]
}
@@ -1512,7 +1871,7 @@
"h": 9,
"w": 5,
"x": 0,
- "y": 16
+ "y": 17
},
"id": 14,
"options": {
@@ -1528,7 +1887,7 @@
"showThresholdMarkers": true,
"text": {}
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1562,7 +1921,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
}
]
}
@@ -1573,7 +1933,7 @@
"h": 3,
"w": 5,
"x": 5,
- "y": 16
+ "y": 17
},
"id": 16,
"options": {
@@ -1591,7 +1951,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1655,7 +2015,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
}
]
},
@@ -1667,7 +2028,7 @@
"h": 9,
"w": 14,
"x": 10,
- "y": 16
+ "y": 17
},
"id": 26,
"options": {
@@ -1710,7 +2071,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
}
]
}
@@ -1721,7 +2083,7 @@
"h": 3,
"w": 5,
"x": 5,
- "y": 19
+ "y": 20
},
"id": 6,
"options": {
@@ -1739,7 +2101,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1773,7 +2135,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -1788,7 +2151,7 @@
"h": 3,
"w": 5,
"x": 5,
- "y": 22
+ "y": 23
},
"id": 12,
"options": {
@@ -1806,7 +2169,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1832,7 +2195,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 16
+ "y": 17
},
"id": 40,
"panels": [],
@@ -1900,7 +2263,7 @@
"h": 10,
"w": 10,
"x": 0,
- "y": 17
+ "y": 18
},
"id": 44,
"maxDataPoints": 500,
@@ -1988,7 +2351,7 @@
"h": 10,
"w": 14,
"x": 10,
- "y": 17
+ "y": 18
},
"id": 38,
"options": {
@@ -2075,7 +2438,7 @@
"h": 10,
"w": 10,
"x": 0,
- "y": 27
+ "y": 28
},
"id": 43,
"maxDataPoints": 500,
@@ -2162,7 +2525,7 @@
"h": 10,
"w": 14,
"x": 10,
- "y": 27
+ "y": 28
},
"id": 55,
"options": {
@@ -2187,6 +2550,68 @@
],
"title": "Exchanges over Time",
"type": "timeseries"
+ },
+ {
+ "description": "Number of deposits done to each account - accounts are only displayed by ID.",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "fixedColor": "green",
+ "mode": "fixed"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ },
+ "unit": "short"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 10,
+ "w": 24,
+ "x": 0,
+ "y": 38
+ },
+ "id": 74,
+ "options": {
+ "displayMode": "basic",
+ "orientation": "horizontal",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true,
+ "text": {}
+ },
+ "pluginVersion": "8.4.6",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_PROMETHEUS}"
+ },
+ "exemplar": false,
+ "expr": "sort_desc(sum by (account) (taler_fakebank_account_payments{account!=\"Exchange\"}))",
+ "format": "time_series",
+ "instant": true,
+ "interval": "",
+ "legendFormat": "{{ account }}",
+ "refId": "A"
+ }
+ ],
+ "title": "Deposits by Account",
+ "transformations": [],
+ "type": "bargauge"
}
],
"refresh": "10s",
@@ -2207,6 +2632,6 @@
"timezone": "",
"title": "Transactions",
"uid": "83vvgKKnk",
- "version": 134,
+ "version": 143,
"weekStart": ""
} \ No newline at end of file
diff --git a/configs/etc/monitor/promtail.yaml b/configs/etc/monitor/promtail.yaml
index ac817ef..d4d0e7b 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -145,7 +145,7 @@ scrape_configs:
target_label: app
pipeline_stages:
- match:
- selector: '{job="wallet"} |~ "Bench1"'
+ selector: '{job="wallet"} |~ "Bench1|Bench3"'
stages:
- template:
source: script
diff --git a/experiment/env b/experiment/env
index 4f0cee8..ff283e6 100644
--- a/experiment/env
+++ b/experiment/env
@@ -103,6 +103,7 @@ WALLET_USE_HTTPS=true
# Run a withdraw only experiment
WALLET_WITHDRAW_ONLY=false
# Do batch withdrawals of a reserve rather than single coins
+# NOTE: comment if not wanted
TALER_WALLET_BATCH_WITHDRAWAL=1
# How the wallets select merchants, possible values: 'zipf' and 'rand'
# If the configured value is neither zipf or rand, a single merchant is taken
@@ -113,6 +114,7 @@ WALLET_NUM_MERCHANTS=1000
NODE_TLS_REJECT_UNAUTHORIZED=0
# Other wallet options mostly for performance experiments
+# Note: comment if not wanted
TALER_WALLET_SYNC_CRYPTO=1
TALER_WALLET_PRIMITIVE_WORKER=1
TALER_WALLET_INSECURE_TRUST_EXCHANGE=1
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index c4079de..d3cfc53 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -179,7 +179,7 @@ function setup_config() {
# When having replication, this one can be changed (in local only on and off are of use)
# https://www.postgresql.org/docs/13/runtime-config-replication.html#GUC-SYNCHRONOUS-STANDBY-NAMES
# on causes us to get 100% IO load
- synchronous_commit = off
+ synchronous_commit = on
# Default off
wal_compression = off