Add note to collect CONSUL_SERVER_NODES in HA docs

There are several instances in our HA docs where an example of
`Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z` is given,
but this value isn't explicitly stated. It should be
the IP addresses or DNS records of the Consul server nodes.
This commit is contained in:
Cindy Pallares 2019-06-21 15:41:51 -05:00
parent eeb81259a2
commit 054f869f6b
No known key found for this signature in database
GPG key ID: 8E13768AD1946B0C
4 changed files with 63 additions and 55 deletions

View file

@ -24,23 +24,25 @@ Continue configuration of other components by going back to:
> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0. > [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`
```ruby 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
# Enable service discovery for Prometheus
consul['enable'] = true
consul['monitoring_service_discovery'] = true
# Replace placeholders ```ruby
# Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z # Enable service discovery for Prometheus
# with the addresses of the Consul server nodes consul['enable'] = true
consul['configuration'] = { consul['monitoring_service_discovery'] = true
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
}
# Set the network addresses that the exporters will listen on # Replace placeholders
node_exporter['listen_address'] = '0.0.0.0:9100' # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
gitaly['prometheus_listen_addr'] = "0.0.0.0:9236" # with the addresses of the Consul server nodes
``` consul['configuration'] = {
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
}
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration. # Set the network addresses that the exporters will listen on
node_exporter['listen_address'] = '0.0.0.0:9100'
gitaly['prometheus_listen_addr'] = "0.0.0.0:9236"
```
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.

View file

@ -138,6 +138,8 @@ need some extra configuration.
If you enable Monitoring, it must be enabled on **all** GitLab servers. 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: 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
```ruby ```ruby

View file

@ -16,6 +16,8 @@ Omnibus:
package you want using **steps 1 and 2** from the GitLab downloads page. package you want using **steps 1 and 2** from the GitLab downloads page.
- Do not complete any other steps on the download 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: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby

View file

@ -754,28 +754,30 @@ gitlab_rails['redis_sentinels'] = [
> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0. > [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`
```ruby 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
# Enable service discovery for Prometheus
consul['enable'] = true
consul['monitoring_service_discovery'] = true
# Replace placeholders ```ruby
# Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z # Enable service discovery for Prometheus
# with the addresses of the Consul server nodes consul['enable'] = true
consul['configuration'] = { consul['monitoring_service_discovery'] = true
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
}
# Set the network addresses that the exporters will listen on # Replace placeholders
node_exporter['listen_address'] = '0.0.0.0:9100' # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
redis_exporter['listen_address'] = '0.0.0.0:9121' # with the addresses of the Consul server nodes
``` consul['configuration'] = {
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z),
}
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration. # Set the network addresses that the exporters will listen on
node_exporter['listen_address'] = '0.0.0.0:9100'
redis_exporter['listen_address'] = '0.0.0.0:9121'
```
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
## Advanced configuration ## Advanced configuration