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 #3091 from weaveworks/omit-empty-networks

Browse Source 
Exclude null entries for networks on container nodes in probe report
This commit is contained in:
Bryan Boreham
2018-02-26 10:43:13 +00:00
committed by GitHub
parent 35d3e32744 3941424794
commit 95359a70d0
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
probe/docker/container.go
View File

@@ -287,6 +287,9 @@ func (c *container) NetworkInfo(localAddrs []net.IP) report.Sets {
// here, and provide foreign key links from nodes to networks.
networks := make([]string, 0, len(c.container.NetworkSettings.Networks))
for name, settings := range c.container.NetworkSettings.Networks {
if name == "none" {
continue
}
networks = append(networks, name)
if settings.IPAddress != "" {
ips = append(ips, settings.IPAddress)
@@ -303,11 +306,20 @@ func (c *container) NetworkInfo(localAddrs []net.IP) report.Sets {
// Treat all Docker IPs as local scoped.
ipsWithScopes := addScopeToIPs(c.hostID, ipv4s)
return report.MakeSets().
Add(ContainerNetworks, report.MakeStringSet(networks...)).
Add(ContainerPorts, c.ports(localAddrs)).
Add(ContainerIPs, report.MakeStringSet(ipv4s...)).
Add(ContainerIPsWithScopes, report.MakeStringSet(ipsWithScopes...))
s := report.MakeSets()
if len(networks) > 0 {
s = s.Add(ContainerNetworks, report.MakeStringSet(networks...))
}
if len(c.container.NetworkSettings.Ports) > 0 {
s = s.Add(ContainerPorts, c.ports(localAddrs))
}
if len(ipv4s) > 0 {
s = s.Add(ContainerIPs, report.MakeStringSet(ipv4s...))
}
if len(ipsWithScopes) > 0 {
s = s.Add(ContainerIPsWithScopes, report.MakeStringSet(ipsWithScopes...))
}
return s
}
func (c *container) memoryUsageMetric(stats []docker.Stats) report.Metric {