Merge pull request #67434 from monotek/fluentd-elasticsearch

Automatic merge from submit-queue (batch tested with PRs 64445, 67459, 67434). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. updated fluentd to 1.2.4 **What this PR does / why we need it**: * updates fluentd in fluentd-elasticsearch to version 1.2.4 * also updates activesupport, fluent-plugin-elasticsearch & oj gems **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note * updates fluentd in fluentd-elasticsearch to version 1.2.4 * also updates activesupport, fluent-plugin-elasticsearch & oj gems ```

Merge pull request #67434 from monotek/fluentd-elasticsearch
dbe3b1a3 · Kubernetes Submit Queue · GitHub · b13b3d28 · 2b12f2f9 · dbe3b1a3
Unverified Commit dbe3b1a3 authored Aug 15, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Gemfile ...ter/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +4 -4

Makefile ...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +1 -1

No files found.
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
 source 'https://rubygems.org'
-gem 'fluentd', '<=1.2.2'
+gem 'fluentd', '<=1.2.4'
-gem 'activesupport', '~>5.2.0'
+gem 'activesupport', '~>5.2.1'
 gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.2'
-gem 'fluent-plugin-elasticsearch', '~>2.10.5'
+gem 'fluent-plugin-elasticsearch', '~>2.11.5'
 gem 'fluent-plugin-systemd', '~>1.0.1'
 gem 'fluent-plugin-detect-exceptions', '~>0.0.11'
 gem 'fluent-plugin-prometheus', '~>1.0.1'
 gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
-gem 'oj', '~>3.6.2'
+gem 'oj', '~>3.6.5'
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@
 PREFIX = staging-k8s.gcr.io
 IMAGE = fluentd-elasticsearch
-TAG = v2.2.0
+TAG = v2.3.0
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .