Merge branch '63588-follow-up-from-documentation-for-prometheus-service-discovery' into 'master'

Add note to collect CONSUL_SERVER_NODES in HA docs

Closes #63588

See merge request gitlab-org/gitlab-ce!29945

doc/administration/high_availability/gitaly.md

@@ -24,7 +24,9 @@ Continue configuration of other components by going back to:
 
 > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
 
-  1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+1. Make sure to collect [`CONSUL_SERVER_NODES`](database.md#consul-information), which are the IP addresses or DNS records of the Consul server nodes, for the next step. Note they are presented as `Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z`
+
+1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
 
    ```ruby
    # Enable service discovery for Prometheus
@@ -43,4 +45,4 @@ Continue configuration of other components by going back to:
    gitaly['prometheus_listen_addr'] = "0.0.0.0:9236"
    ```
 
-  1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.

doc/administration/high_availability/gitlab.md

@@ -138,6 +138,8 @@ need some extra configuration.
 
 If you enable Monitoring, it must be enabled on **all** GitLab servers.
 
+1. Make sure to collect [`CONSUL_SERVER_NODES`](database.md#consul-information), which are the IP addresses or DNS records of the Consul server nodes, for the next step. Note they are presented as `Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z`
+
 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
 
    ```ruby

doc/administration/high_availability/monitoring_node.md

@@ -16,6 +16,8 @@ Omnibus:
    package you want using **steps 1 and 2** from the GitLab downloads page.
    - Do not complete any other steps on the download page.
 
+1. Make sure to collect [`CONSUL_SERVER_NODES`](database.md#consul-information), which are the IP addresses or DNS records of the Consul server nodes, for the next step. Note they are presented as `Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z`
+
 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
 
     ```ruby

doc/administration/high_availability/redis.md

@@ -754,9 +754,11 @@ gitlab_rails['redis_sentinels'] = [
 
 > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
 
-  If you enable Monitoring, it must be enabled on **all** Redis servers.
+If you enable Monitoring, it must be enabled on **all** Redis servers.
 
-  1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+1. Make sure to collect [`CONSUL_SERVER_NODES`](database.md#consul-information), which are the IP addresses or DNS records of the Consul server nodes, for the next step. Note they are presented as `Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z`
+
+1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
 
    ```ruby
    # Enable service discovery for Prometheus
@@ -775,7 +777,7 @@ gitlab_rails['redis_sentinels'] = [
    redis_exporter['listen_address'] = '0.0.0.0:9121'
    ```
 
-  1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
+1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
 
 ## Advanced configuration