18947: Merge branch 'main'

[arvados.git] / cmd / arvados-server / cmd.go

diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index 27c53eb5cb6393623f4e596e610006448e4d786a..3a1fcd4c64e29b981ddb0234f1bf3eae6a14da7b 100644 (file)
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -96,6 +96,16 @@ func (wb2command) RunCommand(prog string, args []string, stdin io.Reader, stdout
        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,
+       }
 })