[taler-grid5k] 42/141: move exporters from db and nginx on monitor host

[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 0ff3644ec2127a2b9387271bf68eb484cdb194b5
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Oct 13 11:03:34 2021 +0200

    move exporters from db and nginx on monitor host
---
 configs/etc/default/prometheus-nginx-exporter |  2 +-
 configs/etc/monitor/prometheus.yaml           |  9 +++++----
 experiment/scripts/database.sh                |  5 +----
 experiment/scripts/monitor.sh                 | 12 +++++++++---
 experiment/scripts/proxy.sh                   |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/configs/etc/default/prometheus-nginx-exporter 
b/configs/etc/default/prometheus-nginx-exporter
index c7cf7df..57da070 100644
--- a/configs/etc/default/prometheus-nginx-exporter
+++ b/configs/etc/default/prometheus-nginx-exporter
@@ -1,4 +1,4 @@
-ARGS="-nginx.scrape-uri http://127.0.0.1:80/stub_status";
+ARGS="-nginx.scrape-uri <PROXY_URL_HERE>"
 
 # Prometheus-nginx-exporter supports the following options:
 #  -nginx.plus
diff --git a/configs/etc/monitor/prometheus.yaml 
b/configs/etc/monitor/prometheus.yaml
index a464bec..706eff7 100644
--- a/configs/etc/monitor/prometheus.yaml
+++ b/configs/etc/monitor/prometheus.yaml
@@ -5,18 +5,19 @@ global:
 rule_files: []
 
 scrape_configs:
+
   # Self
   - job_name: 'prometheus'
     static_configs:
     - targets: ['127.0.0.1:8080']
 
-  # DB
+  # DB Exporter
   - job_name: 'database'
     static_configs:
-    - targets: ['<DB_URL_HERE>:9187']
+    - targets: ['127.0.0.1:9187']
 
-  # Exchange Proxy
+  # Exchange Proxy Exporter 
   - job_name: 'exchange-proxy'
     static_configs:
-      - targets: ['<PROXY_URL_HERE>:9113']
+    - targets: ['127.0.0.1:9113']
   
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index f21dafb..3fd3a7d 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -7,13 +7,10 @@ cd /tmp
 sed -i "s\<DB_URL_HERE>\postgresql:///${DB_NAME}\g" \
        /etc/taler/secrets/exchange-db.secret.conf
 
-sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@localhost/${DB_NAME}\g" 
\
-       /etc/default/prometheus-postgres-exporter
-
 echo "listen_addresses='*'" >> /etc/postgresql/13/main/postgresql.conf
 echo "host all all 172.16.0.0/12 md5" >> /etc/postgresql/13/main/pg_hba.conf
 
-systemctl restart postgresql prometheus-postgres-exporter
+systemctl restart postgresql 
 
 su postgres << EOF
 createuser taler-exchange-httpd
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index e368222..fedf55e 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
+set -eux
 
-sed -i "s/<DB_URL_HERE>/${DATABASE_DOMAIN}/g" /etc/monitor/prometheus.yaml
+sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:5432/${DB_NAME}\g"
 \
+       /etc/default/prometheus-postgres-exporter
 
-sed -i "s/<PROXY_URL_HERE>/${PROXY_DOMAIN}/g" /etc/monitor/prometheus.yaml
+sed -i "s\<PROXY_URL_HERE>\http://${PROXY_DOMAIN}/stub_status\g"; \
+       /etc/default/prometheus-nginx-exporter
 
-systemctl enable prometheus loki 
+systemctl restart prometheus \
+                 loki \
+                 prometheus-postgres-exporter \
+                 prometheus-nginx-exporter
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index 05b75b4..e08747e 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -14,4 +14,4 @@ do
   sleep 1
 done
 
-systemctl restart nginx prometheus-nginx-exporter
+systemctl restart nginx 

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