From b5b47620f5f13ec2d45dd8879206b99f9a7ecc2f Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Fri, 18 Nov 2016 23:01:07 +0100
Subject: [PATCH] Add kube-proxy logs to fluentd configs

---
 .../fluentd-es-image/td-agent.conf            | 27 ++++++++++++++++---
 .../google-fluentd-journal.conf               | 14 ++++++++++
 .../fluentd-gcp-image/google-fluentd.conf     | 14 ++++++++++
 3 files changed, 51 insertions(+), 4 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 993a421bdaa..b0354a8d30c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -170,6 +170,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -178,11 +179,26 @@
   tag kubelet
 </source>
 
+# Example:
+# I1118 21:26:53.975789       6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
+<source>
+  type tail
+  format multiline
+  multiline_flush_interval 5s
+  format_firstline /^\w\d{4}/
+  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
+  time_format %m%d %H:%M:%S.%N
+  path /var/log/kube-proxy.log
+  pos_file /var/log/es-kube-proxy.log.pos
+  tag kube-proxy
+</source>
+
 # Example:
 # I0204 07:00:19.604280       5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -196,6 +212,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -209,6 +226,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -222,6 +240,7 @@
 <source>
   type tail
   format multiline
+  multiline_flush_interval 5s
   format_firstline /^\w\d{4}/
   format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
   time_format %m%d %H:%M:%S.%N
@@ -230,10 +249,6 @@
   tag rescheduler
 </source>
 
-#<filter kubernetes.**>
-#  type kubernetes_metadata
-#</filter>
-
 # Example:
 # I0603 15:31:05.793605       6 cluster_manager.go:230] Reading config from path /etc/gce.conf
 <source>
@@ -262,6 +277,10 @@
   tag cluster-autoscaler
 </source>
 
+#<filter kubernetes.**>
+#  type kubernetes_metadata
+#</filter>
+
 <match **>
    type elasticsearch
    log_level info
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 a18245e872d..d3b7cdfc3c7 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
@@ -128,6 +128,20 @@
   tag kubelet
 </source>
 
+# Example:
+# I1118 21:26:53.975789       6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
+<source>
+  type tail
+  format multiline
+  multiline_flush_interval 5s
+  format_firstline /^\w\d{4}/
+  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
+  time_format %m%d %H:%M:%S.%N
+  path /var/log/kube-proxy.log
+  pos_file /var/log/gcp-kube-proxy.log.pos
+  tag kube-proxy
+</source>
+
 # Example:
 # I0204 07:00:19.604280       5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
 <source>
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 05d6171865e..f5979201c15 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -129,6 +129,20 @@
   tag kubelet
 </source>
 
+# Example:
+# I1118 21:26:53.975789       6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
+<source>
+  type tail
+  format multiline
+  multiline_flush_interval 5s
+  format_firstline /^\w\d{4}/
+  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
+  time_format %m%d %H:%M:%S.%N
+  path /var/log/kube-proxy.log
+  pos_file /var/log/gcp-kube-proxy.log.pos
+  tag kube-proxy
+</source>
+
 # Example:
 # I0204 07:00:19.604280       5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
 <source>