From d395efa463d7adf34c2e96bc575e3d85e19342d0 Mon Sep 17 00:00:00 2001 From: Satnam Singh Date: Mon, 16 Mar 2015 16:19:07 -0700 Subject: [PATCH] Make Fluentd to Cloud Logging collector read from head --- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest | 2 +- contrib/logging/fluentd-gcp-image/Makefile | 2 +- contrib/logging/fluentd-gcp-image/google-fluentd.conf | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest index 7e2f6d3bb0a..3d7adefbe39 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest @@ -2,7 +2,7 @@ version: v1beta2 id: fluentd-to-gcp containers: - name: fluentd-gcp-container - image: kubernetes/fluentd-gcp:1.0 + image: kubernetes/fluentd-gcp:1.1 volumeMounts: - name: containers mountPath: /var/lib/docker/containers diff --git a/contrib/logging/fluentd-gcp-image/Makefile b/contrib/logging/fluentd-gcp-image/Makefile index 3057dfd00a4..b41697bbce9 100644 --- a/contrib/logging/fluentd-gcp-image/Makefile +++ b/contrib/logging/fluentd-gcp-image/Makefile @@ -6,7 +6,7 @@ .PHONY: build push -TAG = 1.0 +TAG = 1.1 build: sudo docker build -t kubernetes/fluentd-gcp:$(TAG) . diff --git a/contrib/logging/fluentd-gcp-image/google-fluentd.conf b/contrib/logging/fluentd-gcp-image/google-fluentd.conf index 3b954261e3f..6d8991e600b 100644 --- a/contrib/logging/fluentd-gcp-image/google-fluentd.conf +++ b/contrib/logging/fluentd-gcp-image/google-fluentd.conf @@ -19,10 +19,11 @@ path /var/lib/docker/containers/*/*-json.log pos_file /var/lib/docker/containers/containers.log.pos time_format %Y-%m-%dT%H:%M:%S - tag docker.container.* + tag docker.* + read_from_head true - + type google_cloud flush_interval 5s # Never wait longer than 5 minutes between retries.