From 402eea882d0614aa50a7189dcaad7dcec18e467d Mon Sep 17 00:00:00 2001 From: Jared Burns Date: Wed, 15 Jul 2020 11:24:27 -0700 Subject: [PATCH] Update fluent-es-image components for better ES 7.x compatibility --- .../fluentd-elasticsearch/fluentd-es-image/Gemfile | 12 ++++++------ .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index e324bc3a324..784c777d0a1 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' -gem 'activesupport', '6.0.3.1' -gem 'fluentd', '1.9.3' +gem 'activesupport', '6.0.3.2' +gem 'fluentd', '1.11.1' gem 'fluent-plugin-concat', '2.4.0' gem 'fluent-plugin-detect-exceptions', '0.0.13' -gem 'fluent-plugin-elasticsearch', '4.0.9' -gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.1' +gem 'fluent-plugin-elasticsearch', '4.1.0' +gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2' gem 'fluent-plugin-multi-format-parser', '1.0.0' -gem 'fluent-plugin-prometheus', '1.8.0' +gem 'fluent-plugin-prometheus', '1.8.2' gem 'fluent-plugin-systemd', '1.0.2' -gem 'oj', '3.10.6' +gem 'oj', '3.10.7' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index d7eec0f4cbd..b09d95810b3 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = quay.io/fluentd_elasticsearch IMAGE = fluentd -TAG = v3.0.3 +TAG = v3.0.4 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} .