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

Modify Fluentd to ES setup to pass flags #5253

Merged
merged 1 commit into from
Mar 10, 2015
Merged

Modify Fluentd to ES setup to pass flags #5253

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/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ RUN /usr/sbin/td-agent-gem install fluent-plugin-elasticsearch
COPY td-agent.conf /etc/td-agent/td-agent.conf

# Run the Fluentd service.
CMD /usr/sbin/td-agent -qq > /var/log/td-agent/td-agent.log
CMD /usr/sbin/td-agent "$FLUENTD_ARGS" > /var/log/td-agent/td-agent.log
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.1
TAG = 1.2

build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .
Expand Down
5 changes: 4 additions & 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,10 @@ version: v1beta2
id: fluentd-to-elasticsearch
containers:
- name: fluentd-es
image: kubernetes/fluentd-elasticsearch:1.1
image: kubernetes/fluentd-elasticsearch:1.2
env:
- name: FLUENTD_ARGS
value: -qq
volumeMounts:
- name: containers
mountPath: /var/lib/docker/containers
Expand Down