diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-05 11:36:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-05 11:36:34 +0000 |
| commit | 4ff3e30f0bab602772814623113772ebe938f075 (patch) | |
| tree | c57f8d135eeee91fad07073d63cd186d37c9c8df | |
| parent | 6a636204e7295c7a384d098b7d070fc8d6630584 (diff) | |
| parent | 6239a838f3a8f32dd6c5fa7a8b96ca50f19c391a (diff) | |
| download | kolla-4ff3e30f0bab602772814623113772ebe938f075.tar.gz kolla-4ff3e30f0bab602772814623113772ebe938f075.zip | |
Merge "Fix fluentd undefined method 'parse'"
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 4dc8d4d1b..4aeba1f68 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -26,9 +26,11 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(fluentd_packages | customizable("packages")) }} +# 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 fluent-plugin-rewrite-tag-filter \ + && 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 \ && rm -f /etc/td-agent/td-agent.conf COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers |