From 6c7776bbe0da948dfddff8619758bb68138e35fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 3 Oct 2020 11:28:46 +0200 Subject: [PATCH 1/3] updated fluentd and all plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .../fluentd-elasticsearch/fluentd-es-image/Gemfile | 11 ++++++----- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index 784c777d0a1..61ea6098f0b 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,12 +1,13 @@ source 'https://rubygems.org' -gem 'activesupport', '6.0.3.2' -gem 'fluentd', '1.11.1' +gem 'activesupport', '6.0.3.3' +gem 'fluentd', '1.11.3' gem 'fluent-plugin-concat', '2.4.0' gem 'fluent-plugin-detect-exceptions', '0.0.13' -gem 'fluent-plugin-elasticsearch', '4.1.0' +gem 'fluent-plugin-elasticsearch', '4.2.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.2' +gem 'fluent-plugin-prometheus', '1.8.4' gem 'fluent-plugin-systemd', '1.0.2' -gem 'oj', '3.10.7' +gem 'oj', '3.10.14' + diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index b09d95810b3..dc66778e4ba 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.4 +TAG = v3.0.5 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . From b803d4bbecb4c98686d31689bf6606190d5f6514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 3 Oct 2020 11:38:50 +0200 Subject: [PATCH 2/3] use new fluentd image in daemonset 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 2a031a68d30..45ad51015eb 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.2 + name: fluentd-es-v3.0.5 namespace: kube-system labels: k8s-app: fluentd-es - version: v3.0.2 + version: v3.0.5 addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v3.0.2 + version: v3.0.5 template: metadata: labels: k8s-app: fluentd-es - version: v3.0.2 + version: v3.0.5 spec: securityContext: seccompProfile: @@ -69,7 +69,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: quay.io/fluentd_elasticsearch/fluentd:v3.0.2 + image: quay.io/fluentd_elasticsearch/fluentd:v3.0.5 env: - name: FLUENTD_ARGS value: --no-supervisor -q From ba83b7758c4a420741d8d089198dcefe2c9be2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 4 Oct 2020 10:10:23 +0200 Subject: [PATCH 3/3] removed links to soon deprecated helm stable repo & added artifact hub link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/README.md b/cluster/addons/fluentd-elasticsearch/README.md index 1a668e5dfc9..830ac6b89e7 100644 --- a/cluster/addons/fluentd-elasticsearch/README.md +++ b/cluster/addons/fluentd-elasticsearch/README.md @@ -87,10 +87,4 @@ are a starting point and should not be considered to be production ready. If you like to run these tools in a production environment you could use the [Helm](https://helm.sh) charts, provided by the Helm community, which are used by a lot of people and therefore are widely tested. You can find them all via the -[Helm Hub](https://hub.helm.sh/). - -The source of the mentioned charts can be found here: - -* [Elasticsearch](https://github.com/helm/charts/tree/master/stable/elasticsearch) -* [Fluentd-elasticsearch](https://github.com/kiwigrid/helm-charts/tree/master/charts/fluentd-elasticsearch) -* [Kibana](https://github.com/helm/charts/tree/master/stable/kibana) +[Helm Hub](https://hub.helm.sh/) or the [Artifact hub](https://artifacthub.io/).