Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Fluentd config to read from head of Docker container logs #5218

Merged
merged 1 commit into from
Mar 10, 2015
Merged

Change Fluentd config to read from head of Docker container logs #5218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build push

TAG = 1.0
TAG = 1.1

build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .
Expand Down
5 changes: 3 additions & 2 deletions cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the tag change here without changing the match statement below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good point. I thought I would get rid of the containers component because it was not adding anything. Fixed.

read_from_head true
</source>

<match docker.container.**>
<match docker.**>
type elasticsearch
log_level info
include_tag_key true
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down