From 7d261d0ca054cb684da4f9412853b46515b0c45a Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Wed, 20 Dec 2017 13:15:13 +0000
Subject: [PATCH] don't map image adjacencies to hosts

it's just wrong
---
 render/host.go   | 18 +++++++++++++++---
 render/render.go | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/render/host.go b/render/host.go
index 180f1115d..4d5ca7f4a 100644
--- a/render/host.go
+++ b/render/host.go
@@ -32,11 +32,23 @@ func nodes2Hosts(nodes Nodes) Nodes {
 		if n.Topology == Pseudo {
 			continue // Don't propagate pseudo nodes - we do this in endpoints2Hosts
 		}
+		isImage := n.Topology == report.ContainerImage
 		hostIDs, _ := n.Parents.Lookup(report.Host)
 		for _, id := range hostIDs {
-			ret.addChild(n, id, func(id string) report.Node {
-				return report.MakeNode(id).WithTopology(report.Host)
-			})
+			if isImage {
+				// We need to treat image nodes specially because they
+				// aggregate adjacencies of containers across multiple
+				// hosts, and hence mapping these adjacencies to host
+				// adjacencies would produce edges that aren't present
+				// in reality.
+				ret.addUnmappedChild(n, id, func(id string) report.Node {
+					return report.MakeNode(id).WithTopology(report.Host)
+				})
+			} else {
+				ret.addChild(n, id, func(id string) report.Node {
+					return report.MakeNode(id).WithTopology(report.Host)
+				})
+			}
 		}
 	}
 	return ret.result(nodes)
diff --git a/render/render.go b/render/render.go
index 48bd250d7..26b30b075 100644
--- a/render/render.go
+++ b/render/render.go
@@ -185,6 +185,20 @@ func (ret *joinResults) add(m report.Node, n report.Node) {
 	}
 }
 
+// Add m as a child of the node at id, creating a new result node if
+// not already there.
+func (ret *joinResults) addUnmappedChild(m report.Node, id string, create func(string) report.Node) {
+	result, exists := ret.nodes[id]
+	if !exists {
+		result = create(id)
+	}
+	result.Children = result.Children.Add(m)
+	if m.Topology != report.Endpoint { // optimisation: we never look at endpoint counts
+		result.Counters = result.Counters.Add(m.Topology, 1)
+	}
+	ret.nodes[id] = result
+}
+
 // Add m as a child of the node at id, creating a new result node if
 // not already there, and updating the mapping from old ID to new ID.
 func (ret *joinResults) addChild(m report.Node, id string, create func(string) report.Node) {