TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 14:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

make route a simpler expvar

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-08-15 17:47:05 +02:00
parent ffe3c43168
commit c74932009a
No known key found for this signature in database
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ipn/ipnlocal/local.go
View File

@ -12,6 +12,7 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"errors" "errors"
"expvar"
"fmt" "fmt"
"io" "io"
"log" "log"
@ -118,6 +119,12 @@ import (
"tailscale.com/wgengine/wgcfg/nmcfg" "tailscale.com/wgengine/wgcfg/nmcfg"
) )
var metricAdvertisedRoutes expvar.Int
func init() {
usermetric.Publish("tailscaled_advertised_routes", &metricAdvertisedRoutes)
}
var controlDebugFlags = getControlDebugFlags() var controlDebugFlags = getControlDebugFlags()
func getControlDebugFlags() []string { func getControlDebugFlags() []string {
@ -4615,12 +4622,6 @@ func unmapIPPrefixes(ippsList ...[]netip.Prefix) (ret []netip.Prefix) {
return ret return ret
} }
var metricAdvertisedRoutes = usermetric.NewMap(
"tailscaled_advertised_routes",
"gauge",
"Number of subnet routes advertised by the node. (excluding exit node /0 routes)",
)
// b.mu must be held. // b.mu must be held.
func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ipn.PrefsView) { func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ipn.PrefsView) {
if h := prefs.Hostname(); h != "" { if h := prefs.Hostname(); h != "" {
@ -4632,13 +4633,11 @@ func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ip
hi.AllowsUpdate = envknob.AllowsRemoteUpdate() || prefs.AutoUpdate().Apply.EqualBool(true) hi.AllowsUpdate = envknob.AllowsRemoteUpdate() || prefs.AutoUpdate().Apply.EqualBool(true)
// count routes without exit node routes // count routes without exit node routes
routeCount := 0
for _, route := range hi.RoutableIPs { for _, route := range hi.RoutableIPs {
if route.Bits() != 0 { if route.Bits() != 0 {
routeCount++ metricAdvertisedRoutes.Add(1)
} }
} }
metricAdvertisedRoutes.SetInt(struct{}{}, int64(routeCount))
var sshHostKeys []string var sshHostKeys []string
if prefs.RunSSH() && envknob.CanSSHD() { if prefs.RunSSH() && envknob.CanSSHD() {

13
util/usermetric/usermetric.go
View File

@ -33,19 +33,14 @@ func NewMultiLabelMap[T comparable](name string, promType, helpText string) *met
return m return m
} }
// NewMap creates and register a new // Publish declares a named exported variable. This should be called from a
// Map variable with the given name and returns it. // package's init function when it creates its Vars.
// //
// Note that usermetric are not protected against duplicate // Note that usermetric are not protected against duplicate
// metrics name. It is the caller's responsibility to ensure that // metrics name. It is the caller's responsibility to ensure that
// the name is unique. // the name is unique.
func NewMap(name string, promType, helpText string) *metrics.MultiLabelMap[struct{}] { func Publish(name string, v expvar.Var) {
m := &metrics.MultiLabelMap[struct{}]{ vars.Set(name, v)
Type: promType,
Help: helpText,
}
vars.Set(name, m)
return m
} }
// Handler returns a varz.Handler that serves the userfacing expvar contained // Handler returns a varz.Handler that serves the userfacing expvar contained