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 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) .