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

don't bother tracking the orignal node topology

Browse Source 
We always join with the original renderer and hence all the nodes
produced by ipToNode will get their other data, including topology,
via that route.
This commit is contained in:
Matthias Radestock
2017-07-13 16:35:52 +01:00
parent c7f94d8a74
commit 4a77e9bfac
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
render/container.go
View File

@@ -43,7 +43,6 @@ var ContainerRenderer = MakeFilter(
var mapEndpoint2IP = MakeMap(endpoint2IP, SelectEndpoint)
const originalNodeID = "original_node_id"
const originalNodeTopology = "original_node_topology"
// ConnectionJoin joins the given renderer with connections from the
// endpoints topology, using the toIPs function to extract IPs from
@@ -55,8 +54,7 @@ func ConnectionJoin(toIPs func(report.Node) []string, r Renderer) Renderer {
result[ip] = NewDerivedNode(ip, n).
WithTopology(IP).
WithLatests(map[string]string{
originalNodeID: n.ID,
originalNodeTopology: n.Topology,
originalNodeID: n.ID,
}).
WithCounters(map[string]int{IP: 1})
}
@@ -94,15 +92,8 @@ func ipToNode(n report.Node, _ report.Networks) report.Nodes {
if !ok {
return report.Nodes{}
}
topology, ok := n.Latest.Lookup(originalNodeTopology)
if !ok {
return report.Nodes{}
}
return report.Nodes{
id: NewDerivedNode(id, n).
WithTopology(topology),
}
return report.Nodes{id: NewDerivedNode(id, n)}
}
// endpoint2IP maps endpoint nodes to their IP address, for joining