diff --git a/components/engine/daemon/logger/fluentd/fluentd.go b/components/engine/daemon/logger/fluentd/fluentd.go index 137ab07696..31315844d9 100644 --- a/components/engine/daemon/logger/fluentd/fluentd.go +++ b/components/engine/daemon/logger/fluentd/fluentd.go @@ -65,7 +65,7 @@ func New(ctx logger.Context) (logger.Logger, error) { return nil, err } - tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}.{{.ID}}") + tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate) if err != nil { return nil, err } diff --git a/components/engine/daemon/logger/gelf/gelf.go b/components/engine/daemon/logger/gelf/gelf.go index 8cc77ce151..95860ac083 100644 --- a/components/engine/daemon/logger/gelf/gelf.go +++ b/components/engine/daemon/logger/gelf/gelf.go @@ -58,7 +58,7 @@ func New(ctx logger.Context) (logger.Logger, error) { containerName := bytes.TrimLeft([]byte(ctx.ContainerName), "/") // parse log tag - tag, err := loggerutils.ParseLogTag(ctx, "") + tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate) if err != nil { return nil, err } diff --git a/components/engine/daemon/logger/journald/journald.go b/components/engine/daemon/logger/journald/journald.go index 748dd8b24a..405769df84 100644 --- a/components/engine/daemon/logger/journald/journald.go +++ b/components/engine/daemon/logger/journald/journald.go @@ -50,7 +50,7 @@ func New(ctx logger.Context) (logger.Logger, error) { } // parse log tag - tag, err := loggerutils.ParseLogTag(ctx, "") + tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate) if err != nil { return nil, err } diff --git a/components/engine/daemon/logger/loggerutils/log_tag.go b/components/engine/daemon/logger/loggerutils/log_tag.go index 0ad62df201..4752679c72 100644 --- a/components/engine/daemon/logger/loggerutils/log_tag.go +++ b/components/engine/daemon/logger/loggerutils/log_tag.go @@ -7,6 +7,9 @@ import ( "github.com/docker/docker/utils/templates" ) +// DefaultTemplate defines the defaults template logger should use. +const DefaultTemplate = "{{.ID}}" + // ParseLogTag generates a context aware tag for consistency across different // log drivers based on the context of the running container. func ParseLogTag(ctx logger.Context, defaultTemplate string) (string, error) { diff --git a/components/engine/daemon/logger/splunk/splunk.go b/components/engine/daemon/logger/splunk/splunk.go index e587e66aa0..b5cafffb30 100644 --- a/components/engine/daemon/logger/splunk/splunk.go +++ b/components/engine/daemon/logger/splunk/splunk.go @@ -131,7 +131,7 @@ func New(ctx logger.Context) (logger.Logger, error) { nullMessage.SourceType = ctx.Config[splunkSourceTypeKey] nullMessage.Index = ctx.Config[splunkIndexKey] - tag, err := loggerutils.ParseLogTag(ctx, "{{.ID}}") + tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate) if err != nil { return nil, err } diff --git a/components/engine/daemon/logger/syslog/syslog.go b/components/engine/daemon/logger/syslog/syslog.go index 9561e061c6..0a60241b32 100644 --- a/components/engine/daemon/logger/syslog/syslog.go +++ b/components/engine/daemon/logger/syslog/syslog.go @@ -90,7 +90,7 @@ func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, con // the context. Supported context configuration variables are // syslog-address, syslog-facility, syslog-format. func New(ctx logger.Context) (logger.Logger, error) { - tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}/{{.ID}}") + tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate) if err != nil { return nil, err }