From cf845eda7c63fcb942f209b64d2abfdf2d59c04b Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Thu, 17 Nov 2016 15:52:07 +0100
Subject: [PATCH] Remove fixed docker daemon log time format in fluentd configs

---
 .../addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf  | 1 -
 .../fluentd-gcp/fluentd-gcp-image/google-fluentd-journal.conf    | 1 -
 cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf | 1 -
 3 files changed, 3 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index f8231af0b02..993a421bdaa 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -144,7 +144,6 @@
 <source>
   type tail
   format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
-  time_format %Y-%m-%dT%H:%M:%S.%NZ
   path /var/log/docker.log
   pos_file /var/log/es-docker.log.pos
   tag docker
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd-journal.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd-journal.conf
index 2bfc38bf6bf..a18245e872d 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd-journal.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd-journal.conf
@@ -93,7 +93,6 @@
 <source>
   type tail
   format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
-  time_format %Y-%m-%dT%H:%M:%S.%NZ
   path /var/log/docker.log
   pos_file /var/log/gcp-docker.log.pos
   tag docker
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index cbd784fd9c1..05d6171865e 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -94,7 +94,6 @@
 <source>
   type tail
   format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
-  time_format %Y-%m-%dT%H:%M:%S.%NZ
   path /var/log/docker.log
   pos_file /var/log/gcp-docker.log.pos
   tag docker