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

Minor tweaks to Fluentd toi Elasticsearch image #1761

Merged
merged 1 commit into from
Oct 14, 2014
Merged

Minor tweaks to Fluentd toi Elasticsearch image #1761

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 contrib/logging/fluentd-es-image/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


# Build the fluentd-elasticsearch image and push
# to google/fluentd-elasticsearch.
# to kubernetes/fluentd-elasticsearch.

sudo docker build -t kubernetes/fluentd-elasticsearch .
sudo docker push kubernetes/fluentd-elasticsearch
8 changes: 5 additions & 3 deletions contrib/logging/fluentd-es-image/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
# service IPs are done.
OUTER_HOST=`tail -n 1 /outerhost | awk '{print $3}'`

# Copy the Fluentd config file and patch it to refer to the
# name of the host machine for ES_HOST. HACK!
cp td-agent.conf /etc/td-agent
# WARNING! HORRIBLE HACK! We expect /outerhost to be mapped to
# the enclosing /etc/host file so we can determine the name of
# 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
/usr/sbin/td-agent
4 changes: 2 additions & 2 deletions contrib/logging/fluentd-es-image/td-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
time_key time
path /var/lib/docker/containers/*/*-json.log
time_format %Y-%m-%dT%H:%M:%S
tag docker.container.all
tag docker.container.*
</source>

<match docker.container.*>
<match docker.container.**>
type elasticsearch
log_level info
include_tag_key true
Expand Down