github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/8/head
Kubernetes Submit Queue 2018-08-15 22:54:14 -07:00 committed by GitHub
parent b13b3d2810 2b12f2f944
commit dbe3b1a3b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
View File

@ -1,11 +1,11 @@
source 'https://rubygems.org' 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-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-systemd', '~>1.0.1'
gem 'fluent-plugin-detect-exceptions', '~>0.0.11' gem 'fluent-plugin-detect-exceptions', '~>0.0.11'
gem 'fluent-plugin-prometheus', '~>1.0.1' gem 'fluent-plugin-prometheus', '~>1.0.1'
gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'oj', '~>3.6.2' gem 'oj', '~>3.6.5'

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = staging-k8s.gcr.io PREFIX = staging-k8s.gcr.io
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = v2.2.0 TAG = v2.3.0
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .