github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Fluentd: concatenate long logs (>16KB) which have been splitted by Docker into several lines.

Browse Source 
See https://github.com/kubernetes/kubernetes/issues/52444.

Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
This commit is contained in:
Cédric de Saint Martin 2018-08-29 15:50:38 +02:00
parent 46c5c8e20a
commit def00298c3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
View File

@ -1,7 +1,7 @@
kind: ConfigMap kind: ConfigMap
apiVersion: v1 apiVersion: v1
metadata: metadata:
name: fluentd-es-config-v0.1.5 name: fluentd-es-config-v0.1.6
namespace: kube-system namespace: kube-system
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
@ -420,6 +420,14 @@ data:
@type kubernetes_metadata @type kubernetes_metadata
</filter> </filter>
# Concatenate multi-line logs
<filter **>
@type concat
key message
multiline_end_regexp /\n$/
separator ""
</filter>
<match **> <match **>
@id elasticsearch @id elasticsearch
@type elasticsearch @type elasticsearch

10
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -48,24 +48,24 @@ roleRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v2.2.0 name: fluentd-es-v2.2.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.2.0 version: v2.2.1
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.2.0 version: v2.2.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v2.2.0 version: v2.2.1
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
@ -107,4 +107,4 @@ spec:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: config-volume - name: config-volume
configMap: configMap:
name: fluentd-es-config-v0.1.5 name: fluentd-es-config-v0.1.6