Merge pull request #303 from pyama86/kafka-zookeeper

kafka is used with zookeeper
fluent · Apr 23, 2019 · 1e6a2e5 · 1e6a2e5
2 parents 82114b0 + eefca0a
commit 1e6a2e5
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 76 deletions.
diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile.lock b/docker-image/v1.3/debian-cloudwatch/Gemfile.lock
@@ -9,11 +9,11 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.2)
-    aws-partitions (1.149.0)
+    aws-partitions (1.151.0)
     aws-sdk-cloudwatchlogs (1.17.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.48.3)
+    aws-sdk-core (3.48.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -83,7 +83,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     netrc (0.11.0)
     oj (3.5.1)
     prometheus-client (0.9.0)
@@ -108,7 +108,7 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -129,4 +129,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile.lock b/docker-image/v1.3/debian-elasticsearch/Gemfile.lock
@@ -29,7 +29,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-elasticsearch (3.4.2)
+    fluent-plugin-elasticsearch (3.4.3)
       elasticsearch
       excon
       fluentd (>= 0.14.22)
@@ -82,7 +82,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
@@ -109,7 +109,7 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -129,4 +129,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-forward/Gemfile.lock b/docker-image/v1.3/debian-forward/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     netrc (0.11.0)
     oj (3.5.1)
     prometheus-client (0.9.0)
@@ -92,7 +92,7 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -111,4 +111,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-gcs/Gemfile.lock b/docker-image/v1.3/debian-gcs/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
@@ -139,7 +139,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -159,4 +159,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-graylog/Gemfile.lock b/docker-image/v1.3/debian-graylog/Gemfile.lock
@@ -75,7 +75,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     netrc (0.11.0)
     oj (3.5.1)
     prometheus-client (0.9.0)
@@ -100,7 +100,7 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -122,4 +122,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-kafka/Gemfile b/docker-image/v1.3/debian-kafka/Gemfile
@@ -11,6 +11,7 @@ gem "fluent-plugin-grok-parser", "~> 2.5.0"
 gem "fluent-plugin-prometheus", "~> 1.3.0"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "fluent-plugin-kafka", "~> 0.7.9"
+gem "zookeeper", "~> 1.4.11"
 gem "snappy", "~> 0.0.15"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"

diff --git a/docker-image/v1.3/debian-kafka/Gemfile.lock b/docker-image/v1.3/debian-kafka/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     netrc (0.11.0)
     oj (3.5.1)
     prometheus-client (0.9.0)
@@ -99,8 +99,9 @@ GEM
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     yajl-ruby (1.4.1)
+    zookeeper (1.4.11)
 
 PLATFORMS
   ruby
@@ -118,6 +119,7 @@ DEPENDENCIES
   fluentd (= 1.3.3)
   oj (= 3.5.1)
   snappy (~> 0.0.15)
+  zookeeper (~> 1.4.11)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2