Merge pull request #1285 from weaveworks/1284-docker-labels

Add labels to docker labels

render/detailed/docker_labels.go

@@ -29,7 +29,11 @@ func NodeDockerLabels(nmd report.Node) []report.MetadataRow {
 	}
 	sort.Strings(labelKeys)
 	for _, labelKey := range labelKeys {
-		rows = append(rows, report.MetadataRow{ID: "label_" + labelKey, Value: labels[labelKey]})
+		rows = append(rows, report.MetadataRow{
+			ID:    "label_" + labelKey,
+			Label: labelKey,
+			Value: labels[labelKey],
+		})
 	}
 	return rows
 }

render/detailed/docker_labels_test.go

@@ -29,6 +29,7 @@ func TestNodeDockerLabels(t *testing.T) {
 			want: []report.MetadataRow{
 				{
 					ID:    "label_label1",
+					Label: "label1",
 					Value: "label1value",
 				},
 			},

render/detailed/node_test.go

@@ -187,10 +187,10 @@ func TestMakeDetailedContainerNode(t *testing.T) {
 				{ID: "docker_image_id", Label: "Image ID", Value: fixture.ServerContainerImageID, Priority: 11},
 			},
 			DockerLabels: []report.MetadataRow{
-				{ID: "label_" + detailed.AmazonECSContainerNameLabel, Value: `server`},
-				{ID: "label_foo1", Value: `bar1`},
-				{ID: "label_foo2", Value: `bar2`},
-				{ID: "label_io.kubernetes.pod.name", Value: "ping/pong-b"},
+				{ID: "label_" + detailed.AmazonECSContainerNameLabel, Label: detailed.AmazonECSContainerNameLabel, Value: `server`},
+				{ID: "label_foo1", Label: "foo1", Value: `bar1`},
+				{ID: "label_foo2", Label: "foo2", Value: `bar2`},
+				{ID: "label_io.kubernetes.pod.name", Label: "io.kubernetes.pod.name", Value: "ping/pong-b"},
 			},
 			Metrics: []report.MetricRow{
 				{