openstack
/
kolla
Code Issues Proposed changes

Fluentd: enable forward logs over SSL with authentication 

On the fluent Docker added the fluent-plugin-secure-forward,
so fluentd will be able to forward logs over SSL with
authentication

Closes-Bug: #1723408

Change-Id: I231ebc1052dac93fb9420dcfb10595a3647c35ce
This commit is contained in:
Juan Badia Payno 2017-10-13 11:55:39 +02:00 committed by Martin Mágr
parent d67146637e
commit 7d59b2eb9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/fluentd/Dockerfile.j2
View File

@ -40,7 +40,7 @@ COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN ulimit -n 65536 \
&& gem install --minimal-deps activesupport:4.2.9 public_suffix:2.0.5 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter \
&& gem install --minimal-deps activesupport:4.2.9 public_suffix:2.0.5 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward \
&& chmod -R 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start \
&& mkdir -p /var/run/fluentd \
@ -51,7 +51,7 @@ RUN ulimit -n 65536 \
# https://github.com/fluent/fluent-plugin-grok-parser
RUN ulimit -n 65536 \
&& sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent \
&& td-agent-gem install fluent-plugin-concat:1.0.0 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter \
&& td-agent-gem install fluent-plugin-concat:1.0.0 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward \
&& rm -f /etc/td-agent/td-agent.conf
COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers