[taler-grid5k] 48/48: integrate final changes from setup

[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 653b70264ebd852bf6a5348ad6ec4cf6a09a021d
Merge: 87b3f10 b84926b
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat May 28 12:11:06 2022 +0200

    integrate final changes from setup

 additional/grafana/database.json                   | 1596 +++++++++++++++++---
 additional/grafana/exchange.json                   |   34 +-
 additional/grafana/load-statistics.json            |   44 +-
 additional/grafana/proxy.json                      |   16 +-
 additional/grafana/request-statistics.json         |  186 ++-
 additional/grafana/transactions.json               |  640 ++++++--
 additional/persist.sh                              |   21 +-
 additional/recover/run.sh                          |   32 +-
 .../rspecs/taler.many.with-auditor.rspec           |  137 +-
 additional/rspecs/taler.minial.rspec               |   26 +-
 .../rspecs/taler.neowise.rspec                     |  250 +--
 configs/etc/default/prometheus-postgres-exporter   |    2 +-
 configs/etc/monitor/node-exporters.yaml.tpl        |    4 +
 configs/etc/monitor/postgres-exporter.yaml         |   14 +
 configs/etc/monitor/promtail.yaml                  |   31 +-
 .../nginx/sites-available/{fakebank => auditor}    |   11 +-
 configs/etc/nginx/sites-available/exchange         |    2 +
 configs/etc/nginx/sites-available/fakebank         |    2 +
 configs/etc/nginx/sites-available/merchant         |    3 +
 configs/etc/taler/conf.d/auditor.conf              |   16 +
 configs/etc/taler/conf.d/exchange-business.conf    |    2 +
 configs/etc/taler/conf.d/fake-bank.conf            |    1 +
 configs/etc/taler/secrets/exchange-db.secret.conf  |    3 +
 .../lib/systemd/system/taler-auditor-httpd.service |   13 +
 .../systemd/system/taler-exchange-httpd@.service   |    1 +
 .../system/taler-exchange-secmod-cs.service        |    1 +
 .../system/taler-exchange-secmod-eddsa.service     |    2 +-
 .../system/taler-exchange-secmod-rsa.service       |    1 +
 .../usr/lib/systemd/system/taler-fakebank.service  |    4 +-
 .../usr/lib/systemd/system/taler-netdelay.timer    |    2 +-
 experiment/env                                     |   26 +-
 experiment/scripts/auditor.sh                      |  290 ++++
 experiment/scripts/bank.sh                         |   18 +
 experiment/scripts/bench2.sh                       |   15 +
 experiment/scripts/benchmark.sh                    |   45 +-
 experiment/scripts/createusers.sh                  |   39 +
 experiment/scripts/database.sh                     |   83 +-
 experiment/scripts/exchange-proxy.sh               |    2 +-
 experiment/scripts/exchange.sh                     |   11 +-
 experiment/scripts/helpers.sh                      |   27 +-
 experiment/scripts/monitor.sh                      |   34 +-
 experiment/scripts/run.sh                          |    5 +
 experiment/scripts/setup.sh                        |   20 +-
 experiment/scripts/shard.sh                        |    5 +-
 experiment/scripts/taler-perf.sh                   |    6 +-
 experiment/taler.many.rspec                        |  126 +-
 image/debian11/taler-debian11.yaml                 |    7 +-
 47 files changed, 2968 insertions(+), 888 deletions(-)

diff --cc additional/recover/run.sh
index 1565ef0,14c4daf..c88bdac
--- a/additional/recover/run.sh
+++ b/additional/recover/run.sh
@@@ -40,12 -52,12 +52,10 @@@ els
    cp -r ${EXP_DATA} ${TMP_BASEDIR}
  fi
  
--
  # load the times to adjust the grafana dashboards
  source "${TMP_BASEDIR}/times.env" || fail \
  "Archive does not contain times.env,
  make sure to pass an uncomressed tar archive created with persist.sh or the 
unpacked exp-data folder"
-- 
  
  START=$(date --date=@${EXPERIMENT_START} +"%F %T")
  END=$(date --date=@${SNAPSHOT_TIME} +"%F %T")
@@@ -65,7 -77,7 +75,9 @@@ function startup() 
      OUTPUT="${DASHBOARDS_DIR}/$(basename $FILE)"
      sed -e 's/${DS_PROMETHEUS}/default-prometheus/g' \
        -e 's/${DS_LOKI}/default-loki/g' $FILE | \
--    jq --arg f "${START}" --arg t "${END}" '.time.from=$f | .time.to=$t' > 
$OUTPUT
++    jq --arg f "${START}" \
++       --arg t "${END}" \
++       '.time.from=$f | .time.to=$t' > $OUTPUT
    done
  
    docker-compose down

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