Fix fluentd config for ES backend. (#1247)

Recent changes broke logging parsing for STDERR and STDOUT while trying to fix /var/log parsing. This change reverts that as stdout/err is more important scenario than /var/log and we will investigate /var/log issue separately.
knative · Jun 18, 2018 · 2ba8e0c · 2ba8e0c
1 parent b27b161
commit 2ba8e0c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 38 deletions.
diff --git a/config/monitoring/150-elasticsearch-dev/100-fluentd-configmap.yaml b/config/monitoring/150-elasticsearch-dev/100-fluentd-configmap.yaml
@@ -49,8 +49,6 @@ data:
     # Add Kubernetes metadata
     <filter kubernetes.**>
       @type kubernetes_metadata
-      merge_json_log false # Don't parse json log
-      preserve_json_log false
     </filter>
   300.forward.input.conf: |-
     # Takes the messages sent over TCP, e.g. request logs from Istio
@@ -59,23 +57,6 @@ data:
       port 24224
     </source>
   900.output.conf: |-
-    # Parse json log before sending to Elastic Search
-    <filter **>
-      @type parser
-      key_name log
-      <parse>
-        @type multi_format
-        <pattern>
-          format json
-          time_key fluentd-time # fluentd-time is reserved for structured logs
-          time_format %Y-%m-%dT%H:%M:%S.%NZ
-        </pattern>
-        <pattern>
-          format none
-          message_key log
-        </pattern>
-      </parse>
-    </filter>
     # Send to Elastic Search
     <match **>
       @id elasticsearch

diff --git a/config/monitoring/150-elasticsearch-prod/100-fluentd-configmap.yaml b/config/monitoring/150-elasticsearch-prod/100-fluentd-configmap.yaml
@@ -49,8 +49,6 @@ data:
     # Add Kubernetes metadata
     <filter kubernetes.**>
       @type kubernetes_metadata
-      merge_json_log false # Don't parse json log
-      preserve_json_log false
     </filter>
   300.forward.input.conf: |-
     # Takes the messages sent over TCP, e.g. request logs from Istio
@@ -59,23 +57,6 @@ data:
       port 24224
     </source>
   900.output.conf: |-
-    # Parse json log before sending to Elastic Search
-    <filter **>
-      @type parser
-      key_name log
-      <parse>
-        @type multi_format
-        <pattern>
-          format json
-          time_key fluentd-time # fluentd-time is reserved for structured logs
-          time_format %Y-%m-%dT%H:%M:%S.%NZ
-        </pattern>
-        <pattern>
-          format none
-          message_key log
-        </pattern>
-      </parse>
-    </filter>
     # Send to Elastic Search
     <match **>
       @id elasticsearch