prober: export probe class and metrics from bandwidth prober
- Wrap each prober function into a probe class that allows associating metric labels and custom metrics with a given probe; - Make sure all existing probe classes set a `class` metric label; - Move bandwidth probe size from being a metric label to a separate gauge metric; this will make it possible to use it to calculate average used bandwidth using a PromQL query; - Also export transfer time for the bandwidth prober (more accurate than the total probe time, since it excludes connection establishment time). Updates tailscale/corp#17912 Signed-off-by: Anton Tolchanov <anton@tailscale.com>
This commit is contained in:
committed by
Anton Tolchanov
parent
21671ca374
commit
5336362e64
+16
-10
@@ -27,22 +27,28 @@ const expiresSoon = 7 * 24 * time.Hour // 7 days from now
|
||||
// The ProbeFunc connects to a hostPort (host:port string), does a TLS
|
||||
// handshake, verifies that the hostname matches the presented certificate,
|
||||
// checks certificate validity time and OCSP revocation status.
|
||||
func TLS(hostPort string) ProbeFunc {
|
||||
return func(ctx context.Context) error {
|
||||
certDomain, _, err := net.SplitHostPort(hostPort)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return probeTLS(ctx, certDomain, hostPort)
|
||||
func TLS(hostPort string) ProbeClass {
|
||||
return ProbeClass{
|
||||
Probe: func(ctx context.Context) error {
|
||||
certDomain, _, err := net.SplitHostPort(hostPort)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return probeTLS(ctx, certDomain, hostPort)
|
||||
},
|
||||
Class: "tls",
|
||||
}
|
||||
}
|
||||
|
||||
// TLSWithIP is like TLS, but dials the provided dialAddr instead
|
||||
// of using DNS resolution. The certDomain is the expected name in
|
||||
// the cert (and the SNI name to send).
|
||||
func TLSWithIP(certDomain string, dialAddr netip.AddrPort) ProbeFunc {
|
||||
return func(ctx context.Context) error {
|
||||
return probeTLS(ctx, certDomain, dialAddr.String())
|
||||
func TLSWithIP(certDomain string, dialAddr netip.AddrPort) ProbeClass {
|
||||
return ProbeClass{
|
||||
Probe: func(ctx context.Context) error {
|
||||
return probeTLS(ctx, certDomain, dialAddr.String())
|
||||
},
|
||||
Class: "tls",
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user