Don't parse as apache2

workloads/grafana/grafana-deploy.yml

@@ -60,6 +60,10 @@ spec:
           value: "true"
         - name: GF_AUTH_SIGNOUT_REDIRECT_URL
           value: "https://grafana.shoup.io/oauth2/sign_out"
+        - name: GF_LOG_MODE
+          value: console
+        - name: GF_LOG_CONSOLE_FORMAT
+          value: json
         resources:
           requests:
             memory: "128Mi"

workloads/grafana/grafana-proxy.yml

@@ -2,23 +2,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: grafana-proxy
+      app: grafanaproxy
   template:
     metadata:
       labels:
-        app: grafana-proxy
+        app: grafanaproxy
     spec:
       containers:
       - image: quay.io/oauth2-proxy/oauth2-proxy:v5.1.0
         args: ["-email-domain=*", "-upstream=http://grafana:3000/"]
         imagePullPolicy: IfNotPresent
-        name: grafana-proxy
+        name: grafanaproxy
         env:
         - name: OAUTH2_PROXY_SKIP_AUTH_REGEX
           value: "/metrics(.*)"
@@ -27,19 +27,19 @@ spec:
         - name: OAUTH2_PROXY_COOKIE_SECRET
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: cookie_secret
         - name: OAUTH2_PROXY_PROVIDER
           value: nextcloud
         - name: OAUTH2_PROXY_CLIENT_ID
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: client_id
         - name: OAUTH2_PROXY_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: client_secret
         - name: OAUTH2_PROXY_LOGIN_URL
           value: https://cloud.shoup.io/index.php/apps/oauth2/authorize

workloads/grafana/grafana-service.yml

@@ -14,11 +14,11 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   selector:
-    app: grafana-proxy
+    app: grafanaproxy
   ports:
   - protocol: TCP
     port: 4180
@@ -35,6 +35,6 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: grafana-proxy
+          serviceName: grafanaproxy
           servicePort: 4180
         path: /

workloads/grafana/proxy-secret.yml

@@ -2,17 +2,17 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   creationTimestamp: null
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   encryptedData:
-    client_id: AgBu+8R7fOXp46KQR9bQikbTUOvI3CA0xqPcMVlZnTUurrtoc37VXCD8EMN+RDmm9qrUAKQVYRJ+t1UfoSmcdhZQx9Vg3omtjZWLY9o++/lsiM1lcXh/XzxvR/Z43VaRGz9nrQNYvsw5+L9Z+o/Fn/46wm2GyVcgpJs0qrF9fJ6fpGUWO133txbcCQYYKD/Ro2osNtlFDti4f0k3MXqiOmM4mfwwls99BGu6cx5mGT69p3vVOBL6BTDu8YVBHtPTwQwuGVvnIikGS1RzdwMN8q1ND9Z9ZwxVDItIS3e5d3iTHJzDMP5h7G6fdvMsc5Mvd6vK6S+kdEVeQS0dGacq4ylkST1M+0Rnep6GyAG0KmCis3X4YgSBf8fDNEhDrnh16rY7MwfG/clSsTjwvRe6Xo6V2r/I2rFncRD4x2eUryWJUtSd6Y9NVBTwwr1AwTk0kUm1+VJwQ6eJtJVdysg164et16vy5Z++jXoxpmk5hsqdqF5jVEa9wB5ROLenV6m2vFS1JFvxkfCzJ2oMnu+mlOOFeLhxWqILGo8IIzxVKdALdeRuDqsywZ5qOqouCnklO/ZSRPe6IrNK3ha0l3vWNnhJmls6Q4SSuDvUG0D1DzDOLdeePAYE2ghLWcUrY8zXp8TMzqUUZlAzLt9NJSg/ohdhCnolCPOlTp0sNJyLk9LXDl1SlEsbP/4b3NvlGf+7Q3q7WDFBkcn1P6GwK/utY1G6///NOH4NGPX6w9aVYkRQMFzQNKTpixQ+RGctf454snvxdct+UQeKRO8lkaN27Mr+
-    client_secret: AgCbE4VopDMBV+34Mx6KKonxuRnuUUq4vr7LkyNTYpO+EbWIJaOSBVWNCbtD9h2PmEXxcXNoIjjInzuFTpAytvJlIHx9lOe4CM7ZGkXFbt0+E6taGoQ5Ys1Oq3S5IWBw05LK/2t6JqdHI4ANoncIrB6e3dpRv5bHJDyoVS1ml97K7dTJt/A5WqKsA1E6U6/uXvQyHtqEoD/kMKnoBR15b9AiVCh+9Cjx3R0Uk00zSa2rz4uSQysr6ndXYzqouJxCCwh+0oWzk35I1PCpZKKL3GS/PNoAueJOA4rx0uwQNVZLEGQIv7NXCCQspgeE8ozTcX3GQXp7agQlMKbs0xPYeSdJ6u2gHez4xGiBmtFcHtsaJFwWexzEBi7/wMKe3e6P6yTBir4NG0DM/kxb0q2zk0RcssoZAVzjcPMj5A/qys6tDVqmAimGjOVeZ1wP16LdNBgi+MSP77cGFihWtZ8hxm0IyENsommiVvRGIP+OW0T3VyHg5DxKXWXuLVz4Qk/W0XiqhCnA7YfRIYHywwpG7kYCly8gi1wUnYwgEvK5VgYT9l3T7K+/FO7d8fl6sfCROHYsN/oDXhIIsbIfDzgqXSLuR756hipX1+G3paL+v1zxuTVX8R84qKraf9ZJnPaUQrG2FOQ3tWDbakZnTzaCo1JW6FkdjZpKWgQke6gL/tK4+Id3D2NVQbCTKgrLWDZB+DbHB96Gryc2RdTzCIA8iugQUQLRSh2LbEojbtO96UcXMIZ83tQ/q8rMBq90hlFk+XPI5cl5UAlKmZRjs2R3Y65m
-    cookie_secret: AgCgbYUhOdQBYhyuZ5BiRqD5hiJnEUMTrY+Dlw+ld02YoLBixpBye/2KNfTxn2N92a3AdDUxHa5LRgxtmDMd050zzsi3Da5L7IjKP9Ycyy/XLFqfChWYiIIU0ofYQ050bqlUmevM1dIEqcoSNMfn65rBIEGKwGWvzkEh2pj+x0p7LIXRsq4fqpRCsfjYv8F1uevUVCc8RFdowVtaJxWA+i5b9bpAIg/0I7nKneXzTSP6N14tai3vslUj9Rd/J+d+o/Llsa+NBQQrlibvWaMobwkZGKAh/nIrL0oDe8mIHn0NfD/j3gh9J/xqCp+x4cfAOVDmvFSsTax3G+4Yv6wXEk8Quu/TeKRm62Fn5gFgYNK1mxq148HT87yFQOxWla6ovdK6kGVo0UNSubBE046wfGYRH5YIwyod8ZaohI5f/FlLj4GDD07g4TjlrnAfGTwdyKmIDuEjYLYVqtJq7jT6jd23PSq5Ek0tP1/VwKq8WHgH+wFRQsH7JNo19XqjDBH1y6VkPuxlSyjJv53PQzuWqw6/q1odnvahn8lxpUHNfKC3Jn8rRaNtrzSRHetLU3hKaQv5pB+veJplp9QpbdPJabHaXF1fFEJZprB2vch3NGFIVUzPvuw1tBV4fG2oT4EuaMTKqrNRY/ZiU0YEcomefWL2Q579GrdhFLOd1rUN74tK8+/ZB0rIUa2ivl1hUSfQg0tLR739KriXnfnu6aF6qaYcAR3YU7Sveg9WoN3rJ3Ija0KzfO4toFi049mNgTj2KS3NUM1JAIUN4axbCmlSQRGT
+    client_id: AgBgtwQkFDlVT6z0BYyZ7n+5USVqmuh5eLB4HzZM90UWaFKmqvmHwOZ210oBgatc5uOSaEDbU18GYzpd30gstTZqglr7/tBLV4JfEJ6shRRu1B0nTDTxgjYAjNxF+N4aga7BOeo2tFTfkhJif/eP7kGCFLh3K+ywnI45qvyoeSDOQVFul39bqbwiPBU93qBvek9ohr7fsuBXUZPFM2OQyIWEp9KscRtEHe7mo+Ef9Wa+I542KTA72ScMQ3HPJzQTxQ6S6aha5MQ8aAu2FKCiE0V+E+kZ0esdmCMxn63egmXPE4Haf9gCJyJ4uHYTk9gxqUqQfD9leHcHu6tEnmw4ADl0M6Bj1CVS6LSfPgDPPkaLHZDFfHH7iCvrrXFeRXc5WUB4bNWbKmxd8+Y0V/ste8uzMcVlqsHhlgQnMQlHgMrMFnWMFZrFoke2R+FZ9WrO6eXvooTySG20ppO6NnLPjaPnmomLlWbqypBue4aAIK3KA5l8BDjss+E98z2McmkBiZzub7vRvjodVf3EfeFOlNCVZMztkJugKiIUFQ1XRLyUZYusisEeBfITrexZpu/oEKxzXN/++fIKyqP94VrkSebGUiMCcmEffJjnKlmt6U9z2hce3xNIwWiStBDhnfcOOSxT+6hrqrt1p5glcHwWSVaWF1Z5ITzlmwolY530IEdFEgC/zCJzb4p8dqK3prGTq/fMXjJDQaO0LcGsldv61hOveBNpDxnI5gaN94lKKtbuZPYnY31rNcivxBeCVMJEf0fgikBFu6AeTvZdV+pdpBPM
+    client_secret: AgA3/RPUpvv/qICl1qyA0g/0hqr7ggxImwvmcOLXPYIENWii+Iw+0/aYLSBOzkealY5GM9F0JwvwyvJ66ZQ2DccGhpeF8luFT+QMok1shobw7S3Aka79GNJdtCuYmNZ9+9ui0OMrl/48YQEL9xn4JJ/tvSdi9h/MCE2t5DoJBchrZbJ+2TYH6O4JcFM3JUdJWP9Do9QvLHDtcRhLGUdDIoCytZZo2o61isOeSrI/nyiDqppQKKUMLfMg8Li0RbuTYrzNgp/tTbyA91OyzUTyj4AZfFg7k0P5fDMr+c3mSZQYUGXEKRJ4qse+EVOmzgdVsClu2g86Tx14ZwviGsYSg0dd5E2ZvdzfoQZ3FuHF5nSIaNFRVtOGxxEvKc8y8S3B4CBqMzr0LcJAVeApiDzkMWXxQNdJMsuptICJXHhgw/dqSU+4+pplHKC0OhAuPlM6/hh16fQdcK7MV1VyAaWmaX99Ub2CO8aOnbSM/MyzX0D4sqmK8TBXfdobME2f87a5nWEFnOMnyckPMCRhyh/DKnkjhKfCBjV9mgBODVQaoBEYIlLVMjiatnEXbhHzi6i8Kx2dLYKuWE6bDHrRP55v9E33yAgfaa5fP7sFTra+euanpQcZYdWlDIM+s81g1Isfno/mJ0DZ6e50IvPMWDTLtFSKBBYy8L/m6xXwhdu1qbjKZVGIQV32UEjy7M+vimUBCxTIgN2s3jzub399ttnMzv+UnQjvte5Aw/2daHw1HaHa7B+JTtCOJpUiNyHtFB1l+F6kjDkntoip0cDfPCtxNJX7
+    cookie_secret: AgDOOwNi5tZI4EpMP4trTUlCiEdJpFGNUeD2IE3xuKmpdu8WAQOUYu4HCL0HV667x4ZHBcXPf0cohibgYT6ZyqUmpGC9SiCMpnDrf3R0NyKOjLtOkfJ+jBscNlr/KSNIhx351O/y09guGebRqagrWGdfRUWNWTY9OY6zzU+OYVqRKeW4mSh3ut3BWqb+PppHSyMXJ+hGJ8var+VwIMOAOA8FfpaiKtRK+K/wipEJe0uz70dzel7Be2+cBYuVmNTxI9IQyaVNw1NED3OwJDbMdJAHa6uaf626wHdENySgakUc1GNHgPtXEfM+1Xe+BvEtTqCooxy/EvsYemXILw+jOi8exOX1WGtM3C22/HRbSp44MOBrkyh9n2gmXP5LPj5LewmYUe2bPl1V2lj5JcylH7VWAli+JXvGRLooLmimKYmqF1nycJDz3Mq99jKLMstv5yQitGh/ih+FQu2NwC9JJNLyZNb1O7tWh5hjOt0Itl6yzVP8Vn1+naPaqX/xheLAFTCcL7wU5R/QUzk1EzpFCEEs9ivggiMciV/HDJNfozg1yJdLxTU0Pp94EkNECwUEDMKY6bVivY5BWEp28IA8AmshKMr6sAeGgwIKsGWBolRVqcLZucavu5Y1r/NR16NQIVF2vwMTlaCdKk3AAacNeaRxJFqjdpV926c5fMfWw8YhQpyFnoUBHX62+uAPoAFbTyp1WAC5ZyqhMZRhObp6+Uj/SbrDomHQEkP6vehqBiOJMZVeqURJzHOdwSVKYuNcnvbOgysombDOvLMu+1AGfYDl
   template:
     metadata:
       creationTimestamp: null
-      name: grafana-proxy
+      name: grafanaproxy
       namespace: grafana
     type: Opaque
 status: {}

workloads/kube-system/fluentd-config.yml

@@ -74,7 +74,7 @@ data:
       </parse>
     </filter>
 
-    <filter kubernetes.var.log.containers.flux-**>
+    <filter kubernetes.var.log.containers.flux-** kubernetes.var.log.containers.grafana-**>
       @type parser
       key_name log
       reserve_data true