From c4ecfa437d8a48704a3d565f492c1da313fbff13 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Fri, 25 Aug 2023 19:54:35 +0200
Subject: [PATCH] collect traefik access logs don't collect forgejo access logs

---
 fluent-bit.conf.j2              | 11 ++++++-----
 fluentbit.yml => fluent-bit.yml |  0
 parsers.conf.j2                 |  8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
 rename fluentbit.yml => fluent-bit.yml (100%)

diff --git a/fluent-bit.conf.j2 b/fluent-bit.conf.j2
index c5239ab..7f97c92 100644
--- a/fluent-bit.conf.j2
+++ b/fluent-bit.conf.j2
@@ -129,14 +129,15 @@
 {% if 'swarm' in group_names %}
 [FILTER]
     Name parser
-    Match docker.forgejo_forgejo.**
+    Match docker.traefik_traefik.**
     Key_Name log
-    Parser combinedlog
+    Parser traefiklog
 
 [FILTER]
-    Name grep
-    Match docker.forgejo_forgejo.**
-    Regex host .*
+    Name rewrite_tag
+    Match docker.traefik_traefik.**
+    Rule $host .* access.traefik false
+    Emitter_Name traefik_access_emitter
 {% endif %}
 
 [FILTER]
diff --git a/fluentbit.yml b/fluent-bit.yml
similarity index 100%
rename from fluentbit.yml
rename to fluent-bit.yml
diff --git a/parsers.conf.j2 b/parsers.conf.j2
index 1dfe46c..509937e 100644
--- a/parsers.conf.j2
+++ b/parsers.conf.j2
@@ -18,3 +18,11 @@
     Types host:string ident:string authuser:string request:string status:integer size:integer referer:string useragent:string
     Time_Key date
     Time_Format %d/%b/%Y:%H:%M:%S %z
+
+[PARSER]
+    Name traefiklog
+    Format regex
+    Regex ^(?<host>\S+) (?<ident>\S+) (?<authuser>\S+) \[(?<date>[^\]]+)\] "(?<request>\S+ .+ HTTP\/\d\.\d)" (?<status>\S+) (?<size>\S+) "(?<referer>[^"]*)" "(?<useragent>[^"]*)" (?<requests>\d+) "(?<router>\S+)" "(?<serverurl>\S+)" (?<duration>\d+)ms
+    Types host:string ident:string authuser:string request:string status:integer size:integer referer:string useragent:string requests:integer router:string serverurl:string duration:integer
+    Time_Key date
+    Time_Format %d/%b/%Y:%H:%M:%S %z