diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-16 05:22:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-16 05:22:02 +0000 |
| commit | e78046665cf730051aaf67b8a4a2b80b13e96965 (patch) | |
| tree | 019df75a117c0a0c43652d137551902e606b0250 /docker | |
| parent | b53b0d93a968c09d84d7909cd941dba85b623bb3 (diff) | |
| parent | cc646d196ae4563ffdd6cf33c9fc38d424b55cc5 (diff) | |
| download | kolla-e78046665cf730051aaf67b8a4a2b80b13e96965.tar.gz kolla-e78046665cf730051aaf67b8a4a2b80b13e96965.zip | |
Merge "Fix the Ubuntu Fluentd image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 2dddae0d6..5b486b2f0 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -47,11 +47,9 @@ RUN ulimit -n 65536 \ && chown -R fluentd: /etc/fluentd /var/run/fluentd {% elif base_distro in ['debian', 'ubuntu'] %} -# NOTE: We use fluentd version is v12.0 so fluent-plugin-grok-parse version should < 1.0.0. -# 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-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 \ + && td-agent-gem install fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:2.1.4 fluent-plugin-rewrite-tag-filter:2.0.0 fluent-plugin-secure-forward \ && rm -f /etc/td-agent/td-agent.conf COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers |