From 39d3c54dfaea38525d2ae12ffe1e852f1ba6b6b8 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Fri, 26 Oct 2018 23:14:40 +0900 Subject: [PATCH] Fix gelf-rb version to avoid fluentd breakage https://github.com/graylog-labs/gelf-rb/issues/63 Signed-off-by: Masahiro Nakagawa --- docker-image/v1.2/debian-graylog/Gemfile | 2 +- docker-image/v1.2/debian-graylog/Gemfile.lock | 4 ++-- templates/Gemfile.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-image/v1.2/debian-graylog/Gemfile b/docker-image/v1.2/debian-graylog/Gemfile index 1bd4b2fba..d942a0e55 100644 --- 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 index 95fcb323c..800a9a8cb 100644 --- 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 index 2c14ecb4c..7fc4d8a75 100644 --- 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 %>