github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Update fluentd-es to collect etcd logs and remove merge conflict cruft.

Browse Source
This commit is contained in:
Alex Robinson
2015-07-30 21:41:58 +00:00
parent 9e18c29e9f
commit 69ab7026af
3 changed files with 9 additions and 16 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.6 TAG = 1.7
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .

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

@@ -94,20 +94,13 @@
tag docker tag docker
</source> </source>
<match kubernetes.**> <source>
type elasticsearch type tail
log_level info format none
include_tag_key true path /varlog/etcd.log
host elasticsearch-logging pos_file /varlog/es-etcd.log.pos
port 9200 tag etcd
logstash_format true </source>
flush_interval 5s
# Never wait longer than 5 minutes between retries.
max_retry_wait 300
# Disable the limit on the number of retries (retry forever).
disable_retry_limit
</match>
>>>>>>> Move things into a 'kube-system' namespace.
<source> <source>
type tail type tail

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.6 image: gcr.io/google_containers/fluentd-elasticsearch:1.7
resources: resources:
limits: limits:
cpu: 100m cpu: 100m