From 0d2d916b132de8e3ca1095bbc1acf290ff15bd25 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Wed, 5 Aug 2015 00:35:06 +0000 Subject: [PATCH] Add awslogs driver for Amazon CloudWatch Logs Signed-off-by: Samuel Karp --- contrib/completion/bash/docker | 4 ++++ contrib/completion/zsh/_docker | 4 ++-- docs/reference/run.md | 1 + man/docker-create.1.md | 2 +- man/docker-run.1.md | 2 +- man/docker.1.md | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 447a75e03b..4b8d9bd209 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -279,6 +279,7 @@ __docker_log_driver_options() { local gelf_options="gelf-address gelf-tag" local json_file_options="max-file max-size" local syslog_options="syslog-address syslog-facility syslog-tag" + local awslogs_options="awslogs-region awslogs-group awslogs-stream" case $(__docker_value_of_option --log-driver) in '') @@ -296,6 +297,9 @@ __docker_log_driver_options() { syslog) COMPREPLY=( $( compgen -W "$syslog_options" -S = -- "$cur" ) ) ;; + awslogs) + COMPREPLY=( $( compgen -W "$awslogs_options" -S = -- "$cur" ) ) + ;; *) return ;; diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 964cf6fda6..fc894c84b5 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -238,7 +238,7 @@ __docker_subcommand() { "($help)--ipc=-[IPC namespace to use]:IPC namespace: " "($help)*--link=-[Add link to another container]:link:->link" "($help)*"{-l,--label=-}"[Set meta data on a container]:label: " - "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd none)" + "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" "($help)*--log-opt=-[Log driver specific options]:log driver options: " "($help)*--lxc-conf=-[Add custom lxc options]:lxc options: " "($help)--mac-address=-[Container MAC address]:MAC address: " @@ -617,7 +617,7 @@ _docker() { "($help)--ipv6[Enable IPv6 networking]" \ "($help -l --log-level)"{-l,--log-level=-}"[Set the logging level]:level:(debug info warn error fatal)" \ "($help)*--label=-[Set key=value labels to the daemon]:label: " \ - "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd none)" \ + "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" \ "($help)*--log-opt=-[Log driver specific options]:log driver options: " \ "($help)--mtu=-[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \ "($help -p --pidfile)"{-p,--pidfile=-}"[Path to use for daemon PID file]:PID file:_files" \ diff --git a/docs/reference/run.md b/docs/reference/run.md index bcb4ed32e2..ced540d2a2 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -1011,6 +1011,7 @@ container's logging driver. The following options are supported: | `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). | +| `awslogs` | Amazon CloudWatch Logs logging driver for Docker. Writes log messages to Amazon CloudWatch Logs | The `docker logs`command is available only for the `json-file` logging driver. For detailed information on working with logging drivers, see diff --git a/man/docker-create.1.md b/man/docker-create.1.md index 13ea642441..9385c882be 100644 --- a/man/docker-create.1.md +++ b/man/docker-create.1.md @@ -168,7 +168,7 @@ millions of trillions. Add link to another container in the form of :alias or just in which case the alias will match the name. -**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*none*" +**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*none*" Logging driver for container. Default is defined by daemon `--log-driver` flag. **Warning**: `docker logs` command works only for `json-file` logging driver. diff --git a/man/docker-run.1.md b/man/docker-run.1.md index 7fb9d0f162..0bb339d34e 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -268,7 +268,7 @@ which interface and port to use. **--lxc-conf**=[] (lxc exec-driver only) Add custom lxc options --lxc-conf="lxc.cgroup.cpuset.cpus = 0,1" -**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*none*" +**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*none*" Logging driver for container. Default is defined by daemon `--log-driver` flag. **Warning**: `docker logs` command works only for `json-file` logging driver. diff --git a/man/docker.1.md b/man/docker.1.md index d6bba74eec..42410c4d91 100644 --- a/man/docker.1.md +++ b/man/docker.1.md @@ -119,7 +119,7 @@ unix://[/path/to/socket] to use. **--label**="[]" Set key=value labels to the daemon (displayed in `docker info`) -**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*none*" +**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*none*" Default driver for container logs. Default is `json-file`. **Warning**: `docker logs` command works only for `json-file` logging driver.