From: Tom Clegg <tom@curii.com>
Date: Fri, 13 May 2022 20:48:36 +0000 (-0400)
Subject: 18947: Merge branch 'main'
X-Git-Tag: 2.5.0~176^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7865723dc5eee129e7ac269f3495274a13ff70ae

18947: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

7865723dc5eee129e7ac269f3495274a13ff70ae
diff --cc cmd/arvados-server/cmd.go
index 27c53eb5cb,ae1e3fbeee..3a1fcd4c64
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -95,7 -90,3 +95,17 @@@ func (wb2command) RunCommand(prog strin
  	}
  	return 0
  }
 +
- var healthCommand cmd.Handler = service.Command(arvados.ServiceNameHealth, func(ctx context.Context, cluster *arvados.Cluster, _ string, _ *prometheus.Registry) service.Handler {
- 	return &health.Aggregator{Cluster: cluster}
++var healthCommand cmd.Handler = service.Command(arvados.ServiceNameHealth, func(ctx context.Context, cluster *arvados.Cluster, _ string, reg *prometheus.Registry) service.Handler {
++	mClockSkew := prometheus.NewGauge(prometheus.GaugeOpts{
++		Namespace: "arvados",
++		Subsystem: "health",
++		Name:      "clock_skew_seconds",
++		Help:      "Clock skew observed in most recent health check",
++	})
++	reg.MustRegister(mClockSkew)
++	return &health.Aggregator{
++		Cluster:         cluster,
++		MetricClockSkew: mClockSkew,
++	}
 +})