From 8f232c6c53095370f6ad04bed9ada7ab321b17aa Mon Sep 17 00:00:00 2001
From: TAGOMORI Satoshi <tagomoris@gmail.com>
Date: Sat, 20 Jun 2015 13:07:50 +0900
Subject: [PATCH] Add new logging driver: fluentd

Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: c240006d20f123d842931dfaf2f5450c21d943b6
Component: cli
---
 components/cli/docs/reference/run.md  | 10 ++++++++++
 components/cli/man/docker-create.1.md |  2 +-
 components/cli/man/docker-run.1.md    |  2 +-
 components/cli/man/docker.1.md        |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/cli/docs/reference/run.md b/components/cli/docs/reference/run.md
index c50dd22c46..838b3101c4 100644
--- a/components/cli/docs/reference/run.md
+++ b/components/cli/docs/reference/run.md
@@ -884,6 +884,16 @@ container's logging driver. The following options are supported:
 driver.  For detailed information on working with logging drivers, see
 [Configure a logging driver](reference/logging/).
 
+#### Logging driver: fluentd
+
+Fluentd logging driver for Docker. Writes log messages to fluentd (forward input). `docker logs`
+command is not available for this logging driver.
+
+Some options are supported by specifying `--log-opt` as many as needed, like `--log-opt fluentd-address=localhost:24224`.
+
+ - `fluentd-address`: specify `host:port` to connect [localhost:24224]
+ - `fluentd-tag`: specify tag for fluentd message, which interpret some markup, ex `{{.ID}}`, `{{.FullID}}` or `{{.Name}}` [docker.{{.ID}}]
+
 ## Overriding Dockerfile image defaults
 
 When a developer builds an image from a [*Dockerfile*](/reference/builder)
diff --git a/components/cli/man/docker-create.1.md b/components/cli/man/docker-create.1.md
index 3882fbf031..a41ca04bc1 100644
--- a/components/cli/man/docker-create.1.md
+++ b/components/cli/man/docker-create.1.md
@@ -155,7 +155,7 @@ two memory nodes.
 **--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*|*none*"
+**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*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/components/cli/man/docker-run.1.md b/components/cli/man/docker-run.1.md
index 3c75443491..c81f3f8e3e 100644
--- a/components/cli/man/docker-run.1.md
+++ b/components/cli/man/docker-run.1.md
@@ -252,7 +252,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*|*none*"
+**--log-driver**="|*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*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/components/cli/man/docker.1.md b/components/cli/man/docker.1.md
index f77038139a..9b9320db3a 100644
--- a/components/cli/man/docker.1.md
+++ b/components/cli/man/docker.1.md
@@ -103,7 +103,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*|*none*"
+**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*none*"
   Default driver for container logs. Default is `json-file`.
   **Warning**: `docker logs` command works only for `json-file` logging driver.