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

Add a prefix to the POS file for Fluentd to Elasticsearch

Browse Source
This commit is contained in:
Satnam Singh 2015-03-17 13:13:03 -07:00
parent a62673d226
commit 985d5c1f95
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View File

@ -38,7 +38,7 @@
format json format json
time_key time time_key time
path /var/lib/docker/containers/*/*-json.log 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 time_format %Y-%m-%dT%H:%M:%S
tag docker.* tag docker.*
read_from_head true read_from_head true
@ -62,7 +62,7 @@
type tail type tail
format none format none
path /varlog/kubelet.log path /varlog/kubelet.log
pos_file /varlog/kubelet.log.pos pos_file /varlog/es-kubelet.log.pos
tag kubelet tag kubelet
</source> </source>

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

@ -2,7 +2,7 @@ version: v1beta2
id: fluentd-to-elasticsearch id: fluentd-to-elasticsearch
containers: containers:
- name: fluentd-es - name: fluentd-es
image: kubernetes/fluentd-elasticsearch:1.2 image: kubernetes/fluentd-elasticsearch:1.3
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: -qq value: -qq