[taler-grid5k] 34/73: exporter for merchant now on monitor too

[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 334e9f06e9cae34271b0b658b77108aaa487268e
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Nov 30 16:05:38 2021 +0100

    exporter for merchant now on monitor too
---
 configs/etc/default/prometheus-postgres-exporter | 2 +-
 experiment/env                                   | 2 +-
 experiment/scripts/database.sh                   | 2 +-
 experiment/scripts/merchant.sh                   | 8 ++++++--
 experiment/scripts/monitor.sh                    | 7 ++++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/configs/etc/default/prometheus-postgres-exporter 
b/configs/etc/default/prometheus-postgres-exporter
index e99a8e7..fe82513 100644
--- a/configs/etc/default/prometheus-postgres-exporter
+++ b/configs/etc/default/prometheus-postgres-exporter
@@ -4,7 +4,7 @@
 
 # DATA_SOURCE_NAME='postgresql://login:password@hostname:port/'
 # DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres'
-DATA_SOURCE_NAME='<EXCHANGE_DB_URL_HERE>','<MERCHANT_DB_URL_HERE>'
+DATA_SOURCE_NAME='<EXCHANGE_DB_URL_HERE>,<MERCHANT_DB_URL_HERE>'
 
 # Set the command-line arguments to pass to the server.
 ARGS='--extend.query-path=/etc/monitor/postgres-exporter.yaml'
diff --git a/experiment/env b/experiment/env
index 02b83b0..9fa06af 100644
--- a/experiment/env
+++ b/experiment/env
@@ -27,7 +27,7 @@ MERCHANT_DOMAIN=merchant.${DNS_ZONE}
 # E.g. -L INFO
      TALER_ARGS="-L INFO"
 # Service specific arguments to pass at startup
-AGGREGATOR_ARGS=""
+AGGREGATOR_ARGS="-y"
     CLOSER_ARGS=""
   EXCHANGE_ARGS=""
   TRANSFER_ARGS=""
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 92d0cc3..17276f3 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -56,7 +56,7 @@ if [[ "$1" == "init" ]]; then
   setup_config
 fi
 
-# pgbouncer does not cleanup those...
+# pgbouncer does not cleanup those sometimes
 rm -f /var/run/postgresql/pgbouncer.pid
 rm -f /var/run/postgresql/.s.PGSQL.6432
   
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index ceeaa2e..8ad1a4c 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -23,8 +23,13 @@ then
   
   sed -i "s/local\s* all\s* postgres\s* peer/local all postgres trust/g" \
        /etc/postgresql/13/main/pg_hba.conf
+
+  echo "
+  host all postgres 172.16.0.0/12 trust
+  " >> /etc/postgresql/13/main/pg_hba.conf
   
   echo "
+  listen_addresses='*'
   shared_preload_libraries='pg_stat_statements,auto_explain'
   " >> /etc/postgresql/13/main/postgresql.conf
 fi
@@ -50,5 +55,4 @@ fi
 sed -i "s\<DB_URL_HERE>\user=postgres host=/run/postgresql 
dbname=taler-merchant\g" \
        /etc/default/prometheus-postgres-exporter
 
-systemctl restart taler-merchant-httpd \
-                 prometheus-postgres-exporter
+systemctl restart taler-merchant-httpd
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 8f7105e..3811818 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -39,11 +39,12 @@ function configure_prometheus_and_exporters() {
   sed -i "s/<MERCHANT_HOST_HERE>/${MERCHANT_DOMAIN}/g" \
        /etc/monitor/prometheus.yaml
   
-  sed -i "s\<DB_URL_HERE>\postgresql://postgres@${DATABASE_DOMAIN}:5432\g" \
-       /etc/default/prometheus-postgres-exporter
+  sed -i -e 
"s\<EXCHANGE_DB_URL_HERE>\postgresql://postgres@${DATABASE_DOMAIN}:5432\g" \
+         -e 
"s\<MERCHANT_DB_URL_HERE>\postgresql://postgres@${MERCHANT_DOMAIN}:5432\g" \
+             /etc/default/prometheus-postgres-exporter
   
   sed -i "s\<PROXY_URL_HERE>\http://${PROXY_DOMAIN}/stub_status\g"; \
-       /etc/default/prometheus-nginx-exporter
+          /etc/default/prometheus-nginx-exporter
 }
 
 

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