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

Merge pull request #5218 from satnam6502/fluentd-es

Browse Source 
Change Fluentd config to read from head of Docker container logs
This commit is contained in:
Alex Robinson 2015-03-10 09:57:02 -07:00
commit 8fd33476f0
3 changed files with 5 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.0 TAG = 1.1
build: build:
sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) . sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .

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

@ -40,10 +40,11 @@
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/containers.log.pos
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S
tag docker.container.* tag docker.*
read_from_head true
</source> </source>
<match docker.container.**> <match docker.**>
type elasticsearch type elasticsearch
log_level info log_level info
include_tag_key true include_tag_key true

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.0 image: kubernetes/fluentd-elasticsearch:1.1
volumeMounts: volumeMounts:
- name: containers - name: containers
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers