Merge pull request #1364 from richm/bug-1632648

Bug 1632648 - Record is missing kubernetes field when Docker log driver is journald
openshift · Sep 26, 2018 · 3ad88ef · 3ad88ef
2 parents 9330658 + b2915fb
commit 3ad88ef
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