github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CRI fluentd config. 

Signed-off-by: Lantao Liu <lantaol@google.com>
pull/6/head
Lantao Liu 2017-11-10 19:49:05 +00:00
parent 1a4a019e5f
commit 53d7494b9e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ data:
time_format %Y-%m-%dT%H:%M:%S.%NZ time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern> </pattern>
<pattern> <pattern>
format /^(?<time>.+)\b(?<stream>stdout|stderr)\b(?<log>.*)$/ format /^(?<time>.+) (?<stream>stdout|stderr) (?<log>.*)$/
time_format %Y-%m-%dT%H:%M:%S.%N%:z time_format %Y-%m-%dT%H:%M:%S.%N%:z
</pattern> </pattern>
</source> </source>
@ -367,7 +367,7 @@ data:
num_threads 2 num_threads 2
</match> </match>
metadata: metadata:
name: fluentd-es-config-v0.1.0 name: fluentd-es-config-v0.1.1
namespace: kube-system namespace: kube-system
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile

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

@ -108,4 +108,4 @@ spec:
path: /usr/lib64 path: /usr/lib64
- name: config-volume - name: config-volume
configMap: configMap:
name: fluentd-es-config-v0.1.0 name: fluentd-es-config-v0.1.1

4
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View File

@ -58,7 +58,7 @@ data:
time_format %Y-%m-%dT%H:%M:%S.%NZ time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern> </pattern>
<pattern> <pattern>
format /^(?<time>.+)\b(?<stream>stdout|stderr)\b(?<log>.*)$/ format /^(?<time>.+) (?<stream>stdout|stderr) (?<log>.*)$/
time_format %Y-%m-%dT%H:%M:%S.%N%:z time_format %Y-%m-%dT%H:%M:%S.%N%:z
</pattern> </pattern>
</source> </source>
@ -398,7 +398,7 @@ data:
num_threads 2 num_threads 2
</match> </match>
metadata: metadata:
name: fluentd-gcp-config-v1.2.2 name: fluentd-gcp-config-v1.2.3
namespace: kube-system namespace: kube-system
labels: labels:
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -132,4 +132,4 @@ spec:
path: /usr/lib64 path: /usr/lib64
- name: config-volume - name: config-volume
configMap: configMap:
name: fluentd-gcp-config-v1.2.2 name: fluentd-gcp-config-v1.2.3