cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2139 from justnom/devel

Browse source 
Adding additional Docker log drivers.
This commit is contained in:
Brian Coca 2015-10-12 18:45:55 -04:00
commit da1a317f7d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/docker/docker.py
View file

@ -97,9 +97,12 @@ options:
- You can specify a different logging driver for the container than for the daemon. - 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. "json-file" Default logging driver for Docker. Writes JSON messages to file.
docker logs command is available only for this logging driver. 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. "syslog" Syslog logging driver for Docker. Writes log messages to syslog.
docker logs command is not available for this logging driver. 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. If not defined explicitly, the Docker daemon's default ("json-file") will apply.
Requires docker >= 1.6.0. Requires docker >= 1.6.0.
required: false required: false
@ -108,6 +111,9 @@ options:
- json-file - json-file
- none - none
- syslog - syslog
- journald
- gelf
- fluentd
version_added: "2.0" version_added: "2.0"
log_opt: log_opt:
description: description:
@ -1662,7 +1668,7 @@ def main():
net = dict(default=None), net = dict(default=None),
pid = dict(default=None), pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'), 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'), log_opt = dict(default=None, type='dict'),
cpu_set = dict(default=None), cpu_set = dict(default=None),
cap_add = dict(default=None, type='list'), cap_add = dict(default=None, type='list'),