From 0212e68e91673ef4920fa6dc305a153998921323 Mon Sep 17 00:00:00 2001 From: Satnam Singh Date: Tue, 17 Mar 2015 10:28:53 -0700 Subject: [PATCH] Adjust POS file for Fluentd to Cloud Logging --- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest | 2 +- contrib/logging/fluentd-gcp-image/Makefile | 2 +- contrib/logging/fluentd-gcp-image/google-fluentd.conf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest index 3d7adefbe39..bbbef55b544 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.1 + image: kubernetes/fluentd-gcp:1.2 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 b41697bbce9..aff78fde953 100644 --- a/contrib/logging/fluentd-gcp-image/Makefile +++ b/contrib/logging/fluentd-gcp-image/Makefile @@ -6,7 +6,7 @@ .PHONY: build push -TAG = 1.1 +TAG = 1.2 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 6d8991e600b..9df1b2dfe56 100644 --- a/contrib/logging/fluentd-gcp-image/google-fluentd.conf +++ b/contrib/logging/fluentd-gcp-image/google-fluentd.conf @@ -17,7 +17,7 @@ format none time_key time path /var/lib/docker/containers/*/*-json.log - pos_file /var/lib/docker/containers/containers.log.pos + pos_file /var/lib/docker/containers/gcp-containers.log.pos time_format %Y-%m-%dT%H:%M:%S tag docker.* read_from_head true @@ -37,7 +37,7 @@ format none time_key time path /varlog/kubelet.log - pos_file /varlog/kubelet.log.pos + pos_file /varlog/gcp-kubelet.log.pos tag kubelet