When applying the NAT remappings, merge with existing nodes.

weaveworks · Sep 7, 2015 · 444cf5b · 444cf5b
1 parent b96adf0
commit 444cf5b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/probe/endpoint/nat.go b/probe/endpoint/nat.go
@@ -61,6 +61,10 @@ func (n *natmapper) applyNAT(rpt report.Report, scope string) {
 			return
 		}
 
-		rpt.Endpoint.Nodes[copyEndpointID] = node.Copy()
+		node = node.Copy()
+		if existing, ok := rpt.Endpoint.Nodes[copyEndpointID]; ok {
+			node = node.Merge(existing)
+		}
+		rpt.Endpoint.Nodes[copyEndpointID] = node
 	})
 }