[taler-grid5k] 127/189: adjust database logs

[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 f2c46752cf1c262b7e55aa7bffa9741f7e5bbb24
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Apr 8 15:23:09 2022 +0200

    adjust database logs
---
 additional/recover/run.sh           |  9 ++++++--
 configs/etc/monitor/prometheus.yaml |  1 +
 configs/etc/monitor/promtail.yaml   | 46 +++++++++++++++++++++++++++++++++++--
 experiment/scripts/database.sh      |  5 ++++
 experiment/scripts/proxy.sh         |  2 +-
 experiment/scripts/wallet.sh        |  2 +-
 6 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/additional/recover/run.sh b/additional/recover/run.sh
index da407f6..4a62dc1 100755
--- a/additional/recover/run.sh
+++ b/additional/recover/run.sh
@@ -8,8 +8,13 @@ if [[ -z ${1} ]]; then
   exit 1
 fi
 
+TMP_BASEDIR=/tmp/taler-perf
+
+DASHBOARDS_DIR="${TMP_BASEDIR}/dashboards"
+mkdir -p ${DASHBOARDS_DIR} || true
+
 # use a backup as it gets overriden by Prometheus at start
-PROMETHEUS_DATA=/tmp/taler-perf/prometheus-data
+PROMETHEUS_DATA="${TMP_BASEDIR}/prometheus-data"
 cp -r ${1} ${PROMETHEUS_DATA}
 
 # load the times to adjust the grafana dashboards
@@ -30,7 +35,7 @@ function startup() {
   # having to search for the experiment time in the browser
   for FILE in $(find ../grafana -iname "*json" ! -iname "logs.json") 
   do
-    OUTPUT="/tmp/taler-perf/dashboards/$(basename $FILE)"
+    OUTPUT="${DASHBOARDS_DIR}/$(basename $FILE)"
     sed 's/${DS_PROMETHEUS}/default-prometheus/g' $FILE | \
     jq --arg f "${START}" --arg t "${END}" '.time.from=$f | .time.to=$t' > 
$OUTPUT
   done
diff --git a/configs/etc/monitor/prometheus.yaml 
b/configs/etc/monitor/prometheus.yaml
index 7d0ab4e..87924c0 100644
--- a/configs/etc/monitor/prometheus.yaml
+++ b/configs/etc/monitor/prometheus.yaml
@@ -26,6 +26,7 @@ scrape_configs:
 
   # Promtail with custom metrics
   - job_name: 'promtail'
+    scrape_interval: 2s
     static_configs:
     - targets: ['127.0.0.1:9080']
   
diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index 88c5507..8437be3 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -9,6 +9,7 @@ clients:
   - url: http://127.0.0.1/loki/api/v1/push
 
 scrape_configs:
+
 - job_name: taler
   syslog:
     listen_address: 0.0.0.0:1514
@@ -20,9 +21,49 @@ scrape_configs:
       target_label: app
     - source_labels: [__syslog_message_hostname]
       target_label: host
-- job_name: nginx
+
+- job_name: database
   syslog:
     listen_address: 0.0.0.0:1515
+    labels:
+      job: database
+    max_message_length: 65536
+  relabel_configs:
+    - source_labels: [__syslog_message_app_name]
+      target_label: app
+  pipeline_stages:
+    - match:
+      selector: '{job="database"} |~ "duration:"'
+      stages:
+      - regex:
+          expression: '.*duration: (?P<time>\d+.?\d?)ms.*'
+      - metrics:
+          num_slow_queries:
+            prefix: 'taler_database_'
+            type: Counter
+            description: 'Exchange database number of slow queries'
+            config:
+              match_all: true
+              action: inc
+    - match:
+      selector: '{job="database"} |~ "(.*011Query 
Text:.*)|(.*duration:.*execute.*)"'
+      stages:
+      - regex:
+          expression: '(.*011Query Text: (?P<txt>.*))|(.*duration.*execute 
[a-zA-Z_]+: (?P<plan>.*))'
+      - template:
+          source: lbl
+          template: '{{ printf "slow-query" }}'
+      - template:
+          source: query
+          template: '{{ coalesce .txt .plan }}'
+      - labels:
+          type: lbl
+      - output:
+          source: query
+
+- job_name: nginx
+  syslog:
+    listen_address: 0.0.0.0:1516
     labels:
       job: proxy
   relabel_configs:
@@ -85,9 +126,10 @@ scrape_configs:
              source: upstream_response_time
              config:
                buckets: 
[0.001,0.0025,0.005,0.010,0.025,0.050,0.1,0.25,0.5,1,2,5]
+
 - job_name: wallet
   syslog:
-    listen_address: 0.0.0.0:1516
+    listen_address: 0.0.0.0:1517
     labels:
       job: wallet
   relabel_configs:
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 181a187..3ae2866 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -42,6 +42,11 @@ function setup_ram_storage() {
 # Setup the postgresql configuration
 function setup_config() {
 
+  # Use a different port for the database syslog receiver
+  sed -i 's/port="1514"/port="1515"/g' \
+         /etc/rsyslog.d/taler.conf
+  restart_rsyslog
+
   # Grid5000 mounts the default disk on /tmp
   # Move the DB there to get more storage
   if [ -d /var/lib/postgresql ]; then
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index e9bce07..e7ab071 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -52,7 +52,7 @@ function setup_config() {
 
   # Change the port, since we have to limit the number of log lines to parse
   # in loki for best performance
-  sed -i 's/port="1514"/port="1515"/g' \
+  sed -i 's/port="1514"/port="1516"/g' \
          /etc/rsyslog.d/taler.conf
   
   # Allow enough files to be opened by nginx (www-data)
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index ed92bd3..a088a9b 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -19,7 +19,7 @@ source ~/scripts/helpers.sh
 # Enable rsyslog and wait until the exchange is ready
 function init_wallets() {
 
-  sed -i 's/port="1514"/port="1516"/g' \
+  sed -i 's/port="1514"/port="1517"/g' \
          /etc/rsyslog.d/taler.conf
 
   restart_rsyslog

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