From 2486de1287215246440bcd900c2aac2acc1ffb4d Mon Sep 17 00:00:00 2001 From: Satnam Singh Date: Mon, 9 Mar 2015 17:14:38 -0700 Subject: [PATCH] Change Fluentd config to read from head of Docker container logs --- .../addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- .../fluentd-elasticsearch/fluentd-es-image/td-agent.conf | 5 +++-- cluster/saltbase/salt/fluentd-es/fluentd-es.manifest | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index d4a7c051930..9b3f1123e43 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.0 +TAG = 1.1 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 cc0dc3770c4..49c178ade56 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf @@ -40,10 +40,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 elasticsearch log_level info include_tag_key true diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest b/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest index 9f6063dd22c..5ecacc62575 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.0 + image: kubernetes/fluentd-elasticsearch:1.1 volumeMounts: - name: containers mountPath: /var/lib/docker/containers