summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabuerer <abuerer@gitlab.com>2019-06-20 14:35:38 -0500
committerabuerer <abuerer@gitlab.com>2019-06-20 14:35:38 -0500
commit781d05af8baffe5d9f3ffad3e5365f4d73d32f47 (patch)
tree022765311e638905f2374d7155fe94d6db10d3cb
parent95525a566aeb1a83adca9ec3f3d7e37a50b05ae6 (diff)
downloadgitlab-ce-781d05af8baffe5d9f3ffad3e5365f4d73d32f47.tar.gz
Moved monitoring to its own step
-rw-r--r--doc/administration/high_availability/database.md10
-rw-r--r--doc/administration/high_availability/gitlab.md2
2 files changed, 3 insertions, 9 deletions
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md
index b3707b7cde1..3bac202dbfa 100644
--- a/doc/administration/high_availability/database.md
+++ b/doc/administration/high_availability/database.md
@@ -82,13 +82,10 @@ deploy the bundled PostgreSQL.
1. Note the PostgreSQL node's IP address or hostname, port, and
plain text 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.
-
-#### Monitoring
-
-To enable monitoring for your PostgreSQL server, see [Enable Monitoring](#enable-monitoring).
Continue configuration of other components by going
[back to Scaled Architectures](README.md#scalable-architecture-examples)
@@ -403,6 +400,7 @@ check the [Troubleshooting section](#troubleshooting) before proceeding.
```
1. [Reconfigure GitLab] for the changes to take effect.
+1. [Enable monitoring](#enable-monitoring)
> Please note:
>
@@ -1088,11 +1086,7 @@ the previous section:
1. Ensure `gitlab_rails['db_password']` is set to the plaintext password for
the `gitlab` database user
1. [Reconfigure GitLab] for the changes to take effect
-
-#### Monitoring
-To enable monitoring for your PostgreSQL servers, see [Enable Monitoring](#enable-monitoring).
-
## Enable Monitoring
> [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3786) in GitLab 12.0.
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md
index 97f7ed912ee..f83a22c666a 100644
--- a/doc/administration/high_availability/gitlab.md
+++ b/doc/administration/high_availability/gitlab.md
@@ -76,7 +76,7 @@
registry['gid'] = 9002
```
- 1. [Enable monitoring](#enable-monitoring)
+1. [Enable monitoring](#enable-monitoring)
> **Note:** To maintain uniformity of links across HA clusters, the `external_url`
on the first application server as well as the additional application