diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
index 656c92d3848a..d6b74199a8a9 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.7
+ name: fluentd-es-config-v0.2.0
namespace: kube-system
labels:
addonmanager.kubernetes.io/mode: Reconcile
@@ -143,6 +143,39 @@ data:
max_lines 1000
+ # Concatenate multi-line logs
+
+ @id filter_concat
+ @type concat
+ key message
+ multiline_end_regexp /\n$/
+ separator ""
+
+
+ # Enriches records with Kubernetes metadata
+
+ @id filter_kubernetes_metadata
+ @type kubernetes_metadata
+
+
+ # Fixes json fields in Elasticsearch
+
+ @id filter_parser
+ @type parser
+ key_name log
+ reserve_data true
+ remove_key_name_field true
+
+ @type multi_format
+
+ format json
+
+
+ format none
+
+
+
+
system.input.conf: |-
# Example:
# 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
@@ -376,6 +409,7 @@ data:
forward.input.conf: |-
# Takes the messages sent over TCP
@@ -383,15 +417,18 @@ data:
# Prometheus Exporter Plugin
# input plugin that exports metrics
# input plugin that collects metrics from MonitorAgent