github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Make fluentd-gcp collect etcd's logs on the master.

Browse Source
This commit is contained in:
Alex Robinson 2015-07-30 21:40:40 +00:00
parent a3cb57f48d
commit 9e18c29e9f
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -15,7 +15,7 @@
.PHONY: kbuild kpush .PHONY: kbuild kpush
TAG = 1.9 TAG = 1.10
# Rules for building the test image for deployment to Dockerhub with user kubernetes. # Rules for building the test image for deployment to Dockerhub with user kubernetes.

8
cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
View File

@ -79,6 +79,14 @@
tag docker tag docker
</source> </source>
<source>
type tail
format none
path /varlog/etcd.log
pos_file /varlog/gcp-etcd.log.pos
tag etcd
</source>
<source> <source>
type tail type tail
format none format none

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

@ -6,7 +6,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.9 image: gcr.io/google_containers/fluentd-gcp:1.10
resources: resources:
limits: limits:
cpu: 100m cpu: 100m

2
docs/getting-started-guides/logging.md
View File

@ -169,7 +169,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.9 image: gcr.io/google_containers/fluentd-gcp:1.10
resources: resources:
limits: limits:
cpu: 100m cpu: 100m