github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-26 00:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract label from id when summarising un[contained,managed]

Browse Source 
I missed this in #2998.
This commit is contained in:
Matthias Radestock
2017-12-28 10:18:23 +00:00
parent 5a6a6dfd58
commit 3d1a44aae0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render/container.go
View File

@@ -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.

4
render/detailed/summary.go
View File

@@ -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:

2
render/pod.go
View File

@@ -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