From 3d16c9b4250b8384d59db032605bf2ae14deb842 Mon Sep 17 00:00:00 2001
From: Mike Shoup <mike@shoup.io>
Date: Sun, 19 Apr 2020 09:03:50 -0600
Subject: [PATCH] Parse flux as json

---
 flux.yml                                 | 3 +++
 workloads/kube-system/fluentd-config.yml | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flux.yml b/flux.yml
index a3efb60..6b58d18 100644
--- a/flux.yml
+++ b/flux.yml
@@ -213,6 +213,9 @@ spec:
         # Enable garbage collection
         - --sync-garbage-collection
 
+        # Set log format to json
+        - --logFormat json
+
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
       # dnsPolicy: "None"
diff --git a/workloads/kube-system/fluentd-config.yml b/workloads/kube-system/fluentd-config.yml
index 6b535e2..f20379d 100644
--- a/workloads/kube-system/fluentd-config.yml
+++ b/workloads/kube-system/fluentd-config.yml
@@ -58,29 +58,27 @@ data:
       @type parser
       key_name log
       reserve_data true
-      inject_key_prefix web.
       <parse>
         @type apache2
       </parse>
     </filter>
+
     <filter kubernetes.var.log.containers.hass-**>
       @type parser
       key_name log
       reserve_data true
-      inject_key_prefix hass.
       <parse>
         @type regexp
         expression /^(?<logtime>.*) (?<level>.*) \((?<thread>.*)\) \[(?<source>.*)\] (?<message>.*)$/
       </parse>
     </filter>
+
     <filter kubernetes.var.log.containers.flux-**>
       @type parser
       key_name log
       reserve_data true
-      inject_key_prefix flux.
       <parse>
-        @type regexp
-        expression /^ts=(?<logtime>.*) caller=(?<caller>.*) component=(?<component>.*) msg="(?<message>.*)"$/
+        @type json
       </parse>
     </filter>