Commit 0fc754ae authored by Grant Young's avatar Grant Young Committed by Achilleas Pipinellis

Update Monitoring node config in Ref Arch docs

parent 2eb9b6eb
......@@ -122,44 +122,28 @@ The steps below are the minimum necessary to configure a Monitoring node running
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
roles ['monitoring_role']
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
# Grafana
grafana['enable'] = true
grafana['admin_password'] = 'toomanysecrets'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
consul['monitoring_service_discovery'] = true
# The addresses can be IPs or FQDNs
consul['configuration'] = {
retry_join: %w(10.0.0.1 10.0.0.2 10.0.0.3),
retry_join: %w(10.0.0.1 10.0.0.2 10.0.0.3), # The addresses can be IPs or FQDNs
}
# Disable all other services
gitlab_rails['auto_migrate'] = false
alertmanager['enable'] = false
gitaly['enable'] = false
gitlab_exporter['enable'] = false
gitlab_workhorse['enable'] = false
# Nginx - For Grafana access
nginx['enable'] = true
postgres_exporter['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
redis_exporter['enable'] = false
sidekiq['enable'] = false
puma['enable'] = false
node_exporter['enable'] = false
gitlab_exporter['enable'] = false
```
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
......
......@@ -2234,29 +2234,17 @@ To configure the Monitoring node:
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
external_url 'http://gitlab.example.com'
roles ['monitoring_role']
# Avoid running unnecessary services on the Prometheus server
gitaly['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
alertmanager['enable'] = false
gitlab_exporter['enable'] = false
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
grafana['enable'] = true
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
......@@ -2265,8 +2253,8 @@ To configure the Monitoring node:
retry_join: %w(10.6.0.11 10.6.0.12 10.6.0.13)
}
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
......
......@@ -2249,29 +2249,17 @@ To configure the Monitoring node:
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
external_url 'http://gitlab.example.com'
roles ['monitoring_role']
# Avoid running unnecessary services on the Prometheus server
gitaly['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
alertmanager['enable'] = false
gitlab_exporter['enable'] = false
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
grafana['enable'] = true
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
......@@ -2280,8 +2268,8 @@ To configure the Monitoring node:
retry_join: %w(10.6.0.11 10.6.0.12 10.6.0.13)
}
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
......
......@@ -790,32 +790,21 @@ running [Prometheus](../monitoring/prometheus/index.md) and
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
roles ['monitoring_role']
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
# Grafana
grafana['enable'] = true
grafana['admin_password'] = 'toomanysecrets'
# Avoid running unnecessary services on the Prometheus server
gitaly['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
alertmanager['enable'] = false
gitlab_exporter['enable'] = false
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Prometheus also needs some scrape configurations to pull all the data from the various
......
......@@ -1943,29 +1943,17 @@ running [Prometheus](../monitoring/prometheus/index.md) and
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
external_url 'http://gitlab.example.com'
roles ['monitoring_role']
# Avoid running unnecessary services on the Prometheus server
gitaly['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
alertmanager['enable'] = false
gitlab_exporter['enable'] = false
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
grafana['enable'] = true
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
......@@ -1974,8 +1962,8 @@ running [Prometheus](../monitoring/prometheus/index.md) and
retry_join: %w(10.6.0.11 10.6.0.12 10.6.0.13)
}
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
......
......@@ -2263,29 +2263,17 @@ To configure the Monitoring node:
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
external_url 'http://gitlab.example.com'
roles ['monitoring_role']
# Avoid running unnecessary services on the Prometheus server
gitaly['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
alertmanager['enable'] = false
gitlab_exporter['enable'] = false
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
grafana['enable'] = true
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
......@@ -2294,8 +2282,8 @@ To configure the Monitoring node:
retry_join: %w(10.6.0.11 10.6.0.12 10.6.0.13)
}
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
......
......@@ -1936,34 +1936,17 @@ running [Prometheus](../monitoring/prometheus/index.md) and
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
external_url 'http://gitlab.example.com'
roles ['monitoring_role']
# Avoid running unnecessary services on the Prometheus server
alertmanager['enable'] = false
gitaly['enable'] = false
gitlab_exporter['enable'] = false
gitlab_workhorse['enable'] = false
nginx['enable'] = true
postgres_exporter['enable'] = false
postgresql['enable'] = false
redis['enable'] = false
redis_exporter['enable'] = false
sidekiq['enable'] = false
puma['enable'] = false
node_exporter['enable'] = false
gitlab_exporter['enable'] = false
external_url 'http://gitlab.example.com'
# Enable Prometheus
prometheus['enable'] = true
# Prometheus
prometheus['listen_address'] = '0.0.0.0:9090'
prometheus['monitor_kubernetes'] = false
# Enable Login form
grafana['disable_login_form'] = false
# Enable Grafana
grafana['enable'] = true
# Grafana
grafana['admin_password'] = '<grafana_password>'
grafana['disable_login_form'] = false
# Enable service discovery for Prometheus
consul['enable'] = true
......@@ -1972,8 +1955,8 @@ running [Prometheus](../monitoring/prometheus/index.md) and
retry_join: %w(10.6.0.11 10.6.0.12 10.6.0.13)
}
# Prevent database migrations from running on upgrade automatically
gitlab_rails['auto_migrate'] = false
# Nginx - For Grafana access
nginx['enable'] = true
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment