[ARVADOS] updated: 2.1.0-2485-gd904fbcd2

[Git user]

Summary of changes:
 build/run-build-packages.sh                        |  2 +-
 .../arvados-server}/arvados-health.service         |  3 +-
 cmd/arvados-server/cmd.go                          | 19 +++++++++++
 lib/boot/supervisor.go                             |  2 +-
 services/health/main.go                            | 39 ----------------------
 5 files changed, 23 insertions(+), 42 deletions(-)
 rename {services/health => cmd/arvados-server}/arvados-health.service (92%)
 delete mode 100644 services/health/main.go

       via  d904fbcd2e67054784954c0af54ef8758a37f5ea (commit)
       via  7865723dc5eee129e7ac269f3495274a13ff70ae (commit)
       via  6b1a602cf1de1b6488c7d6b55e8d99ca8f707160 (commit)
      from  91dc80d9060c5aeb04228f0f280ecc3db182ff94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d904fbcd2e67054784954c0af54ef8758a37f5ea
Merge: 91dc80d90 7865723dc
Author: Tom Clegg <tom at curii.com>
Date:   Fri May 13 16:50:00 2022 -0400

    Merge branch '18947-health'
    
    refs #18947
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 7865723dc5eee129e7ac269f3495274a13ff70ae
Merge: 6b1a602cf 91dc80d90
Author: Tom Clegg <tom at curii.com>
Date:   Fri May 13 16:48:36 2022 -0400

    18947: Merge branch 'main'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc cmd/arvados-server/cmd.go
index 27c53eb5c,ae1e3fbee..3a1fcd4c6
--- 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,
++	}
 +})

-----------------------------------------------------------------------


hooks/post-receive
--