From 3d1a44aae00765c3a3fe108e2c06e5d0d9246cff Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 Dec 2017 10:18:23 +0000 Subject: [PATCH] extract label from id when summarising un[contained,managed] I missed this in #2998. --- render/container.go | 2 +- render/detailed/summary.go | 4 ++-- render/pod.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/render/container.go b/render/container.go index 11ee980a8..b97d08852 100644 --- a/render/container.go +++ b/render/container.go @@ -17,7 +17,7 @@ const ( ) // UncontainedIDPrefix is the prefix of uncontained pseudo nodes -var UncontainedIDPrefix = MakePseudoNodeID(UncontainedID) +var UncontainedIDPrefix = MakePseudoNodeID(UncontainedID, "") // ContainerRenderer is a Renderer which produces a renderable container // graph by merging the process graph and the container topology. diff --git a/render/detailed/summary.go b/render/detailed/summary.go index d309c2835..41afde456 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -195,13 +195,13 @@ func pseudoNodeSummary(base BasicNodeSummary, n report.Node) BasicNodeSummary { case strings.HasPrefix(n.ID, render.UncontainedIDPrefix): // render as an uncontained node base.Label = render.UncontainedMajor - base.LabelMinor = report.ExtractHostID(n) + base.LabelMinor = n.ID[len(render.UncontainedIDPrefix):] base.Shape = report.Square base.Stack = true case strings.HasPrefix(n.ID, render.UnmanagedIDPrefix): // render as an unmanaged node base.Label = render.UnmanagedMajor - base.LabelMinor = report.ExtractHostID(n) + base.LabelMinor = n.ID[len(render.UnmanagedIDPrefix):] base.Shape = report.Square base.Stack = true default: diff --git a/render/pod.go b/render/pod.go index 0c08c917a..34bbb5115 100644 --- a/render/pod.go +++ b/render/pod.go @@ -15,7 +15,7 @@ const ( ) // UnmanagedIDPrefix is the prefix of unmanaged pseudo nodes -var UnmanagedIDPrefix = MakePseudoNodeID(UnmanagedID) +var UnmanagedIDPrefix = MakePseudoNodeID(UnmanagedID, "") func renderKubernetesTopologies(rpt report.Report) bool { // Render if any k8s topology has any nodes