TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 10:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

move metrics to health package

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

21
cmd/tailscaled/tailscaled.go
View File

@ -35,7 +35,11 @@ import (
"tailscale.com/control/controlclient"
"tailscale.com/drive/driveimpl"
"tailscale.com/envknob"
<<<<<<< HEAD
"tailscale.com/hostinfo"
=======
"tailscale.com/health"
>>>>>>> 4a8cbaec4 (move metrics to health package)
"tailscale.com/ipn"
"tailscale.com/ipn/conffile"
"tailscale.com/ipn/ipnlocal"
@ -63,7 +67,6 @@ import (
"tailscale.com/util/clientmetric"
"tailscale.com/util/multierr"
"tailscale.com/util/osshare"
"tailscale.com/util/usermetric"
"tailscale.com/version"
"tailscale.com/version/distro"
"tailscale.com/wgengine"
@ -341,11 +344,11 @@ func run() (err error) {
sys := new(tsd.System)
health := sys.HealthTracker()
metricHealthMessages.Set(healthMessageLabel{
healthTracker := sys.HealthTracker()
health.MetricHealthMessage.Set(health.MetricHealthMessageLabel{
Severity: "warning",
}, expvar.Func(func() any {
return health.OverallErrorCount()
return healthTracker.OverallErrorCount()
}))
// Parse config, if specified, to fail early if it's invalid.
@ -927,13 +930,3 @@ func applyIntegrationTestEnvKnob() {
}
}
}
type healthMessageLabel struct {
Severity string
}
var metricHealthMessages = usermetric.NewMultiLabelMap[healthMessageLabel](
"tailscaled_health_messages",
"gauge",
"Number of health messages broken down by severity.",
)

12
health/health.go
View File

@ -25,6 +25,7 @@ import (
"tailscale.com/util/mak"
"tailscale.com/util/multierr"
"tailscale.com/util/set"
"tailscale.com/util/usermetric"
"tailscale.com/version"
)
@ -1244,3 +1245,14 @@ func (t *Tracker) checkReceiveFuncsLocked() {
f.missing = true
}
}
type MetricHealthMessageLabel struct {
Severity string
}
var MetricHealthMessage = usermetric.NewMultiLabelMap[MetricHealthMessageLabel](
"tailscaled_health_messages",
"gauge",
"Number of health messages broken down by severity.",
)