From 28c284b61a7c3ba517ac3cfe41e9aa85f7070715 Mon Sep 17 00:00:00 2001
From: mdemirhan <mdemirhan@google.com>
Date: Mon, 18 Jun 2018 09:23:03 -0700
Subject: [PATCH] Fix fluentd config for ES backend. 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.

---
 .../100-fluentd-configmap.yaml                | 19 -------------------
 .../100-fluentd-configmap.yaml                | 19 -------------------
 2 files changed, 38 deletions(-)

diff --git a/config/monitoring/150-elasticsearch-dev/100-fluentd-configmap.yaml b/config/monitoring/150-elasticsearch-dev/100-fluentd-configmap.yaml
index 3376a9615e91..069ed8ccafdc 100644
--- 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
index 1b936b8d4455..031e864d47ef 100644
--- 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