Merge pull request #22911 from vdemeester/20033-default-logging-tag-value

Standardize default logging tag value

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
 	}

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
 	}

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
 	}

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) {

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
 	}

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
 	}