[taler-grid5k] 114/141: update configs

[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 380098f00da468dd5678df2c2c690145b716c303
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Nov 8 18:15:10 2021 +0100

    update configs
---
 configs/etc/monitor/promtail.yaml       | 13 -------------
 configs/etc/nginx/sites-available/proxy |  2 +-
 configs/etc/rsyslog.d/taler.conf        |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index a2dc4b4..2cd2a75 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -17,18 +17,5 @@ scrape_configs:
   relabel_configs:
     - 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
-# Add a different syslog receiver for the wallets
-# We omit process id here since it changes too often, see 
-# https://grafana.com/blog/2020/08/27/the-concise-guide-to-labels-in-loki/
-- job_name: wallet
-  syslog:
-    listen_address: 0.0.0.0:1515
-    labels:
-      job: wallet
-  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 c5f400a..6ccd1c9 100644
--- a/configs/etc/nginx/sites-available/proxy
+++ b/configs/etc/nginx/sites-available/proxy
@@ -18,7 +18,7 @@ server {
 
   server_name localhost;
 
-  access_log syslog:server=localhost,facility=user,tag=proxy,severity=info 
taler;
+  access_log 
syslog:server=localhost,facility=user,tag=taler-proxy,severity=info taler;
 
   allow 172.16.0.0/12;
   deny all;
diff --git a/configs/etc/rsyslog.d/taler.conf b/configs/etc/rsyslog.d/taler.conf
index 43223b1..1310d2d 100644
--- a/configs/etc/rsyslog.d/taler.conf
+++ b/configs/etc/rsyslog.d/taler.conf
@@ -1,7 +1,7 @@
 module(load="omprog")
 # Need to load due to parser error https://github.com/grafana/loki/issues/1783
 module(load="mmutf8fix")
-if ($programname startswith 'taler' or $syslogtag startswith 'proxy') then {
+if ($programname startswith 'taler' or $syslogtag startswith 'taler') then {
   action(type="mmutf8fix" replacementChar="?")
 # 
https://grafana.com/docs/loki/latest/clients/promtail/scraping/#rsyslog-output-configuration
   action(type="omfwd"

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