summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Amirault <mamirault@gitlab.com>2019-08-12 13:04:12 +0900
committerMarcel Amirault <mamirault@gitlab.com>2019-08-12 13:04:12 +0900
commite2561d0ec100d12ef99197bfef02299fc5104a9a (patch)
tree43b2e68997d70bb8023554dac0b5f7099d3281b9
parent9d2fb69bb14f2d716c631aac39c235e78f6d6e64 (diff)
downloadgitlab-ce-docs-mdl-rules-update-2.tar.gz
Update admin and ci docs with suggestionsdocs-mdl-rules-update-2
-rw-r--r--doc/administration/geo/replication/index.md16
-rw-r--r--doc/administration/high_availability/pgbouncer.md2
-rw-r--r--doc/ci/environments.md14
3 files changed, 16 insertions, 16 deletions
diff --git a/doc/administration/geo/replication/index.md b/doc/administration/geo/replication/index.md
index 8b754026821..5aedb665935 100644
--- a/doc/administration/geo/replication/index.md
+++ b/doc/administration/geo/replication/index.md
@@ -14,13 +14,8 @@ Fetching large repositories can take a long time for teams located far from a si
Geo provides local, read-only instances of your GitLab instances, reducing the time it takes to clone and fetch large repositories and speeding up development.
-**Notes:**
-
-- We recommend you use:
- - At least GitLab Enterprise Edition 10.0 for basic Geo features.
- - The latest version for a better experience.
-- Make sure that all nodes run the same GitLab version.
-- Geo requires PostgreSQL 9.6 and Git 2.9, in addition to GitLab's usual [minimum requirements](../../../install/requirements.md).
+NOTE: **Note:**
+Check the [requirements](#requirements-for-running-geo) carefully before setting up Geo.
For a video introduction to Geo, see [Introduction to GitLab Geo - GitLab Features](https://www.youtube.com/watch?v=-HDLxSjEh6w).
@@ -116,6 +111,13 @@ The following are required to run Geo:
- [Ubuntu](https://www.ubuntu.com) 16.04+
- PostgreSQL 9.6+ with [FDW](https://www.postgresql.org/docs/9.6/postgres-fdw.html) support and [Streaming Replication](https://wiki.postgresql.org/wiki/Streaming_Replication)
- Git 2.9+
+- All nodes must run the same GitLab version.
+
+Additionally, check GitLab's [minimum requirements](../../../install/requirements.md),
+and we recommend you use:
+
+- At least GitLab Enterprise Edition 10.0 for basic Geo features.
+- The latest version for a better experience.
### Firewall rules
diff --git a/doc/administration/high_availability/pgbouncer.md b/doc/administration/high_availability/pgbouncer.md
index 103daed115e..b99724d12a2 100644
--- a/doc/administration/high_availability/pgbouncer.md
+++ b/doc/administration/high_availability/pgbouncer.md
@@ -54,7 +54,7 @@ It is recommended to run pgbouncer alongside the `gitlab-rails` service, or on i
```
NOTE: **Note:**
- `pgbouncer_role` was introduced with GitLab 10.3
+ `pgbouncer_role` was introduced with GitLab 10.3.
1. Run `gitlab-ctl reconfigure`
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 5dd4036885c..9e1a62bae71 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -591,15 +591,13 @@ exist, you should see something like:
### Monitoring environments
-**Notes:**
-
-- For the monitoring dashboard to appear, you need to:
- - Enable the [Prometheus integration](../user/project/integrations/prometheus.md).
- - Configure Prometheus to collect at least one [supported metric](../user/project/integrations/prometheus_library/index.md).
-- With GitLab 9.2, all deployments to an environment are shown directly on the monitoring dashboard.
-
If you have enabled [Prometheus for monitoring system and response metrics](../user/project/integrations/prometheus.md),
-you can monitor the behavior of your app running in each environment.
+you can monitor the behavior of your app running in each environment. For the monitoring
+dashboard to appear, you need to Configure Prometheus to collect at least one
+[supported metric](../user/project/integrations/prometheus_library/index.md).
+
+NOTE: **Note:**
+Since GitLab 9.2, all deployments to an environment are shown directly on the monitoring dashboard.
Once configured, GitLab will attempt to retrieve [supported performance metrics](../user/project/integrations/prometheus_library/index.md)
for any environment that has had a successful deployment. If monitoring data was