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

Merge pull request #2247 from satnam6502/fluentd-es-image

Browse Source 
Change tag to latest and use correct pos file syntax for detection of log rotation
This commit is contained in:
Daniel Smith 2014-11-07 17:03:24 -08:00
commit b4c23f8253
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
.PHONY: build push .PHONY: build push
TAG = 1.0 TAG = latest
build: build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) . sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .

1
contrib/logging/fluentd-es-image/td-agent.conf
View File

@ -38,6 +38,7 @@
format json format json
time_key time time_key time
path /var/lib/docker/containers/*/*-json.log path /var/lib/docker/containers/*/*-json.log
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.container.*
</source> </source>