[taler-grid5k] 10/12: minor changes

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit 2e09a8a11f1a2528f5839bcc37a630a6ca14f77d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Jun 9 17:44:38 2022 +0200

    minor changes
---
 additional/grafana/load-statistics.json | 229 +++++++++++++++++++++++++++++++-
 experiment/README.md                    |  10 +-
 experiment/scripts/benchmark.sh         |   4 +-
 experiment/scripts/database.sh          |   2 +-
 4 files changed, 237 insertions(+), 8 deletions(-)

diff --git a/additional/grafana/load-statistics.json 
b/additional/grafana/load-statistics.json
index 58dd08f..f62ee62 100644
--- a/additional/grafana/load-statistics.json
+++ b/additional/grafana/load-statistics.json
@@ -1574,7 +1574,7 @@
       "gridPos": {
         "h": 9,
         "w": 12,
-        "x": 6,
+        "x": 0,
         "y": 57
       },
       "id": 16,
@@ -1616,6 +1616,231 @@
       ],
       "title": "Proxy Response Time vs Slow Queries",
       "type": "timeseries"
+    },
+    {
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "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
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "Network (.*)"
+            },
+            "properties": [
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              },
+              {
+                "id": "unit",
+                "value": "bps"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Requests"
+            },
+            "properties": [
+              {
+                "id": "custom.axisLabel",
+                "value": "Requests / Second"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 57
+      },
+      "id": 24,
+      "maxDataPoints": 500,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "exemplar": true,
+          "expr": "sum(rate(nginx_http_requests_total{} [$__rate_interval]))",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "Requests",
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "exemplar": true,
+          "expr": 
"sum(rate(node_network_receive_bytes_total{component=\"proxy\"}[$__rate_interval])
 + rate(node_network_transmit_bytes_total{component=\"proxy\"} 
[$__rate_interval]))*8",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "Network Bandwidth",
+          "refId": "B"
+        }
+      ],
+      "title": "[Exch Proxy] Requests vs Network Traffic",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Mixed --"
+      },
+      "description": "This shows if Nginx reports more requests than we 
receive in Promtail - if so, probably the local syslog receivers of Nginx are 
too slow.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "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": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 6,
+        "y": 66
+      },
+      "id": 25,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "exemplar": true,
+          "expr": "sum(rate(taler_requests_total_requests{}[2m]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Promtail",
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "exemplar": true,
+          "expr": "sum(rate(nginx_http_requests_total{}[2m]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Nginx",
+          "refId": "B"
+        }
+      ],
+      "title": "Measured Requests",
+      "type": "timeseries"
     }
   ],
   "refresh": "10s",
@@ -1636,6 +1861,6 @@
   "timezone": "",
   "title": "Load Statistics",
   "uid": "rkyhDAt7z",
-  "version": 77,
+  "version": 81,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/experiment/README.md b/experiment/README.md
index 79c5277..015ff3c 100644
--- a/experiment/README.md
+++ b/experiment/README.md
@@ -86,18 +86,22 @@ processes would have to be restarted afterwards.
 **NOTE** On `taler-perf`, when not using a terminal opened from jFed make sure 
to forward the ssh-agent
          to make the script work. E.g. `ssh -A graoully-3.nancy.grid5000.fr` 
(from an access machine).
 
-To add more exchange processes run `taler-perf stop exchange <NUM>` on any node
+To add more exchange processes run `taler-perf start exchange <NUM>` on any 
node
+To add more wirewatch processes run `taler-perf start wirewatch <NUM>` on any 
node
 To add more wallet processes run `taler-perf start wallet <NUM>` on any node
 
 They can also be stopped in the same way: `taler-perf stop <KIND> <NUM>`
 
 ### Experiment Persistence
 
+**Please make sure that important panel changes in Grafana are saved into the 
json files in `additonal/grafana`**
+**This can be done clicking the share button in the top left corner of a 
dashboard then `Export` enable `Export for sharing externally` and finally 
`Save to file`.**
+
 The script `../additional/persist.sh` can be used to backup and clean the data 
in the grid5k NFS.
-This archive created can then be passed to `../additional/recover.sh`, which 
will run a local Grafana setup
+This archive created can then be passed to `../additional/recover/run.sh`, 
which will run a local Grafana setup
 in which the experiment can be inspected again.
 
-For this to work the service `taler-databackup` using `scripts/data-backup.sh` 
is run periodically.
+For this to work the service `taler-databackup` using 
`scripts/prometheus-backup.sh` is run periodically.
 Loki data is directly written to the NFS. For the best results it is needed to 
stop loki on the `monitor` node
 before an experiment ends - otherwise some of the loki data might become 
corrupt.
 
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index ecf3f0a..f5a2f5a 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -42,7 +42,7 @@ function start_wallet_bench() {
       \"paytoTemplate\": 
\"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-\${id}?receiver-name=merchant\",
       \"randomAlg\": \"${WALLET_MERCHANT_SELECTION}\",
       \"numMerchants\": ${WALLET_NUM_MERCHANTS},
-      \"iterations\": 5000,
+      \"iterations\": 500,
       \"deposits\": ${NUM_DEPOSITS},
       \"restartAfter\": 2
     }"
@@ -59,7 +59,7 @@ function start_wallet_bench() {
       \"bank\": \"${PROTO}://bank.${DNS_ZONE}/\",
       \"currency\": \"KUDOS\",
       \"payto\": 
\"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-1?receiver-name=merchant-1\",
-      \"iterations\": 5000,
+      \"iterations\": 500,
       \"deposits\": ${NUM_DEPOSITS},
       \"withdrawOnly\": ${WALLET_WITHDRAW_ONLY},
       \"restartAfter\": 2
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 17fb0ab..58e0027 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -42,7 +42,7 @@ function setup_disks() {
 
 # Setup Postgres to use RAM instead of disks to store data
 function setup_ram_storage() {
-  SIZE=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 4))
+  SIZE=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 2))
   if ! df | grep -q /tmp/postgresql; then
     mv /tmp/postgresql /tmp/postgresql.bak
     mkdir /tmp/postgresql

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.