github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5529 from satnam6502/fluentd-gcp-image

Browse Source 
Make Fluentd to Cloud Logging collector read from head
This commit is contained in:
Alex Robinson 2015-03-16 16:24:47 -07:00
commit 2fee5ba059
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ version: v1beta2
id: fluentd-to-gcp id: fluentd-to-gcp
containers: containers:
- name: fluentd-gcp-container - name: fluentd-gcp-container
image: kubernetes/fluentd-gcp:1.0 image: kubernetes/fluentd-gcp:1.1
volumeMounts: volumeMounts:
- name: containers - name: containers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers

2
contrib/logging/fluentd-gcp-image/Makefile
View File

@ -6,7 +6,7 @@
.PHONY: build push .PHONY: build push
TAG = 1.0 TAG = 1.1
build: build:
sudo docker build -t kubernetes/fluentd-gcp:$(TAG) . sudo docker build -t kubernetes/fluentd-gcp:$(TAG) .

5
contrib/logging/fluentd-gcp-image/google-fluentd.conf
View File

@ -19,10 +19,11 @@
path /var/lib/docker/containers/*/*-json.log path /var/lib/docker/containers/*/*-json.log
pos_file /var/lib/docker/containers/containers.log.pos pos_file /var/lib/docker/containers/containers.log.pos
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S
tag docker.container.* tag docker.*
read_from_head true
</source> </source>
<match docker.container.**> <match docker.**>
type google_cloud type google_cloud
flush_interval 5s flush_interval 5s
# Never wait longer than 5 minutes between retries. # Never wait longer than 5 minutes between retries.