Bug 1632648 - Record is missing kubernetes field when Docker log driv…

…er is journald https://bugzilla.redhat.com/show_bug.cgi?id=1632648 In /etc/sysconfig/docker, the log-driver may be specified as --log-driver=journald or --log-driver journald delimited by one or more whitespace
openshift · Sep 26, 2018 · b2915fb · b2915fb
1 parent 9330658
commit b2915fb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fluentd/run.sh b/fluentd/run.sh
@@ -43,7 +43,7 @@ docker_uses_journal() {
         if grep -q '^[^#].*"log-driver":.*journald' /etc/docker/daemon.json 2> /dev/null ; then
             return 0
         fi
-    elif grep -q "^OPTIONS='[^']*--log-driver=journald" /etc/sysconfig/docker 2> /dev/null ; then
+    elif grep -q "^OPTIONS='[^']*--log-driver[   =][     ]*journald" /etc/sysconfig/docker 2> /dev/null ; then
         return 0
     fi
     return 1