[taler-grid5k] 102/189: fix

[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 4d59b8732e8792fbfbb1557235ca1eb25f7a4547
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Mar 21 22:25:29 2022 +0100

    fix
---
 additional/plots/config.yaml   | 2 +-
 experiment/scripts/exchange.sh | 3 +++
 experiment/scripts/monitor.sh  | 4 ++--
 experiment/scripts/proxy.sh    | 4 ++--
 experiment/scripts/setup.sh    | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/additional/plots/config.yaml b/additional/plots/config.yaml
index eafcd3a..3740e67 100644
--- a/additional/plots/config.yaml
+++ b/additional/plots/config.yaml
@@ -33,7 +33,7 @@ dashboards:
       height: 400
   - uid: rYdddlPWk # Nodes
     variables: ['node']
-    ignore: 'monitor*|bank*|merch*|ns*|wallet*'
+    ignore: 
'monitor*|bank*|merch*|ns*|wallet*|*aggregator|*closer|*wirewatch|*closer'
     graph:
       width: 1200
       height: 600
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index e7c7912..bdda59d 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -24,6 +24,9 @@ source ~/scripts/helpers.sh
 # Setup the configuration in /etc/taler
 function setup_primary_config() {
 
+  # remove keys from previous run in same experiment
+  rm -rf /var/lib/taler/exchange-offline/*
+
   # Setup the base configuration (helpers.sh)
   setup_exchange_config_without_master_key
 
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 3ee03ff..37f1afd 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -156,8 +156,8 @@ function remove_exchanges_from_prometheus() {
 
   # We know we started from port 10000
   # get the highest port numbers and start removing from there
-  let "START=$1+10000-1"
-  let "END=$START-$2+1"
+  let "START=$1+10000"
+  let "END=$START-$2"
 
   HOSTS=$(get_exchange_hosts)
 
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index 12a6661..8aba4b6 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -95,8 +95,8 @@ function remove_exchanges() {
 
   # We know we started from port 10000
   # get the highest port numbers and start removing from there
-  let "START=$1+10000-1"
-  let "END=$START-$2+1"
+  let "START=$1+10000"
+  let "END=$START-$2"
 
   EXCHANGES=$(get_exchange_hosts)
 
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 31a3b4a..133a1f3 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -178,6 +178,8 @@ function setup_dns() {
 function clean_previous_setup() {
   # Stop all important services
   systemctl stop taler-exchange-* \
+                taler-wallet* \
+                prometheus* \
                  postgresql \
                 promtail \
                 loki \

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