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

2015-08-05 00:22:38 +00:00
parent 7430181d65
commit cc02e50fc7
3 changed files with 18 additions and 2 deletions
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	build push

 IMAGE = fluentd-elasticsearch
-TAG = 1.7
+TAG = 1.8

 build:	
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -78,6 +78,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