summaryrefslogtreecommitdiff
path: root/doc/administration/high_availability/redis.md
diff options
context:
space:
mode:
authorAric Buerer <abuerer@gitlab.com>2019-06-21 15:55:57 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-21 15:55:57 +0000
commit10a612274420ef2e53f34517927378ad0ec43e1f (patch)
treeaef34a48b81a2a7abe22829dfd50e8976ea94e93 /doc/administration/high_availability/redis.md
parentd0a921b45ac66eb784043ee8092dc85f147b341a (diff)
downloadgitlab-ce-10a612274420ef2e53f34517927378ad0ec43e1f.tar.gz
Adding documentation for Prometheus Service Discovery
Updating documentation to include Prometheus Service Discovery. Added monitoring node documentaiton as well as documentation for the individual service nodes.
Diffstat (limited to 'doc/administration/high_availability/redis.md')
-rw-r--r--doc/administration/high_availability/redis.md28
1 files changed, 28 insertions, 0 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index 1aaa709fc8f..f61a8834af3 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -74,6 +74,7 @@ Omnibus:
1. Note the Redis node's IP address or hostname, port, and
Redis password. These will be necessary when configuring the GitLab
application servers later.
+1. [Enable Monitoring](#enable-monitoring)
Advanced configuration options are supported and can be added if
needed.
@@ -749,6 +750,33 @@ gitlab_rails['redis_sentinels'] = [
[Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
+## Enable Monitoring
+
+> [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.
+
+ 1. Create/edit `/etc/gitlab/gitlab.rb` and add the following configuration:
+
+ ```ruby
+ # Enable service discovery for Prometheus
+ consul['enable'] = true
+ consul['monitoring_service_discovery'] = true
+
+ # Replace placeholders
+ # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
+ # 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),
+ }
+
+ # 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
Omnibus GitLab configures some things behind the curtains to make the sysadmins'