[taler-grid5k] 64/141: update promtail - issues with too many open files when too much labels are assigned

[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 d49185d83b25c15e219282ef0f4c3a712a958593
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Oct 20 16:04:51 2021 +0200

    update promtail - issues with too many open files when too much labels are 
assigned
---
 configs/etc/monitor/promtail.yaml       | 11 ++++++++---
 configs/etc/nginx/sites-available/proxy |  1 -
 experiment/scripts/test.sh              | 21 +++++++++++----------
 experiment/scripts/wallet.sh            |  4 ++--
 experiment/taler-perf-any.rspec         | 23 +----------------------
 5 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index 1643765..058bb9e 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -15,12 +15,17 @@ scrape_configs:
     labels:
       job: taler
   relabel_configs:
-    - source_labels: [__syslog_message_severity]
-      target_label: severity
     - source_labels: [__syslog_message_app_name]
       target_label: app
     - source_labels: [__syslog_message_proc_id]
       target_label: proc_id
     - source_labels: [__syslog_message_hostname]
       target_label: host
-
+- job_name: wallets
+  syslog:
+    listen_address: 0.0.0.0:1515
+    labels:
+      job: taler
+  relabel_configs:
+    - source_labels: [__syslog_message_app_name]
+      target_label: app
diff --git a/configs/etc/nginx/sites-available/proxy 
b/configs/etc/nginx/sites-available/proxy
index 5ce229e..b605399 100644
--- a/configs/etc/nginx/sites-available/proxy
+++ b/configs/etc/nginx/sites-available/proxy
@@ -8,7 +8,6 @@ upstream exchange {
 
 log_format taler 'ts=[$time_local]: remote=$remote_addr request=$request 
status=$status '
                  'upstream_connect_time=$upstream_connect_time '
-                 'upstream_header_time=$upstream_header_time '
                 'upstream_response_time=$upstream_response_time '
                  'request_time=$request_time';
 
diff --git a/experiment/scripts/test.sh b/experiment/scripts/test.sh
index aa28dc3..49ccf15 100755
--- a/experiment/scripts/test.sh
+++ b/experiment/scripts/test.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-DB_FILE=~/walletdb/wallet."${1}".json
+FAKE_PID=$1
+DB_FILE=~/walletdb/wallet."${FAKE_PID}".json
 
 function log() {
   logger -s --tcp \
-         --port 1514 \
+         --port 1515 \
          --server ${MONITOR_DOMAIN} \
          --tag taler-wallet \
-         --id \
-         "$1"
+         --id ${FAKE_PID} \
+         "$(date -Ins) taler-wallet-cli-${FAKE_PID} ${2:-INFO} ${1}"
 }
 
 for i in {0..10000};
@@ -21,9 +22,9 @@ do
         --bank "http://${BANK_DOMAIN}/"; \
         --amount KUDOS:1000;
   then
-    log "reserved KUDOS:1000"
+    log "reserved KUDOS:1000" 
   else
-    log "failed to reserve KUDOS"
+    log "failed to reserve KUDOS" "ERROR"
     continue
   fi
 
@@ -32,9 +33,9 @@ do
       run-until-done \
         --max-retries=10;
   then
-    log "retrieved all reserved KUDOS"
+    log "retrieved all reserved KUDOS" 
   else 
-    log "failed to retrieve KUDOS"
+    log "failed to retrieve KUDOS" "ERROR"
     continue
   fi
 
@@ -45,9 +46,9 @@ do
        deposit create KUDOS:100 \
         "payto://x-taler-bank/${BANK_DOMAIN}/Exchange";
     then
-      log "paid KUDOS:100 to bank"
+      log "paid KUDOS:100 to bank" 
     else 
-      log "failed to pay KUDOS:100"
+      log "failed to pay KUDOS:100" "ERROR"
       continue
     fi
   done
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index 2ff65c1..ef290e8 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -3,9 +3,9 @@ set -eux
 
 source ~/scripts/helpers.sh
 
-if !grep -qs 'walletdb' /proc/mounts; then
+if ! grep -qs 'walletdb' /proc/mounts; then
   mkdir ~/walletdb
-  mount -t tmpfs -o size=250m tmpfs ~/walletdb
+  mount -t tmpfs -o size=500m tmpfs ~/walletdb
 fi
 
 wait_for_keys "${PROXY_DOMAIN}"
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index beeff41..7a98be9 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-17T09:50:12.630+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-20T14:03:09.438+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -51,25 +51,4 @@
     <hardware_type name="grvingt-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="762.5" 
y="315.5"/>
   </node>
-  <node client_id="wallet-3" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="462.5" 
y="358.5"/>
-  </node>
-  <node client_id="wallet-4" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="610.5" 
y="359.5"/>
-  </node>
-  <node client_id="wallet-5" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="764.5" 
y="360.5"/>
-  </node>
 </rspec>
\ No newline at end of file

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