From 61a709a7b2db49da840825bc1b30d2ea6a0ae19f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 17 Aug 2018 16:43:27 +0200 Subject: [PATCH 1/4] fixed json logging in fluentd-elasticsearch image --- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 10 +++++----- .../fluentd-elasticsearch/fluentd-es-image/Gemfile | 2 +- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index c01b90b82ba..3b68c9fa1f7 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -48,24 +48,24 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.2.0 + name: fluentd-es-v2..0 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.2.0 + version: v2.3.1 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.2.0 + version: v2.3.1 template: metadata: labels: k8s-app: fluentd-es kubernetes.io/cluster-service: "true" - version: v2.2.0 + version: v2.3.1 # This annotation ensures that fluentd does not get evicted if the node # supports critical pod annotation based priority scheme. # Note that this does not guarantee admission on the nodes (#40573). @@ -77,7 +77,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: k8s.gcr.io/fluentd-elasticsearch:v2.2.0 + image: k8s.gcr.io/fluentd-elasticsearch:v2.3.1 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 6bf05fc1add..52b668b6ac4 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'fluentd', '<=1.2.4' gem 'activesupport', '~>5.2.1' -gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.2' +gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.0.0' gem 'fluent-plugin-elasticsearch', '~>2.11.5' gem 'fluent-plugin-systemd', '~>1.0.1' gem 'fluent-plugin-detect-exceptions', '~>0.0.11' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 3ef3e9577d1..064c5260dd6 100644 --- 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.3.0 +TAG = v2.3.1 build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . From 6ab218d4dd2269cdc0c64fd584f22da2dfb4f58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 17 Aug 2018 21:48:44 +0200 Subject: [PATCH 2/4] fixed typo --- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 3b68c9fa1f7..94c253963de 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -48,7 +48,7 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2..0 + name: fluentd-es-v2.3.1 namespace: kube-system labels: k8s-app: fluentd-es From 9b5c5650ebd196838cb53b556bfd024937fdf51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 17 Aug 2018 21:49:44 +0200 Subject: [PATCH 3/4] use image 2.2.0 again --- .../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 94c253963de..c01b90b82ba 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -48,24 +48,24 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.3.1 + name: fluentd-es-v2.2.0 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.3.1 + version: v2.2.0 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.3.1 + version: v2.2.0 template: metadata: labels: k8s-app: fluentd-es kubernetes.io/cluster-service: "true" - version: v2.3.1 + version: v2.2.0 # This annotation ensures that fluentd does not get evicted if the node # supports critical pod annotation based priority scheme. # Note that this does not guarantee admission on the nodes (#40573). @@ -77,7 +77,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: k8s.gcr.io/fluentd-elasticsearch:v2.3.1 + image: k8s.gcr.io/fluentd-elasticsearch:v2.2.0 env: - name: FLUENTD_ARGS value: --no-supervisor -q From 6390e590ccea5e584deb10e0646d52f4e421d33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 20 Aug 2018 09:55:38 +0200 Subject: [PATCH 4/4] added missing pos files & added mapping type name in fluentd config --- .../fluentd-elasticsearch/fluentd-es-configmap.yaml | 10 ++++++++-- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml index 5b861084da0..3a770822fb9 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml @@ -1,7 +1,7 @@ kind: ConfigMap apiVersion: v1 metadata: - name: fluentd-es-config-v0.1.4 + name: fluentd-es-config-v0.1.5 namespace: kube-system labels: addonmanager.kubernetes.io/mode: Reconcile @@ -327,6 +327,7 @@ data: @type local persistent true + path /var/log/journald-docker.pos read_from_head true tag docker @@ -339,6 +340,7 @@ data: @type local persistent true + path /var/log/journald-container-runtime.pos read_from_head true tag container-runtime @@ -351,6 +353,7 @@ data: @type local persistent true + path /var/log/journald-kubelet.pos read_from_head true tag kubelet @@ -363,11 +366,12 @@ data: @type local persistent true + path /var/log/journald-node-problem-detector.pos read_from_head true tag node-problem-detector - + @id kernel @type systemd @@ -375,6 +379,7 @@ data: @type local persistent true + path /var/log/kernel.pos fields_strip_underscores true @@ -435,6 +440,7 @@ data: @id elasticsearch @type elasticsearch @log_level info + type_name fluentd include_tag_key true host elasticsearch-logging port 9200 diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index c01b90b82ba..4d00803b002 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -107,4 +107,4 @@ spec: path: /var/lib/docker/containers - name: config-volume configMap: - name: fluentd-es-config-v0.1.4 + name: fluentd-es-config-v0.1.5