Skip to content

Commit 8beb7f3

Browse files
Fix slow CRI-O log parsing
see vmware/kube-fluentd-operator#91
1 parent afb6ed2 commit 8beb7f3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -e \
2323
# Patch configuration files:
2424
# - Include kube-system.conf after the configs of all other namespaces.
2525
# The original behaviour was to include kube-system.conf before all other namespaces.
26-
# - Disable inotify based watcher (i.e. only use timers) for all tail plugins.
26+
# - https://github.com/vmware/kube-fluentd-operator/pull/91
2727
RUN set -e \
2828
&& sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
29-
&& sed -i '/@type tail/a\ \ enable_stat_watcher false' /templates/kubernetes.conf
29+
&& sed -i '/# cri-o/,/# docker/{ s!format1.*!format1 /^(?<partials>([^\\n]+ (stdout|stderr) P [^\\n]+\\n)*)/!; s!format2.*!format2 /(?<time>[^\\n]+) (?<stream>stdout|stderr) F (?<log>[^\\n]*)/! }' /templates/kubernetes.conf

0 commit comments

Comments
 (0)