From 0a5a7a4c0f8b33ed63f87bb9ead3108daf718e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= <exekias@gmail.com>
Date: Tue, 20 Feb 2018 03:31:28 +0100
Subject: [PATCH] Fix autodiscover Docker labels processing (#6412)

Type was wrong (map[string]string instead of MapStr) so labels were not
being processed.
(cherry picked from commit db49ae860d6497eed66b5dfef7a46dd660da67db)
---
 CHANGELOG.asciidoc                                 | 14 ++++++++++++++
 libbeat/autodiscover/providers/docker/docker.go    |  7 ++++++-
 .../providers/docker/docker_integration_test.go    |  6 ++++--
 libbeat/tests/docker/docker.go                     |  7 ++++---
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a2b9f8cd4cd..2634de5f6f1 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -255,6 +255,20 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits]
 - Fix console color output for Windows. {issue}5611[5611]
 - Fix logstash output debug message. {pull}5799{5799]
 - Fix isolation of modules when merging local and global field settings. {issue}5795[5795]
+- Fix panic when Events containing a float32 value are normalized. {pull}6129[6129]
+- Fix `setup.dashboards.always_kibana` when using Kibana 5.6. {issue}6090[6090]
+- Update Golang 1.9.4 {pull}6326[6326]
+- Fix conditions checking on autodiscover Docker labels. {pull}6412[6412]
+
+*Auditbeat*
+
+- Add an error check to the file integrity scanner to prevent a panic when
+  there is an error reading file info via lstat. {issue}6005[6005]
+- Fixed an issue where the proctitle value was being truncated.
+- Fixed an issue where values were incorrectly interpretted as hex data.
+- Fixed parsing of the `key` value when multiple keys are present.
+- Fix possible resource leak if file_integrity module is used with config
+  reloading on Windows or Linux. {pull}6198[6198]
 
 *Filebeat*
 
diff --git a/libbeat/autodiscover/providers/docker/docker.go b/libbeat/autodiscover/providers/docker/docker.go
index e06718f7c47..a79110e190e 100644
--- a/libbeat/autodiscover/providers/docker/docker.go
+++ b/libbeat/autodiscover/providers/docker/docker.go
@@ -92,12 +92,17 @@ func (d *Provider) emitContainer(event bus.Event, flag string) {
 		host = container.IPAddresses[0]
 	}
 
+	labelMap := common.MapStr{}
+	for k, v := range container.Labels {
+		labelMap[k] = v
+	}
+
 	meta := common.MapStr{
 		"container": common.MapStr{
 			"id":     container.ID,
 			"name":   container.Name,
 			"image":  container.Image,
-			"labels": container.Labels,
+			"labels": labelMap,
 		},
 	}
 
diff --git a/libbeat/autodiscover/providers/docker/docker_integration_test.go b/libbeat/autodiscover/providers/docker/docker_integration_test.go
index 3cb892c0534..e23384edb20 100644
--- a/libbeat/autodiscover/providers/docker/docker_integration_test.go
+++ b/libbeat/autodiscover/providers/docker/docker_integration_test.go
@@ -34,7 +34,9 @@ func TestDockerStart(t *testing.T) {
 	defer listener.Stop()
 
 	// Start
-	ID, err := d.ContainerStart("busybox", "echo", "Hi!")
+	cmd := []string{"echo", "Hi!"}
+	labels := map[string]string{"label": "value"}
+	ID, err := d.ContainerStart("busybox", cmd, labels)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -69,7 +71,7 @@ func checkEvent(t *testing.T, listener bus.Listener, start bool) {
 				assert.Nil(t, getValue(e, "start"))
 			}
 			assert.Equal(t, getValue(e, "docker.container.image"), "busybox")
-			assert.Equal(t, getValue(e, "docker.container.labels"), map[string]string{})
+			assert.Equal(t, getValue(e, "docker.container.labels"), common.MapStr{"label": "value"})
 			assert.NotNil(t, getValue(e, "docker.container.id"))
 			assert.NotNil(t, getValue(e, "docker.container.name"))
 			assert.NotNil(t, getValue(e, "host"))
diff --git a/libbeat/tests/docker/docker.go b/libbeat/tests/docker/docker.go
index 26481fb2154..433d8dfd4f7 100644
--- a/libbeat/tests/docker/docker.go
+++ b/libbeat/tests/docker/docker.go
@@ -20,15 +20,16 @@ func NewClient() (Client, error) {
 }
 
 // ContainerStart pulls and starts the given container
-func (c Client) ContainerStart(image string, cmd ...string) (string, error) {
+func (c Client) ContainerStart(image string, cmd []string, labels map[string]string) (string, error) {
 	ctx := context.Background()
 	if _, err := c.cli.ImagePull(ctx, image, types.ImagePullOptions{}); err != nil {
 		return "", err
 	}
 
 	resp, err := c.cli.ContainerCreate(ctx, &container.Config{
-		Image: image,
-		Cmd:   cmd,
+		Image:  image,
+		Cmd:    cmd,
+		Labels: labels,
 	}, nil, nil, "")
 	if err != nil {
 		return "", err