mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #55506 from Random-Liu/fix-cri-fluentd
Automatic merge from submit-queue (batch tested with PRs 54460, 55258, 54858, 55506, 55510). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix CRI fluentd config. This should fix the cri-containerd stackdriver test failure: ``` Cluster level logging implemented by Stackdriver should ingest logs ``` I copied the pattern from a comment previously. However, it doesn't actually work properly. `\b` only matches word boundary, and seems to match the boundary of previous word in our case. That's why we get the log with a leading space: ``` Nov 10 18:39:11.661: INFO: Unexpected error occurred: log entry ingested incorrectly, got --> <--I0101 00:00:00.000000 1 main.go:1] Text, want Text ``` @kubernetes/sig-node-bugs @kubernetes/sig-instrumentation-bugs Signed-off-by: Lantao Liu <lantaol@google.com> ```release-note none ```
This commit is contained in:
commit
f5c29f51fa
@ -114,7 +114,7 @@ data:
|
||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||
</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
|
||||
</pattern>
|
||||
</source>
|
||||
@ -367,7 +367,7 @@ data:
|
||||
num_threads 2
|
||||
</match>
|
||||
metadata:
|
||||
name: fluentd-es-config-v0.1.0
|
||||
name: fluentd-es-config-v0.1.1
|
||||
namespace: kube-system
|
||||
labels:
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
|
@ -108,4 +108,4 @@ spec:
|
||||
path: /usr/lib64
|
||||
- name: config-volume
|
||||
configMap:
|
||||
name: fluentd-es-config-v0.1.0
|
||||
name: fluentd-es-config-v0.1.1
|
||||
|
@ -58,7 +58,7 @@ data:
|
||||
time_format %Y-%m-%dT%H:%M:%S.%NZ
|
||||
</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
|
||||
</pattern>
|
||||
</source>
|
||||
@ -398,7 +398,7 @@ data:
|
||||
num_threads 2
|
||||
</match>
|
||||
metadata:
|
||||
name: fluentd-gcp-config-v1.2.2
|
||||
name: fluentd-gcp-config-v1.2.3
|
||||
namespace: kube-system
|
||||
labels:
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
|
@ -132,4 +132,4 @@ spec:
|
||||
path: /usr/lib64
|
||||
- name: config-volume
|
||||
configMap:
|
||||
name: fluentd-gcp-config-v1.2.2
|
||||
name: fluentd-gcp-config-v1.2.3
|
||||
|
Loading…
Reference in New Issue
Block a user