From 26699df52687b55cecf4f5e98760b030880d2abf Mon Sep 17 00:00:00 2001
From: BacLuc <lucius.bachmann@gmx.ch>
Date: Sat, 15 Jun 2024 14:52:28 +0200
Subject: [PATCH 1/2] ecamp3-logging: strip prefix "{datetime} stdout F " in
 fluentd

Before this was done by fluent-bit automatically with
the tail clusterinput, when the container engine was set to containerd.
Since fluent-operator helm chart 2.8.0, this does not work anymore.
-> Thus we do it with fluentd.

After stripping this prefix, we can do the json parsing.
---
 .../templates/fluentd/fluentd_clusterfilter.yaml           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
index b6218ef2c5..47322f022c 100644
--- a/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
+++ b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
@@ -11,6 +11,13 @@ spec:
   filters:
     - customPlugin:
         config: |
+          <filter **>
+            @type record_transformer
+            enable_ruby
+            <record>
+              log ${record['log'].gsub(/^.*stdout F {/, "{")}
+            </record>
+          </filter>
           <filter **>
             @type parser
             key_name log

From bf9f3b87aad859f2937e7d3b1658739ad25fba5f Mon Sep 17 00:00:00 2001
From: BacLuc <lucius.bachmann@gmx.ch>
Date: Sun, 28 Jul 2024 15:03:26 +0200
Subject: [PATCH 2/2] ecamp3-logging: also strip stderr of log messages

This allows us to also parse the messages
of Caddy as json.
---
 .../ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
index 47322f022c..d36f0e2ff7 100644
--- a/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
+++ b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml
@@ -15,7 +15,7 @@ spec:
             @type record_transformer
             enable_ruby
             <record>
-              log ${record['log'].gsub(/^.*stdout F {/, "{")}
+              log ${record['log'].gsub(/^.*std(out|err) F {/, "{")}
             </record>
           </filter>
           <filter **>