Collect more of the VM's log files (monit, salt) in fluentd-gcp.

2015-08-05 00:21:47 +00:00
parent 879bf62e27
commit 7430181d65
4 changed files with 19 additions and 3 deletions
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -15,7 +15,7 @@

 .PHONY:	kbuild kpush

-TAG = 1.10
+TAG = 1.11

 # Rules for building the test image for deployment to Dockerhub with user kubernetes.

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -63,6 +63,22 @@
  tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 </match>

+<source>
+  type tail
+  format none
+  path /varlog/monit.log
+  pos_file /varlog/gcp-monit.log.pos
+  tag monit
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/salt/minion
+  pos_file /varlog/gcp-salt.pos
+  tag salt
+</source>
+
 <source>
  type tail
  format none