From 5d06f90f1059446f19fb68c6f6388e54eac249d0 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Dec 2017 10:58:19 +0000 Subject: [PATCH] don't propagate HostNodeID in MapProcess2Container ...when creating Uncontained pseudo nodes. Summarisation of Uncontained/Umanaged only looks at the ID, which includes the HostNodeID. We adjust the promotion of Uncontained to Unmanaged, to operate on the ID instead of (re)extracting the hostID from the HostNodeID metadata. With that, nothing looks at the HostNodeID metadata of Uncontained/Unmanaged nodes. --- render/container.go | 1 - render/pod.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/render/container.go b/render/container.go index 87d1138b6..481bc986c 100644 --- a/render/container.go +++ b/render/container.go @@ -281,7 +281,6 @@ func MapProcess2Container(n report.Node) report.Nodes { } else { id = MakePseudoNodeID(UncontainedID, report.ExtractHostID(n)) node = NewDerivedPseudoNode(id, n) - node = propagateLatest(report.HostNodeID, n, node) node = propagateLatest(IsConnectedMark, n, node) } return report.Nodes{id: node} diff --git a/render/pod.go b/render/pod.go index 34bbb5115..ebb304f80 100644 --- a/render/pod.go +++ b/render/pod.go @@ -139,7 +139,7 @@ func Map2Parent( return func(n report.Node) report.Nodes { // Uncontained becomes Unmanaged/whatever if noParentsPseudoID is set if noParentsPseudoID != "" && strings.HasPrefix(n.ID, UncontainedIDPrefix) { - id := MakePseudoNodeID(noParentsPseudoID, report.ExtractHostID(n)) + id := MakePseudoNodeID(noParentsPseudoID, n.ID[len(UncontainedIDPrefix):]) node := NewDerivedPseudoNode(id, n) return report.Nodes{id: node} }