From 985d5c1f958efead937e833fc11ff8fc8800d45f Mon Sep 17 00:00:00 2001 From: Satnam Singh Date: Tue, 17 Mar 2015 13:13:03 -0700 Subject: [PATCH] Add a prefix to the POS file for Fluentd to Elasticsearch --- .../addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- .../fluentd-elasticsearch/fluentd-es-image/td-agent.conf | 4 ++-- cluster/saltbase/salt/fluentd-es/fluentd-es.manifest | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 87d0538f082..5435cf5e519 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -1,6 +1,6 @@ .PHONY: build push -TAG = 1.2 +TAG = 1.3 build: sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) . diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf index 49c178ade56..42d77c6ebc6 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf @@ -38,7 +38,7 @@ format json 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/es-containers.log.pos time_format %Y-%m-%dT%H:%M:%S tag docker.* read_from_head true @@ -62,7 +62,7 @@ type tail format none path /varlog/kubelet.log - pos_file /varlog/kubelet.log.pos + pos_file /varlog/es-kubelet.log.pos tag kubelet diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest index 6d994954539..986b4120296 100644 --- a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest +++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest @@ -2,7 +2,7 @@ version: v1beta2 id: fluentd-to-elasticsearch containers: - name: fluentd-es - image: kubernetes/fluentd-elasticsearch:1.2 + image: kubernetes/fluentd-elasticsearch:1.3 env: - name: FLUENTD_ARGS value: -qq