[taler-grid5k] 133/189: cleaner regex

[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 b6a7ff761d26dc878801fe76cc14b6e9430eb48d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Apr 8 16:45:51 2022 +0200

    cleaner regex
---
 configs/etc/monitor/promtail.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index 95da09f..64979f9 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -36,7 +36,7 @@ scrape_configs:
         selector: '{job="database"} |~ "duration:"'
         stages:
         - regex:
-            expression: '.*duration: (?P<time>\d+\.?\d?) ms.*'
+            expression: 'duration: (?P<time>\d+\.*\d*) ms'
         - metrics:
             num_slow_queries:
               prefix: 'taler_database_'
@@ -52,10 +52,10 @@ scrape_configs:
               config:
                 buckets: [10,100,200,500,1000,5000,10000,50000]
     - match:
-        selector: '{job="database"} |~ "(.*011Query 
Text:.*)|(.*duration:.*execute.*)"'
+        selector: '{job="database"} |~ "(011Query Text:)|(duration:.*execute)"'
         stages:
         - regex:
-            expression: '(.*011Query Text: (?P<txt>.*))|(.*duration.*execute 
[a-zA-Z_]+: (?P<plan>.*))'
+            expression: '(011Query Text: (?P<txt>.*))|(duration:.*execute 
[a-zA-Z_]+: (?P<plan>.*))'
         - template:
             source: lbl
             template: '{{ printf "slow-query" }}'
@@ -80,7 +80,7 @@ scrape_configs:
        selector: '{job="proxy"}'
        stages:
        - regex:
-           expression: 
'.*uri=/(?P<ep>[a-zA-Z]+)(?:/\w+)?(?:/(?P<act>[a-zA-Z]+))? 
s=(?P<status>\d{3}).*urt=(?P<upstream_response_time>\d+\.\d+) 
rt=(?P<response_time>\d+\.\d+) rl=(?P<request_length>\d+) 
bs=(?P<bytes_sent>\d+).*'
+           expression: 
'uri=/(?P<ep>[a-zA-Z]+)(?:/\w+)?(?:/(?P<act>[a-zA-Z]+))? 
s=(?P<status>\d{3}).*urt=(?P<upstream_response_time>\d+\.\d+) 
rt=(?P<response_time>\d+\.\d+) rl=(?P<request_length>\d+) 
bs=(?P<bytes_sent>\d+)'
        - template:
            source: endpoint
            template: '{{ printf "%s-%s" .ep .act | trimSuffix "-" }}'
@@ -143,7 +143,7 @@ scrape_configs:
       target_label: app
   pipeline_stages:
     - match:
-        selector: '{job="wallet"} |~ ".*Bench1.*"'
+        selector: '{job="wallet"} |~ "Bench1"'
         stages:
         - template:
             source: script

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