openstack
/
kolla
Code Issues Proposed changes

Fluentd: There is available td-agent pkg for Buster 

Thanks a lot to Masahiro Nakagawa
https://github.com/treasure-data/omnibus-td-agent/issues/209#issuecomment-530340475

Change-Id: I9c4993436844d45bc9df2815659fa7c420910b01
This commit is contained in:
Viktor Michalek 2019-10-01 17:24:55 +02:00 committed by Marcin Juszkiewicz
parent 121503e589
commit 4b308690bc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/sources.list.debian
View File

@ -18,4 +18,4 @@ deb http://buster-stein.debian.net/debian buster-stein-backports main
deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main
# td-agent for fluentd
deb http://packages.treasuredata.com/3/debian/stretch stretch contrib
deb http://packages.treasuredata.com/3/debian/buster buster contrib

6
docker/fluentd/Dockerfile.j2
View File

@ -87,6 +87,12 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
] %}
{% endif %}
# NOTE(hrw): one of plugins fetches 'string-scrub' which tries to use
# /usr/bin/mkdir directly while in Debian it is in /bin
{% if base_distro == 'debian' and base_arch == 'x86_64' %}
RUN ln -s /bin/mkdir /usr/bin/mkdir
{% endif %}
{{ macros.install_fluent_plugins(fluentd_user, fluentd_plugins | customizable("plugins")) }}
{% endblock %}