github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Modify Fluentd to ES setup to pass flags

Browse Source
This commit is contained in:
Satnam Singh 2015-03-10 09:37:31 -07:00
parent 8fd33476f0
commit 3ce0ede78e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -34,4 +34,4 @@ RUN /usr/sbin/td-agent-gem install fluent-plugin-elasticsearch
COPY td-agent.conf /etc/td-agent/td-agent.conf COPY td-agent.conf /etc/td-agent/td-agent.conf
# Run the Fluentd service. # 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
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -1,6 +1,6 @@
.PHONY: build push .PHONY: build push
TAG = 1.1 TAG = 1.2
build: build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) . sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .

5
cluster/saltbase/salt/fluentd-es/fluentd-es.manifest
View File

@ -2,7 +2,10 @@ version: v1beta2
id: fluentd-to-elasticsearch id: fluentd-to-elasticsearch
containers: containers:
- name: fluentd-es - name: fluentd-es
image: kubernetes/fluentd-elasticsearch:1.1 image: kubernetes/fluentd-elasticsearch:1.2
env:
- name: FLUENTD_ARGS
value: -qq
volumeMounts: volumeMounts:
- name: containers - name: containers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers