Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
richm committed Sep 26, 2018
1 parent 9330658 commit b2915fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fluentd/run.sh
Expand Up @@ -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
Expand Down

0 comments on commit b2915fb

Please sign in to comment.