Fix gelf-rb version to avoid fluentd breakage

graylog-labs/gelf-rb#63 Signed-off-by: Masahiro Nakagawa <[email protected]>
fluent · Oct 26, 2018 · 39d3c54 · 39d3c54
1 parent 192c0d7
commit 39d3c54
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker-image/v1.2/debian-graylog/Gemfile b/docker-image/v1.2/debian-graylog/Gemfile
@@ -6,7 +6,7 @@ source "https://rubygems.org"
 gem "fluentd", "1.2.6"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
-gem "gelf"
+gem "gelf", "3.0.0"
 gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"

diff --git a/docker-image/v1.2/debian-graylog/Gemfile.lock b/docker-image/v1.2/debian-graylog/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       tzinfo (~> 1.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    gelf (3.1.0)
+    gelf (3.0.0)
       json
     http (0.9.8)
       addressable (~> 2.3)
@@ -99,7 +99,7 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
   fluent-plugin-systemd (~> 1.0.1)
   fluentd (= 1.2.6)
-  gelf
+  gelf (= 3.0.0)
   oj (= 3.5.1)
 
 BUNDLED WITH

diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb
@@ -57,7 +57,7 @@ gem "fluent-plugin-gcs", "0.4.0.beta1"
 gem "fluent-plugin-gcs", "~> 0.3"
 <% end %>
 <% when "graylog" %>
-gem "gelf"
+gem "gelf", "3.0.0"
 <% if is_v1 %>
 gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 <% else %>