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

Merge pull request #1591 from weaveworks/1563-read-global-docker-networks

Browse Source 
Add all docker subnets to overlay topology
This commit is contained in:
Alfonso Acosta
2016-06-15 23:32:32 +01:00
committed by GitHub
parent 0587c6a967 e1afe22a22
commit cb21a0d5b9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
probe/docker/reporter.go
View File

@@ -245,17 +245,18 @@ func (r *Reporter) containerImageTopology() report.Topology {
}
func (r *Reporter) overlayTopology() report.Topology {
localSubnets := []string{}
subnets := []string{}
r.registry.WalkNetworks(func(network docker_client.Network) {
if network.Scope == "local" {
for _, config := range network.IPAM.Config {
localSubnets = append(localSubnets, config.Subnet)
}
for _, config := range network.IPAM.Config {
subnets = append(subnets, config.Subnet)
}
})
peerID := OverlayPeerPrefix + r.hostID
// Add both local and global networks to the LocalNetworks Set
// since we treat container IPs as local
node := report.MakeNode(report.MakeOverlayNodeID(peerID)).WithSets(
report.MakeSets().Add(host.LocalNetworks, report.MakeStringSet(localSubnets...)))
report.MakeSets().Add(host.LocalNetworks, report.MakeStringSet(subnets...)))
return report.MakeTopology().AddNode(node)
}