From 6239a838f3a8f32dd6c5fa7a8b96ca50f19c391a Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Thu, 2 Mar 2017 23:23:24 +0800
Subject: Fix fluentd undefined method 'parse'

Now we use flunetd version is v12.0
we use fluent-plugin-grok-parser plugin shoud < 1.0.0.

https://github.com/fluent/fluent-plugin-grok-parser

Change-Id: I013e1e6d1070c4ba050be5dd75be7be4df652e4e
Closes-Bug: #1669405
---
 docker/fluentd/Dockerfile.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker')

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
-- 
cgit v1.2.3