flux.yml

@@ -213,9 +213,6 @@ spec:
         # Enable garbage collection
         - --sync-garbage-collection
 
-        # Set log format to json
-        - --log-format=json
-
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
       # dnsPolicy: "None"

workloads/kube-system/fluentd-config.yml

@@ -10,7 +10,6 @@ data:
     @include "#{ENV['FLUENTD_SYSTEMD_CONF'] || 'systemd'}.conf"
     @include "#{ENV['FLUENTD_PROMETHEUS_CONF'] || 'prometheus'}.conf"
     @include kubernetes.conf
-    @include nextcloud.conf
     @include conf.d/*.conf
     @include filters.conf
 
@@ -55,50 +54,26 @@ data:
   disable.conf: ""
 
   filters.conf: |
-    <filter kubernetes.var.log.containers.nextcloud-** kubernetes.var.log.containers.echoserver-**>
+    <filter kubernetes.var.log.containers.nextcloud-**>
       @type parser
       key_name log
       reserve_data true
+      inject_key_prefix apache2.
       <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
-      <parse>
-        @type json
-      </parse>
-    </filter>
-
-  nextcloud.conf: |
-    <source>
-      @type tail
-      @id in_tail_nextcloud_log
-      path /opt/nextcloud/nextcloud.log
-      pos_file /var/log/nextcloud.log.pos
-      tag nextcloud.log
-      read_from_head true
-      reserve_data true
-      <parse>
-        @type json
-        time_key time
-        time_format %Y-%m-%dT%H:%M:%S%z
-      </parse>
-    </source>
-
   kubernetes.conf: |
     <label @FLUENT_LOG>
       <match fluent.**>

workloads/kube-system/fluentd-daemonset-elasticsearch-rbac.yaml

@@ -105,9 +105,6 @@ spec:
           readOnly: true
         - name: config-volume
           mountPath: /fluentd/etc
-        - name: nextcloud-data
-          mountPath: /opt/nextcloud/nextcloud.log
-          subPath: data/nextcloud.log
       terminationGracePeriodSeconds: 30
       volumes:
       - name: varlog
@@ -119,7 +116,3 @@ spec:
       - name: config-volume
         configMap:
           name: fluentd-logging
-      - name: nextcloud-data
-        hostPath:
-          path: /opt/nextcloud/pod
-          type: Directory