From 5d1f910e457ba01922e98ee5307e65fd14ff8446 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 19:17:38 +0000
Subject: [PATCH] Bump fluentd from 1.4.2 to 1.14.2 in /docker-image

Bumps [fluentd](https://github.com/fluent/fluentd) from 1.4.2 to 1.14.2.
- [Release notes](https://github.com/fluent/fluentd/releases)
- [Changelog](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fluent/fluentd/compare/v1.4.2...v1.14.2)

---
updated-dependencies:
- dependency-name: fluentd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docker-image/Gemfile      |  2 +-
 docker-image/Gemfile.lock | 34 +++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 docker-image/Gemfile
 mode change 100755 => 100644 docker-image/Gemfile.lock

diff --git a/docker-image/Gemfile b/docker-image/Gemfile
old mode 100755
new mode 100644
index 9c905c1..d6f1852
--- a/docker-image/Gemfile
+++ b/docker-image/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "fluentd", "1.4.2"
+gem "fluentd", "1.14.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-multi-format-parser", "~> 1.0.0"
 gem "fluent-plugin-concat", "~> 2.3.0"
diff --git a/docker-image/Gemfile.lock b/docker-image/Gemfile.lock
old mode 100755
new mode 100644
index f175d48..e0f7ecf
--- a/docker-image/Gemfile.lock
+++ b/docker-image/Gemfile.lock
@@ -9,8 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.4)
-    dig_rb (1.0.1)
+    cool.io (1.7.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     ffi (1.11.1)
@@ -18,6 +17,8 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
+    fluent-plugin-detect-exceptions (0.0.14)
+      fluentd (>= 0.10)
     fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-json-in-json-2 (1.0.2)
@@ -42,16 +43,17 @@ GEM
     fluent-plugin-systemd (1.0.2)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.4.2)
+    fluentd (1.14.2)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      dig_rb (~> 1.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
+      msgpack (>= 1.3.1, < 2.0.0)
+      serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
+      strptime (>= 0.2.4, < 1.0.0)
+      tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     http (0.9.8)
       addressable (~> 2.3)
@@ -75,7 +77,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    msgpack (1.3.0)
+    msgpack (1.4.2)
     netrc (0.11.0)
     oj (3.5.1)
     prometheus-client (0.9.0)
@@ -88,21 +90,22 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby-kafka (0.6.8)
-    serverengine (2.1.1)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     snappy (0.0.17)
-    strptime (0.2.3)
+    strptime (0.2.5)
     systemd-journal (1.3.3)
       ffi (~> 1.9)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2019.2)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
     zookeeper (1.4.11)
 
@@ -112,6 +115,7 @@ PLATFORMS
 DEPENDENCIES
   ffi
   fluent-plugin-concat (~> 2.3.0)
+  fluent-plugin-detect-exceptions (~> 0.0.12)
   fluent-plugin-grok-parser (~> 2.5.0)
   fluent-plugin-json-in-json-2 (>= 1.0.2)
   fluent-plugin-kafka (~> 0.7.9)
@@ -120,7 +124,7 @@ DEPENDENCIES
   fluent-plugin-prometheus (~> 1.3.0)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
   fluent-plugin-systemd (~> 1.0.1)
-  fluentd (= 1.4.2)
+  fluentd (= 1.14.2)
   oj (= 3.5.1)
   snappy (~> 0.0.15)
   zookeeper (~> 1.4.11)