From d3465e5b8c7e0283b401d0bb4c8238f5d457fe0f Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Mon, 7 Nov 2016 15:10:52 +0100
Subject: [PATCH] Add rescheduler logs to the fluentd-gcp configuration

---
 .../fluentd-gcp-image/google-fluentd-journal.conf  | 14 ++++++++++++++
 .../fluentd-gcp-image/google-fluentd.conf          | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

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 9b844a25c49..2bfc38bf6bf 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
@@ -171,6 +171,20 @@
   tag kube-scheduler
 </source>
 
+# Example:
+# I1104 10:36:20.242766       5 rescheduler.go:73] Running Rescheduler
+<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/rescheduler.log
+  pos_file /var/log/gcp-rescheduler.log.pos
+  tag rescheduler
+</source>
+
 # Example:
 # I0603 15:31:05.793605       6 cluster_manager.go:230] Reading config from path /etc/gce.conf
 <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 37135026192..cbd784fd9c1 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -172,6 +172,20 @@
   tag kube-scheduler
 </source>
 
+# Example:
+# I1104 10:36:20.242766       5 rescheduler.go:73] Running Rescheduler
+<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/rescheduler.log
+  pos_file /var/log/gcp-rescheduler.log.pos
+  tag rescheduler
+</source>
+
 # Example:
 # I0603 15:31:05.793605       6 cluster_manager.go:230] Reading config from path /etc/gce.conf
 <source>