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

Prevent short lived connections appearing as pseudo nodes in the applications view.

Browse Source
This commit is contained in:
Tom Wilkie
2015-09-06 16:26:57 +00:00
parent 9526663d6d
commit 85bfcddb3f
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
probe/endpoint/reporter.go
View File

@@ -14,8 +14,9 @@ import (
// Node metadata keys.
const (
Addr = "addr" // typically IPv4
Port = "port"
Addr = "addr" // typically IPv4
Port = "port"
Conntracked = "conntracked"
)
// Reporter generates Reports containing the Endpoint topology.
@@ -102,18 +103,27 @@ func (r *Reporter) Report() (report.Report, error) {
localAddr = conn.LocalAddress.String()
remoteAddr = conn.RemoteAddress.String()
)
r.addConnection(&rpt, localAddr, remoteAddr, localPort, remotePort, &conn.Proc)
extraNodeInfo := report.MakeNode()
if conn.Proc.PID > 0 {
extraNodeInfo = extraNodeInfo.WithMetadata(report.Metadata{
process.PID: strconv.FormatUint(uint64(conn.Proc.PID), 10),
})
}
r.addConnection(&rpt, localAddr, remoteAddr, localPort, remotePort, &extraNodeInfo, nil)
}
if r.conntracker != nil {
extraNodeInfo := report.MakeNode().WithMetadata(report.Metadata{
Conntracked: "true",
})
r.conntracker.WalkFlows(func(f Flow) {
var (
localPort = f.Original.Layer4.SrcPort
remotePort = f.Original.Layer4.DstPort
localPort = uint16(f.Original.Layer4.SrcPort)
remotePort = uint16(f.Original.Layer4.DstPort)
localAddr = f.Original.Layer3.SrcIP
remoteAddr = f.Original.Layer3.DstIP
)
r.addConnection(&rpt, localAddr, remoteAddr, uint16(localPort), uint16(remotePort), nil)
r.addConnection(&rpt, localAddr, remoteAddr, localPort, remotePort, &extraNodeInfo, &extraNodeInfo)
})
}
@@ -124,7 +134,7 @@ func (r *Reporter) Report() (report.Report, error) {
return rpt, err
}
func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr string, localPort, remotePort uint16, proc *procspy.Proc) {
func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr string, localPort, remotePort uint16, extraLocalNode, extraRemoteNode *report.Node) {
var (
localIsClient = int(localPort) > int(remotePort)
hostNodeID = report.MakeHostNodeID(r.hostID)
@@ -188,10 +198,12 @@ func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr strin
})
}
if proc != nil && proc.PID > 0 {
localNode.Metadata[process.PID] = strconv.FormatUint(uint64(proc.PID), 10)
if extraLocalNode != nil {
localNode = localNode.Merge(*extraLocalNode)
}
if extraRemoteNode != nil {
remoteNode = remoteNode.Merge(*extraRemoteNode)
}
rpt.Endpoint = rpt.Endpoint.WithNode(localEndpointNodeID, localNode)
rpt.Endpoint = rpt.Endpoint.WithNode(remoteEndpointNodeID, remoteNode)
}

13
render/mapping.go
View File

@@ -45,9 +45,16 @@ func MapEndpointIdentity(m RenderableNode, local report.Networks) RenderableNode
return RenderableNodes{}
}
// We need to filter out short lived connections from this view,
// if they don't also have a pid; see #447
pid, pidOK := m.Metadata[process.PID]
_, conntracked := m.Metadata[endpoint.Conntracked]
if !pidOK && conntracked {
return RenderableNodes{}
}
// Nodes without a hostid are treated as psuedo nodes
_, ok = m.Metadata[report.HostNodeID]
if !ok {
if _, ok = m.Metadata[report.HostNodeID]; !ok {
// If the dstNodeAddr is not in a network local to this report, we emit an
// internet node
if ip := net.ParseIP(addr); ip != nil && !local.Contains(ip) {
@@ -80,7 +87,7 @@ func MapEndpointIdentity(m RenderableNode, local report.Networks) RenderableNode
rank = major
)
if pid, ok := m.Metadata[process.PID]; ok {
if pidOK {
minor = fmt.Sprintf("%s (%s)", minor, pid)
}