github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
New Fluentd to Cloud Logging Dockerfile with args
This commit is contained in:
Alex Robinson 2015-04-28 11:01:14 -07:00
commit 3e841510de
3 changed files with 3 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/Dockerfile
View File

@ -21,4 +21,4 @@ RUN apt-get -q update && \
COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf
# Start Fluentd to pick up our config that watches Docker container logs. # Start Fluentd to pick up our config that watches Docker container logs.
CMD /usr/sbin/google-fluentd -qq > /var/log/google-fluentd.log CMD /usr/sbin/google-fluentd "$FLUENTD_ARGS" > /var/log/google-fluentd.log

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

@ -6,7 +6,7 @@
.PHONY: build push .PHONY: build push
TAG = 1.3 TAG = 1.4
build: build:
docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) . docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .

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

@ -16,7 +16,7 @@
type tail type tail
format none format none
time_key time time_key time
path /varlog/containers/*/*.log path /varlog/containers/*.log
pos_file /varlog/gcp-containers.log.pos pos_file /varlog/gcp-containers.log.pos
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S
tag kubernetes.* tag kubernetes.*