Merge branch '474684-fix-cluster-health-check' into 'master'

Fix cluster check metrics

Closes #474684

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161042



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>