github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from weaveworks/511-unconnected-uncontained

Browse Source 
Prevent a stranded Uncontained node from appearing in container view.
This commit is contained in:
Paul Bellamy
2015-11-06 14:35:41 +00:00
parent 73e05d01de a99888994b
commit d520662e96
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
render/topologies.go
View File

@@ -76,21 +76,20 @@ var ProcessNameRenderer = Map{
// ContainerRenderer is a Renderer which produces a renderable container
// graph by merging the process graph and the container topology.
// NB We only want processes in container _or_ processes with network connections
// but we need to be careful to ensure we only include each edge once, by only
// including the ProcessRenderer once.
var ContainerRenderer = MakeReduce(
Map{
MapFunc: MapProcess2Container,
// We only want processes in container _or_ processes with network connections
// but we need to be careful to ensure we only include each edge once, by only
// including the ProcessRenderer once.
Renderer: Filter{
FilterFunc: func(n RenderableNode) bool {
_, inContainer := n.Node.Metadata[docker.ContainerID]
_, isConnected := n.Node.Metadata[IsConnected]
return inContainer || isConnected
},
Renderer: ColorConnected(ProcessRenderer),
Filter{
FilterFunc: func(n RenderableNode) bool {
_, inContainer := n.Node.Metadata[docker.ContainerID]
_, isConnected := n.Node.Metadata[IsConnected]
return inContainer || isConnected
},
Renderer: ColorConnected(Map{
MapFunc: MapProcess2Container,
Renderer: ProcessRenderer,
}),
},
Map{