Output a single docker name (#164)

raboof · Jan 23, 2017 · 2923dd8 · 2923dd8
1 parent f670b6a
commit 2923dd8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/beater/connbeat.go b/beater/connbeat.go
@@ -27,7 +27,7 @@ type Connbeat struct {
 
 type ContainerInfo struct {
 	id                 string
-	names              []string
+	name               string
 	image              string
 	localIPs           mapset.Set
 	environment        []string
@@ -111,7 +111,7 @@ func toMap(containerInfo *ContainerInfo) common.MapStr {
 	if containerInfo != nil {
 		return common.MapStr{
 			"id":        containerInfo.id,
-			"names":     containerInfo.names,
+			"name":      containerInfo.name,
 			"image":     containerInfo.image,
 			"local_ips": containerInfo.localIPs.ToSlice(),
 			"env":       containerInfo.environment,
@@ -178,7 +178,7 @@ func update(infos map[string]ContainerInfo, socketContainerInfo *sockets.Contain
 		localIPs := mapset.NewSet()
 		info = ContainerInfo{
 			socketContainerInfo.ID,
-			socketContainerInfo.Names,
+			socketContainerInfo.Name,
 			socketContainerInfo.Image,
 			localIPs, socketContainerInfo.DockerEnvironment,
 			socketContainerInfo.Ports,

diff --git a/sockets/docker/docker.go b/sockets/docker/docker.go
@@ -155,7 +155,7 @@ func (p *Poller) getContainerInfo(container docker.APIContainers) (*sockets.Cont
 	environment := p.getEnvironment(inspected)
 	return &sockets.ContainerInfo{
 		ID:                 container.ID,
-		Names:              container.Names,
+		Name:               inspected.Name,
 		Image:              container.Image,
 		DockerEnvironment:  environment,
 		Ports:              inspected.NetworkSettings.Ports,

diff --git a/sockets/sockets.go b/sockets/sockets.go
@@ -8,7 +8,7 @@ import (
 
 type ContainerInfo struct {
 	ID                 string
-	Names              []string
+	Name               string
 	Image              string
 	DockerEnvironment  []string
 	Ports              map[docker.Port][]docker.PortBinding