From 72e97372557287735b42e1730438251eca9fa563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 25 Oct 2020 19:19:08 +0100 Subject: [PATCH 1/2] added xpack gem to enable ilm support in fluentd-es-image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 10 +++++----- .../fluentd-elasticsearch/fluentd-es-image/Gemfile | 9 +++++---- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 45ad51015eb..06a78cdc6d0 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -45,22 +45,22 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v3.0.5 + name: fluentd-es-v3.1.0 namespace: kube-system labels: k8s-app: fluentd-es - version: v3.0.5 + version: v3.1.0 addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v3.0.5 + version: v3.1.0 template: metadata: labels: k8s-app: fluentd-es - version: v3.0.5 + version: v3.1.0 spec: securityContext: seccompProfile: @@ -69,7 +69,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: quay.io/fluentd_elasticsearch/fluentd:v3.0.5 + image: quay.io/fluentd_elasticsearch/fluentd:v3.1.0 env: - name: FLUENTD_ARGS value: --no-supervisor -q diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index 61ea6098f0b..41a744704bc 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,13 +1,14 @@ source 'https://rubygems.org' -gem 'activesupport', '6.0.3.3' -gem 'fluentd', '1.11.3' +gem 'activesupport', '6.0.3.4' +gem 'elasticsearch-xpack', '7.9.0' +gem 'fluentd', '1.11.4' gem 'fluent-plugin-concat', '2.4.0' gem 'fluent-plugin-detect-exceptions', '0.0.13' -gem 'fluent-plugin-elasticsearch', '4.2.0' +gem 'fluent-plugin-elasticsearch', '4.2.2' gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2' gem 'fluent-plugin-multi-format-parser', '1.0.0' gem 'fluent-plugin-prometheus', '1.8.4' gem 'fluent-plugin-systemd', '1.0.2' -gem 'oj', '3.10.14' +gem 'oj', '3.10.15' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index dc66778e4ba..11fae71fc64 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.5 +TAG = v3.1.0 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . From f6475ca56c4133e1a218d92ff761253bba5f702c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 25 Oct 2020 19:27:43 +0100 Subject: [PATCH 2/2] removed whitspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index 41a744704bc..cdbdeea9763 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'activesupport', '6.0.3.4' -gem 'elasticsearch-xpack', '7.9.0' +gem 'elasticsearch-xpack', '7.9.0' gem 'fluentd', '1.11.4' gem 'fluent-plugin-concat', '2.4.0' gem 'fluent-plugin-detect-exceptions', '0.0.13'