TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-06 15:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tsnet: add expvar metrics for in/outbound packets

Browse Source 
Updates tailscale/corp#22075

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-08-01 13:00:36 +02:00
parent e107977f75
commit 62ed1eeb26
No known key found for this signature in database
1 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
net/tstun/wrap.go
View File

@ -24,6 +24,7 @@ import (
"go4.org/mem" "go4.org/mem"
"gvisor.dev/gvisor/pkg/tcpip/stack" "gvisor.dev/gvisor/pkg/tcpip/stack"
"tailscale.com/disco" "tailscale.com/disco"
"tailscale.com/metrics"
"tailscale.com/net/connstats" "tailscale.com/net/connstats"
"tailscale.com/net/packet" "tailscale.com/net/packet"
"tailscale.com/net/packet/checksum" "tailscale.com/net/packet/checksum"
@ -870,7 +871,6 @@ func (t *Wrapper) filterPacketOutboundToWireGuard(p *packet.Parsed, pc *peerConf
return res return res
} }
} }
return filter.Accept return filter.Accept
} }
@ -924,6 +924,9 @@ func (t *Wrapper) Read(buffs [][]byte, sizes []int, offset int) (int, error) {
if !t.disableFilter { if !t.disableFilter {
response := t.filterPacketOutboundToWireGuard(p, pc) response := t.filterPacketOutboundToWireGuard(p, pc)
if response != filter.Accept { if response != filter.Accept {
metricOutboundPacketsTotal.Add(trafficLabel{
Action: TrafficActionDropACL,
}, 1)
metricPacketOutDrop.Add(1) metricPacketOutDrop.Add(1)
continue continue
} }
@ -951,6 +954,10 @@ func (t *Wrapper) Read(buffs [][]byte, sizes []int, offset int) (int, error) {
t.sendBufferConsumed() t.sendBufferConsumed()
} }
metricOutboundPacketsTotal.Add(trafficLabel{
Action: TrafficActionAccept,
}, int64(len(res.data)))
t.noteActivity() t.noteActivity()
return buffsPos, res.err return buffsPos, res.err
} }
@ -1177,6 +1184,9 @@ func (t *Wrapper) Write(buffs [][]byte, offset int) (int, error) {
if !t.disableFilter { if !t.disableFilter {
if t.filterPacketInboundFromWireGuard(p, captHook, pc) != filter.Accept { if t.filterPacketInboundFromWireGuard(p, captHook, pc) != filter.Accept {
metricPacketInDrop.Add(1) metricPacketInDrop.Add(1)
metricInboundPacketsTotal.Add(trafficLabel{
Action: TrafficActionDropACL,
}, 1)
} else { } else {
buffs[i] = buff buffs[i] = buff
i++ i++
@ -1194,6 +1204,15 @@ func (t *Wrapper) Write(buffs [][]byte, offset int) (int, error) {
if len(buffs) > 0 { if len(buffs) > 0 {
t.noteActivity() t.noteActivity()
_, err := t.tdevWrite(buffs, offset) _, err := t.tdevWrite(buffs, offset)
if err != nil {
metricInboundPacketsTotal.Add(trafficLabel{
Action: TrafficActionDropError,
}, int64(len(buffs)))
} else {
metricInboundPacketsTotal.Add(trafficLabel{
Action: TrafficActionAccept,
}, int64(len(buffs)))
}
return len(buffs), err return len(buffs), err
} }
return 0, nil return 0, nil
@ -1396,6 +1415,37 @@ var (
metricPacketOutDropSelfDisco = clientmetric.NewCounter("tstun_out_to_wg_drop_self_disco") metricPacketOutDropSelfDisco = clientmetric.NewCounter("tstun_out_to_wg_drop_self_disco")
) )
type TrafficAction string
const (
TrafficActionAccept TrafficAction = "accept"
TrafficActionDropACL TrafficAction = "drop_acl"
TrafficActionDropError TrafficAction = "drop_error"
TrafficActionDropDst TrafficAction = "drop_dst_unknown"
)
type trafficLabel struct {
// Action indicates what we have done with the packet, and has the following wvalues:
// - accept
// - drop_acl (rejected packets because of ACL)
// - drop_error (rejected packets because of an error)
// - drop_dst_unknown
Action TrafficAction
}
var (
metricInboundPacketsTotal = metrics.NewMultiLabelMap[trafficLabel](
"tailscaled_inbound_packets_total",
"counter",
"Counts the number of packets received by the node from other peers",
)
metricOutboundPacketsTotal = metrics.NewMultiLabelMap[trafficLabel](
"tailscaled_outbound_packets_total",
"counter",
"Counts the number of packets sent by the node to other peers",
)
)
func (t *Wrapper) InstallCaptureHook(cb capture.Callback) { func (t *Wrapper) InstallCaptureHook(cb capture.Callback) {
t.captureHook.Store(cb) t.captureHook.Store(cb)
} }