From 98b7a4ce426674a17a48e8c194f7ca3bd383790c Mon Sep 17 00:00:00 2001
From: Kazuhiro MUSASHI <simoom634@yahoo.co.jp>
Date: Sat, 24 Oct 2020 12:44:17 +0900
Subject: [PATCH] Modify `promtail` config for `digdag`.

---
 .../digdag/templates/etc/promtail/digdag.yaml | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/cookbooks/digdag/templates/etc/promtail/digdag.yaml b/cookbooks/digdag/templates/etc/promtail/digdag.yaml
index 707c29b..a942688 100644
--- a/cookbooks/digdag/templates/etc/promtail/digdag.yaml
+++ b/cookbooks/digdag/templates/etc/promtail/digdag.yaml
@@ -18,24 +18,27 @@ scrape_configs:
         hostname: <%= @HOSTNAME %>
         __path__: /var/log/supervisor/digdag.log
 
+
     pipeline_stages:
     - match:
-        selector: '{job="digdag"}'
+        selector: '{job="digdag"} |~ "^[0-9]+-[0-9]+-[0-9]+"'
 
         stages:
-        - drop:
-            expression: ^[^0-9]
-
-        - drop:
-            expression: ^[0-9\/]+ .*$
-
         - regex:
-            expression: '^(?P<timestamp>[0-9]+\-[0-9]+\-[0-9]+ [0-9]+:[0-9]+:[0-9]+ [\+\-][0-9]+)[ :]+(\[(?P<level>[^\])]+)\] (?P<message1>[^ ]+) [^ ]+ (?P<message2>.+))$'
+            expression: '^(?P<datetime>\d+\-\d+\-\d+ \d+:\d+:\d+)([\.\d]+)? (?P<timezone>[\+\d]+) \[(?P<level>[^\]]+)\] (?P<message>.+)$'
+
+        - template:
+            source: timestamp
+            template: '{{ .datetime }} {{ .timezone }}'
 
         - timestamp:
             source: timestamp
             format: 2006-01-02 15:04:05 -0700
 
+        - template:
+            source: level
+            template: '{{ if .level }}{{ .level }}{{ else }}notice{{ end }}'
+
         - template:
             source: level
             template: '{{ ToLower .level }}'
@@ -44,13 +47,19 @@ scrape_configs:
             source: level
             template: '{{ regexReplaceAllLiteral "warn" .Value "warning" }}'
 
-        - template:
-            source: message
-            template: '{{ if .message1 }} {{ .message1 }} {{ .message2 }} {{ else }} Digdag has started {{ end }}'
-
         - labels:
             level:
 
         - output:
             source: message
 
+    - match:
+        selector: '{job="digdag"} !~ "^[0-9]+-[0-9]+-[0-9]+"'
+
+        stages:
+        - template:
+            source: level
+            template: 'info'
+
+        - labels:
+            level: