Now we have merged topologies, we don't need to put so much data on the endpoint topology, or render so much info.

probe/tag/docker_tagger.go

@@ -299,9 +299,8 @@ func (t *DockerTagger) Tag(r report.Report) report.Report {
 		}
 
 		md := report.NodeMetadata{
-			ContainerID:   container.ID,
-			ContainerName: strings.TrimPrefix(container.Name, "/"),
-			ImageID:       container.Image,
+			ContainerID: container.ID,
+			ImageID:     container.Image,
 		}
 
 		t.RLock()

probe/tag/docker_tagger_test.go

@@ -67,8 +67,13 @@ func TestDockerTagger(t *testing.T) {
 	}
 
 	var (
-		endpoint1NodeID     = "somehost.com;192.168.1.1;12345"
-		endpoint2NodeID     = "somehost.com;192.168.1.1;67890"
+		endpoint1NodeID      = "somehost.com;192.168.1.1;12345"
+		endpoint2NodeID      = "somehost.com;192.168.1.1;67890"
+		endpointNodeMetadata = report.NodeMetadata{
+			ContainerID: "foo",
+			ImageID:     "baz",
+			ImageName:   "bang",
+		}
 		processNodeMetadata = report.NodeMetadata{
 			ContainerID:   "foo",
 			ContainerName: "bar",
@@ -84,7 +89,7 @@ func TestDockerTagger(t *testing.T) {
 	dockerTagger, _ := NewDockerTagger("/irrelevant", 10*time.Second)
 	runtime.Gosched()
 	for _, endpointNodeID := range []string{endpoint1NodeID, endpoint2NodeID} {
-		want := processNodeMetadata.Copy()
+		want := endpointNodeMetadata.Copy()
 		have := dockerTagger.Tag(r).Endpoint.NodeMetadatas[endpointNodeID].Copy()
 		delete(have, "pid")
 		if !reflect.DeepEqual(want, have) {

report/detailed_node.go

@@ -71,10 +71,6 @@ func endpointOriginTable(nmd NodeMetadata) (Table, bool) {
 		{"host_name", "Host name"},
 		{"pid", "PID"},
 		{"name", "Process name"},
-		{"docker_container_id", "Container ID"},
-		{"docker_container_name", "Container name"},
-		{"docker_image_id", "Container image ID"},
-		{"docker_image_name", "Container image name"},
 	} {
 		if val, ok := nmd[tuple.key]; ok {
 			rows = append(rows, Row{Key: tuple.human, ValueMajor: val, ValueMinor: ""})