diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-10-14 17:50:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-14 17:50:54 +0000 |
| commit | 71ecf7ceaab4ccf0a111654fcb37cc868e56b856 (patch) | |
| tree | 6a1fc5556c80b3f501dc0566af04bbb8004a1638 /docker | |
| parent | 2b6c71a9613411bd805b406d77a40520eb90d268 (diff) | |
| parent | 7d59b2eb9ad5c986dcabfef5cab82f773e4881b0 (diff) | |
| download | kolla-71ecf7ceaab4ccf0a111654fcb37cc868e56b856.tar.gz kolla-71ecf7ceaab4ccf0a111654fcb37cc868e56b856.zip | |
Merge "Fluentd: enable forward logs over SSL with authentication"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 03189b60d..dbfc0fd8d 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -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 |