github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1761 from satnam6502/fluentd-es-image 

Minor tweaks to Fluentd toi Elasticsearch image
pull/6/head
Daniel Smith 2014-10-13 17:26:27 -07:00
parent f8071a6e25 bae504672c
commit a07d4058a6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/logging/fluentd-es-image/build.sh
View File

@ -16,7 +16,7 @@
# Build the fluentd-elasticsearch image and push # Build the fluentd-elasticsearch image and push
# to google/fluentd-elasticsearch. # to kubernetes/fluentd-elasticsearch.
sudo docker build -t kubernetes/fluentd-elasticsearch . sudo docker build -t kubernetes/fluentd-elasticsearch .
sudo docker push kubernetes/fluentd-elasticsearch sudo docker push kubernetes/fluentd-elasticsearch

8
contrib/logging/fluentd-es-image/run.sh
View File

@ -20,8 +20,10 @@
# service IPs are done. # service IPs are done.
OUTER_HOST=`tail -n 1 /outerhost | awk '{print $3}'` OUTER_HOST=`tail -n 1 /outerhost | awk '{print $3}'`
# Copy the Fluentd config file and patch it to refer to the # WARNING! HORRIBLE HACK! We expect /outerhost to be mapped to
# name of the host machine for ES_HOST. HACK! # the enclosing /etc/host file so we can determine the name of
cp td-agent.conf /etc/td-agent # the host machine (super fragile). This is a temporary hack until
# service IPs are done.
# Adjust the name of the host machine for ES_HOST. HACK!
sed -i -e "s/ES_HOST/${OUTER_HOST}/" /etc/td-agent/td-agent.conf sed -i -e "s/ES_HOST/${OUTER_HOST}/" /etc/td-agent/td-agent.conf
/usr/sbin/td-agent /usr/sbin/td-agent

4
contrib/logging/fluentd-es-image/td-agent.conf
View File

@ -39,10 +39,10 @@
time_key time time_key time
path /var/lib/docker/containers/*/*-json.log path /var/lib/docker/containers/*/*-json.log
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S
tag docker.container.all tag docker.container.*
</source> </source>
<match docker.container.*> <match docker.container.**>
type elasticsearch type elasticsearch
log_level info log_level info
include_tag_key true include_tag_key true