Merge pull request #24 from wallies/master

digital-wonderland · digital-wonderland · commit b35748a699d8 · 2015-12-27T17:22:55.000+07:00
replace . with - in docker labels
diff --git a/forwarder/config/config.go b/forwarder/config/config.go
@@ -48,7 +48,8 @@ func (config *LogstashForwarderConfig) AddContainerLogFile(container *docker.Con
 	file.Fields["docker/image"] = container.Config.Image
 
 	for k, v := range container.Config.Labels {
-		file.Fields["docker/label/"+k] = v
+		l := strings.Replace(k, ".", "-", -1)
+		file.Fields["docker/label/"+l] = v
 	}
 
 	if container.Node != nil {
@@ -57,7 +58,8 @@ func (config *LogstashForwarderConfig) AddContainerLogFile(container *docker.Con
 		file.Fields["docker/node/name"] = container.Node.Name
 
 		for k, v := range container.Node.Labels {
-			file.Fields["docker/node/label/"+k] = v
+			l := strings.Replace(k, ".", "-", -1)
+			file.Fields["docker/node/label/"+l] = v
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ func (config LogstashForwarderConfig) AddContainerLogFile(container docker.Con`
`48`	`48`	`file.Fields["docker/image"] = container.Config.Image`
`49`	`49`
`50`	`50`	`for k, v := range container.Config.Labels {`
`51`		`- file.Fields["docker/label/"+k] = v`
	`51`	`+ l := strings.Replace(k, ".", "-", -1)`
	`52`	`+ file.Fields["docker/label/"+l] = v`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`if container.Node != nil {`
`@@ -57,7 +58,8 @@ func (config LogstashForwarderConfig) AddContainerLogFile(container docker.Con`
`57`	`58`	`file.Fields["docker/node/name"] = container.Node.Name`
`58`	`59`
`59`	`60`	`for k, v := range container.Node.Labels {`
`60`		`- file.Fields["docker/node/label/"+k] = v`
	`61`	`+ l := strings.Replace(k, ".", "-", -1)`
	`62`	`+ file.Fields["docker/node/label/"+l] = v`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`