github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Robinson
2015-08-05 00:22:38 +00:00
parent 7430181d65
commit cc02e50fc7
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@@ -1,7 +1,7 @@
.PHONY: build push .PHONY: build push
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.7 TAG = 1.8
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

16
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View File

@@ -78,6 +78,22 @@
tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')} tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
</match> </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> <source>
type tail type tail
format none format none

2
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View File

@@ -6,7 +6,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-elasticsearch - name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.7 image: gcr.io/google_containers/fluentd-elasticsearch:1.8
resources: resources:
limits: limits:
cpu: 100m cpu: 100m