Merge pull request #1405 from openshift-cherrypick-robot/cherry-pick-…

…1364-to-release-3.7 [release-3.7] Bug 1632648 - Record is missing kubernetes field when Docker log driver is journald
openshift · Oct 16, 2018 · c8f8f64 · c8f8f64
2 parents 7096dd5 + b8b2956
commit c8f8f64
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fluentd/run.sh b/fluentd/run.sh
@@ -23,7 +23,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