different updates

6 files changed, 375 insertions, 25 deletions

diff --git a/additional/grafana/request-statistics.json b/additional/grafana/request-statistics.json
index 9cf7575..2742246 100644
--- a/additional/grafana/request-statistics.json
+++ b/additional/grafana/request-statistics.json
@@ -74,7 +74,7 @@
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1652777639923,
+  "iteration": 1652972627806,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -149,13 +149,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=~\"wallet(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=~\"wallet(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Wallet-Proxy",
+      "title": "RTT Wallet-Proxy [$interval]",
       "type": "stat"
     },
     {
@@ -216,13 +216,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=~\"eproxy(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=~\"eproxy(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Proxy-Exchange",
+      "title": "RTT Proxy-Exchange [$interval]",
       "type": "stat"
     },
     {
@@ -283,13 +283,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Exchange-Database",
+      "title": "RTT Exchange-Database [$interval]",
       "type": "stat"
     },
     {
@@ -350,13 +350,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"aggregator\" | unwrap duration(time) [$__range]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"aggregator\" | unwrap duration(time) [$interval]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Aggregator-Database",
+      "title": "RTT Aggregator-Database [$interval]",
       "type": "stat"
     },
     {
@@ -417,13 +417,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"closer\" | unwrap duration(time) [$__range]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"closer\" | unwrap duration(time) [$interval]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Closer-Database",
+      "title": "RTT Closer-Database [$interval]",
       "type": "stat"
     },
     {
@@ -484,13 +484,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"transfer\" | unwrap duration(time) [$__range]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"transfer\" | unwrap duration(time) [$interval]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Transfer-Database",
+      "title": "RTT Transfer-Database [$interval]",
       "type": "stat"
     },
     {
@@ -551,13 +551,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"wirewatch\" | unwrap duration(time) [$__range]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$__range])",
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | src=\"wirewatch\" | unwrap duration(time) [$interval]) or avg_over_time({app=\"taler-network\", job=\"taler\"} | logfmt | src=~\"exchange(.*)\" | unwrap duration(time) [$interval])",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "RTT Wirewatch-Database",
+      "title": "RTT Wirewatch-Database [$interval]",
       "type": "stat"
     },
     {
@@ -1705,7 +1705,7 @@
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
-          "selected": false,
+          "selected": true,
           "text": "3m",
           "value": "3m"
         },
@@ -1829,6 +1829,6 @@
   "timezone": "browser",
   "title": "Request Statistics",
   "uid": "WcfSXqDnk",
-  "version": 201,
+  "version": 203,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/grafana/transactions.json b/additional/grafana/transactions.json
index f1d6a1a..e979449 100644
--- a/additional/grafana/transactions.json
+++ b/additional/grafana/transactions.json
@@ -1273,7 +1273,7 @@
           "refId": "A"
         }
       ],
-      "title": "Current TPS ",
+      "title": "Current TPS [2m]",
       "transformations": [],
       "type": "gauge"
     },
@@ -1600,7 +1600,7 @@
           "refId": "A"
         }
       ],
-      "title": "Withdrawals per Second ",
+      "title": "Withdrawals per Second [5m]",
       "transformations": [],
       "type": "stat"
     },
@@ -1614,6 +1614,7 @@
           "mappings": [],
           "max": 100000,
           "min": 0,
+          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1663,7 +1664,7 @@
           "refId": "A"
         }
       ],
-      "title": "Payments per Second",
+      "title": "Payments per Second [5m]",
       "transformations": [],
       "type": "stat"
     },
@@ -1674,7 +1675,19 @@
           "color": {
             "mode": "thresholds"
           },
-          "mappings": [],
+          "mappings": [
+            {
+              "options": {
+                "match": "null+nan",
+                "result": {
+                  "index": 0,
+                  "text": "0"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1728,7 +1741,7 @@
           "refId": "A"
         }
       ],
-      "title": "Payments / Withdraw",
+      "title": "Payments / Withdraw [5m]",
       "type": "stat"
     },
     {
@@ -2528,6 +2541,6 @@
   "timezone": "",
   "title": "Transactions",
   "uid": "83vvgKKnk",
-  "version": 163,
+  "version": 165,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/rspecs/taler.neowise.rspec b/additional/rspecs/taler.neowise.rspec
new file mode 100644
index 0000000..0c07c7d
--- /dev/null
+++ b/additional/rspecs/taler.neowise.rspec
@@ -0,0 +1,333 @@
+<?xml version='1.0'?>
+<rspec xmlns="http://www.geni.net/resources/rspec/3" type="request" generated_by="jFed RSpec Editor" generated="2022-05-18T10:40:13.967+02:00" xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1" xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1" xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1" xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1" xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1" xmlns:jfed="http://jfed.iminds.be/rspec/ext/jfed/1" xmlns:sharedvlan="http://www.protogeni.net/resources/rspec/ext/shared-vlan/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd ">
+  <node client_id="DB" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="95.17699115044248" y="45.631578947368425"/>
+  </node>
+  <node client_id="Exchange-1" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="159.95575221238937" y="102.36842105263158"/>
+  </node>
+  <node client_id="Bank" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="any-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="377.0" y="49.5"/>
+  </node>
+  <node client_id="EProxy-1" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="171.1061946902655" y="165.55263157894737"/>
+  </node>
+  <node client_id="Monitor" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="728.6283185840708" y="117.84210526315789"/>
+  </node>
+  <node client_id="Merchant-1" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="910.2212389380531" y="48.21052631578947"/>
+  </node>
+  <node client_id="DNS" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="716.4159292035399" y="49.5"/>
+  </node>
+  <node client_id="Aggregator" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="any-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="570.3982300884957" y="49.5"/>
+  </node>
+  <node client_id="Wirewatch" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="568.2743362831859" y="99.78947368421052"/>
+  </node>
+  <node client_id="Transfer" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="any-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="559.778761061947" y="153.94736842105263"/>
+  </node>
+  <node client_id="Closer" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="any-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="558.5" y="201.5"/>
+  </node>
+  <node client_id="Exchange-2" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="328.8053097345133" y="102.36842105263158"/>
+  </node>
+  <node client_id="Wallet-1" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="75.0" y="268.4619510579628"/>
+  </node>
+  <node client_id="Wallet-2" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="285.77629662820664" y="268.4619510579628"/>
+  </node>
+  <node client_id="Wallet-3" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="496.55259325641316" y="268.4619510579628"/>
+  </node>
+  <node client_id="Wallet-4" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="696.7699115044248" y="264.8421052631579"/>
+  </node>
+  <node client_id="Wallet-5" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="911.283185840708" y="264.8421052631579"/>
+  </node>
+  <node client_id="Wallet-6" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="75.0" y="308.8969814479059"/>
+  </node>
+  <node client_id="Wallet-7" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="285.77629662820664" y="308.8969814479059"/>
+  </node>
+  <node client_id="Wallet-8" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="496.55259325641316" y="308.8969814479059"/>
+  </node>
+  <node client_id="Wallet-9" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="696.7699115044248" y="306.10526315789474"/>
+  </node>
+  <node client_id="Wallet-10" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="915.0000000000001" y="307.39473684210526"/>
+  </node>
+  <node client_id="Wallet-11" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="79.24778761061947" y="349.94736842105266"/>
+  </node>
+  <node client_id="Wallet-12" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="285.77629662820664" y="349.33201183784905"/>
+  </node>
+  <node client_id="Wallet-13" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="502.96460176991155" y="349.94736842105266"/>
+  </node>
+  <node client_id="Wallet-14" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="701.5486725663717" y="346.07894736842104"/>
+  </node>
+  <node client_id="Wallet-15" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="347.36842105263156"/>
+  </node>
+  <node client_id="Wallet-16" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="82.43362831858407" y="388.63157894736844"/>
+  </node>
+  <node client_id="Wallet-17" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="285.77629662820664" y="389.76704222779233"/>
+  </node>
+  <node client_id="Wallet-18" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="504.02654867256643" y="391.2105263157895"/>
+  </node>
+  <node client_id="Wallet-19" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="702.6106194690266" y="388.63157894736844"/>
+  </node>
+  <node client_id="Wallet-20" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="388.63157894736844"/>
+  </node>
+  <node client_id="Wallet-21" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="83.49557522123894" y="427.3157894736842"/>
+  </node>
+  <node client_id="Wallet-22" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="286.3274336283186" y="432.4736842105263"/>
+  </node>
+  <node client_id="Wallet-23" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="502.5747731600762" y="434.75101353660403"/>
+  </node>
+  <node client_id="Wallet-24" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="702.6106194690266" y="431.1842105263158"/>
+  </node>
+  <node client_id="Wallet-25" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="427.3157894736842"/>
+  </node>
+  <node client_id="Wallet-26" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="84.5575221238938" y="466.0"/>
+  </node>
+  <node client_id="Wallet-27" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="287.3893805309735" y="468.57894736842104"/>
+  </node>
+  <node client_id="Wallet-28" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="502.9646017699115" y="482.03664955070604"/>
+  </node>
+  <node client_id="Wallet-29" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="701.5486725663717" y="473.7368421052632"/>
+  </node>
+  <node client_id="Wallet-30" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="468.57894736842104"/>
+  </node>
+  <node client_id="Wallet-31" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="79.24778761061947" y="508.5526315789474"/>
+  </node>
+  <node client_id="Wallet-32" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="288.4513274336283" y="509.8421052631579"/>
+  </node>
+  <node client_id="Wallet-33" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="502.96460176991155" y="522.7368421052631"/>
+  </node>
+  <node client_id="Wallet-34" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="701.5486725663717" y="517.578947368421"/>
+  </node>
+  <node client_id="Wallet-35" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="517.578947368421"/>
+  </node>
+  <node client_id="Wallet-36" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="80.30973451327434" y="549.8157894736842"/>
+  </node>
+  <node client_id="Wallet-37" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="289.5132743362832" y="557.5526315789474"/>
+  </node>
+  <node client_id="Wallet-38" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="505.08849557522126" y="564.0"/>
+  </node>
+  <node client_id="Wallet-39" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="701.5486725663717" y="561.421052631579"/>
+  </node>
+  <node client_id="Wallet-40" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="913.9380530973452" y="560.1315789473684"/>
+  </node>
+  <node client_id="EProxy-2" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="neowise-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="324.0265486725664" y="164.26315789473685"/>
+  </node>
+</rspec>
\ No newline at end of file
diff --git a/configs/usr/lib/systemd/system/taler-netdelay.timer b/configs/usr/lib/systemd/system/taler-netdelay.timer
index f445635..3c833ca 100644
--- a/configs/usr/lib/systemd/system/taler-netdelay.timer
+++ b/configs/usr/lib/systemd/system/taler-netdelay.timer
@@ -4,7 +4,7 @@ Requires=taler-netdelay.service
 
 [Timer]
 Unit=taler-netdelay.service
-OnCalendar=*:0/5
+OnCalendar=*:0/1
 
 [Install]
 WantedBy=timers.target
diff --git a/experiment/env b/experiment/env
index a60d289..b05e9be 100644
--- a/experiment/env
+++ b/experiment/env
@@ -151,7 +151,7 @@ GRAFANA_API_KEY=
 
 # If the data persisted from prometheus and loki from a
 # previous experiment should be removed before starting
-# a new one
+# a new one (NOTE: this is always the case for logs)
 REMOVE_PREVIOUS_EXPERIMENT_DATA=true
 
 # If *_COMMIT_SHA is not empty the corresponding
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 77137e6..762baf5 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -209,6 +209,10 @@ function clean_previous_setup() {
     HBA_FILE=/tmp/postgresql/${POSTGRES_VERSION}/data/pg_hba.conf
   fi
   sed -i "/172.16.0.0\/12/d" "${HBA_FILE}" || true
+
+  if [[ "$REMOVE_PREVIOUS_EXPERIMENT_DATA" == "true" ]]; then
+    rm -rf /home/${G5K_USER}/exp-* || true
+  fi
 }
 
 clean_previous_setup