From 518ac36878fd5b87fb94cd88f2990dd4e198ba17 Mon Sep 17 00:00:00 2001 From: justnom Date: Wed, 23 Sep 2015 11:54:51 -0400 Subject: [PATCH] Adding additional Docker log drivers. Adding additional `log_driver` choices: * journald * gelf * fluentd Compatible with Docker version >= 1.8.0 --- cloud/docker/docker.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 0ab564208ba..cf7d7bac4d5 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -97,9 +97,12 @@ options: - You can specify a different logging driver for the container than for the daemon. "json-file" Default logging driver for Docker. Writes JSON messages to file. docker logs command is available only for this logging driver. - "none" disables any logging for the container. docker logs won't be available with this driver. + "none" disables any logging for the container. "syslog" Syslog logging driver for Docker. Writes log messages to syslog. docker logs command is not available for this logging driver. + "journald" Journald logging driver for Docker. Writes log messages to "journald". + "gelf" Graylog Extended Log Format (GELF) logging driver for Docker. Writes log messages to a GELF endpoint likeGraylog or Logstash. + "fluentd" Fluentd logging driver for Docker. Writes log messages to "fluentd" (forward input). If not defined explicitly, the Docker daemon's default ("json-file") will apply. Requires docker >= 1.6.0. required: false @@ -108,6 +111,9 @@ options: - json-file - none - syslog + - journald + - gelf + - fluentd version_added: "2.0" log_opt: description: @@ -1662,7 +1668,7 @@ def main(): net = dict(default=None), pid = dict(default=None), insecure_registry = dict(default=False, type='bool'), - log_driver = dict(default=None, choices=['json-file', 'none', 'syslog']), + log_driver = dict(default=None, choices=['json-file', 'none', 'syslog', 'journald', 'gelf', 'fluentd']), log_opt = dict(default=None, type='dict'), cpu_set = dict(default=None), cap_add = dict(default=None, type='list'),