summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabuerer <abuerer@gitlab.com>2019-07-08 11:11:03 -0500
committerabuerer <abuerer@gitlab.com>2019-07-08 11:11:03 -0500
commit703c9d8ad9d4e774e25b467180fe20222fea522e (patch)
tree3095721445137e406f04b4cdbaf00a19c6bd5654
parent8f9fbbebc5c5b679730a14a8aef165954c1099c0 (diff)
downloadgitlab-ce-703c9d8ad9d4e774e25b467180fe20222fea522e.tar.gz
Moving prometheus docs
Moving prometheus documentation to scaling documentation
-rw-r--r--doc/README.md2
-rw-r--r--doc/administration/high_availability/prometheus/gitlab_metrics.md (renamed from doc/administration/monitoring/prometheus/gitlab_metrics.md)2
-rw-r--r--doc/administration/high_availability/prometheus/gitlab_monitor_exporter.md (renamed from doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md)0
-rw-r--r--doc/administration/high_availability/prometheus/index.md (renamed from doc/administration/monitoring/prometheus/index.md)0
-rw-r--r--doc/administration/high_availability/prometheus/node_exporter.md (renamed from doc/administration/monitoring/prometheus/node_exporter.md)0
-rw-r--r--doc/administration/high_availability/prometheus/pgbouncer_exporter.md (renamed from doc/administration/monitoring/prometheus/pgbouncer_exporter.md)0
-rw-r--r--doc/administration/high_availability/prometheus/postgres_exporter.md (renamed from doc/administration/monitoring/prometheus/postgres_exporter.md)0
-rw-r--r--doc/administration/high_availability/prometheus/redis_exporter.md (renamed from doc/administration/monitoring/prometheus/redis_exporter.md)0
-rw-r--r--doc/administration/index.md2
-rw-r--r--doc/administration/monitoring/index.md2
-rw-r--r--doc/administration/monitoring/performance/index.md2
-rw-r--r--doc/administration/monitoring/performance/prometheus.md2
-rw-r--r--doc/development/architecture.md12
-rw-r--r--doc/install/aws/index.md2
-rw-r--r--doc/install/requirements.md2
-rw-r--r--doc/user/project/integrations/prometheus.md4
16 files changed, 16 insertions, 16 deletions
diff --git a/doc/README.md b/doc/README.md
index 25db0efb960..6b8e738854c 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -330,7 +330,7 @@ The following documentation relates to the DevOps **Monitor** stage:
| Monitor Topics | Description |
|:------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------|
| [GitLab Performance Monitoring](administration/monitoring/performance/index.md) **(CORE ONLY)** | Use InfluxDB and Grafana to monitor the performance of your GitLab instance (will be eventually replaced by Prometheus). |
-| [GitLab Prometheus](administration/monitoring/prometheus/index.md) **(CORE ONLY)** | Configure the bundled Prometheus to collect various metrics from your GitLab instance. |
+| [GitLab Prometheus](administration/high_availability/prometheus/index.md) **(CORE ONLY)** | Configure the bundled Prometheus to collect various metrics from your GitLab instance. |
| [Health check](user/admin_area/monitoring/health_check.md) | GitLab provides liveness and readiness probes to indicate service health and reachability to required services. |
| [Prometheus project integration](user/project/integrations/prometheus.md) | Configure the Prometheus integration per project and monitor your CI/CD environments. |
| [Prometheus metrics](user/project/integrations/prometheus_library/index.md) | Let Prometheus collect metrics from various services, like Kubernetes, NGINX, NGINX ingress controller, HAProxy, and Amazon Cloud Watch. |
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/high_availability/prometheus/gitlab_metrics.md
index 89501f20d99..27d3a3a7a2d 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/high_availability/prometheus/gitlab_metrics.md
@@ -146,5 +146,5 @@ directory will be automatically configured.
[29118]: https://gitlab.com/gitlab-org/gitlab-ce/issues/29118
[Prometheus]: https://prometheus.io
[restart]: ../../restart_gitlab.md#omnibus-gitlab-restart
-[whitelist]: ../ip_whitelist.md
+[whitelist]: ../../monitoring/ip_whitelist.md
[reconfigure]: ../../restart_gitlab.md#omnibus-gitlab-reconfigure
diff --git a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md b/doc/administration/high_availability/prometheus/gitlab_monitor_exporter.md
index f68b03d1ade..f68b03d1ade 100644
--- a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
+++ b/doc/administration/high_availability/prometheus/gitlab_monitor_exporter.md
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/high_availability/prometheus/index.md
index ce65d77274b..ce65d77274b 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/high_availability/prometheus/index.md
diff --git a/doc/administration/monitoring/prometheus/node_exporter.md b/doc/administration/high_availability/prometheus/node_exporter.md
index aef7758a88f..aef7758a88f 100644
--- a/doc/administration/monitoring/prometheus/node_exporter.md
+++ b/doc/administration/high_availability/prometheus/node_exporter.md
diff --git a/doc/administration/monitoring/prometheus/pgbouncer_exporter.md b/doc/administration/high_availability/prometheus/pgbouncer_exporter.md
index d76834fdbea..d76834fdbea 100644
--- a/doc/administration/monitoring/prometheus/pgbouncer_exporter.md
+++ b/doc/administration/high_availability/prometheus/pgbouncer_exporter.md
diff --git a/doc/administration/monitoring/prometheus/postgres_exporter.md b/doc/administration/high_availability/prometheus/postgres_exporter.md
index 8e2d3162f88..8e2d3162f88 100644
--- a/doc/administration/monitoring/prometheus/postgres_exporter.md
+++ b/doc/administration/high_availability/prometheus/postgres_exporter.md
diff --git a/doc/administration/monitoring/prometheus/redis_exporter.md b/doc/administration/high_availability/prometheus/redis_exporter.md
index d54d409dbb6..d54d409dbb6 100644
--- a/doc/administration/monitoring/prometheus/redis_exporter.md
+++ b/doc/administration/high_availability/prometheus/redis_exporter.md
diff --git a/doc/administration/index.md b/doc/administration/index.md
index c5909e700c5..a151c61ebbd 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -171,7 +171,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
- [Enable Performance Monitoring](monitoring/performance/gitlab_configuration.md): Enable GitLab Performance Monitoring.
- [GitLab performance monitoring with InfluxDB](monitoring/performance/influxdb_configuration.md): Configure GitLab and InfluxDB for measuring performance metrics.
- [InfluxDB Schema](monitoring/performance/influxdb_schema.md): Measurements stored in InfluxDB.
- - [GitLab performance monitoring with Prometheus](monitoring/prometheus/index.md): Configure GitLab and Prometheus for measuring performance metrics.
+ - [GitLab performance monitoring with Prometheus](high_availability/prometheus/index.md): Configure GitLab and Prometheus for measuring performance metrics.
- [GitLab performance monitoring with Grafana](monitoring/performance/grafana_configuration.md): Configure GitLab to visualize time series metrics through graphs and dashboards.
- [Request Profiling](monitoring/performance/request_profiling.md): Get a detailed profile on slow requests.
- [Performance Bar](monitoring/performance/performance_bar.md): Get performance information for the current page.
diff --git a/doc/administration/monitoring/index.md b/doc/administration/monitoring/index.md
index fa0459b24ff..db8a430c05c 100644
--- a/doc/administration/monitoring/index.md
+++ b/doc/administration/monitoring/index.md
@@ -3,7 +3,7 @@
Explore our features to monitor your GitLab instance:
- [Performance monitoring](performance/index.md): GitLab Performance Monitoring makes it possible to measure a wide variety of statistics of your instance.
-- [Prometheus](prometheus/index.md): Prometheus is a powerful time-series monitoring service, providing a flexible platform for monitoring GitLab and other software products.
+- [Prometheus](../high_availability/prometheus/index.md): Prometheus is a powerful time-series monitoring service, providing a flexible platform for monitoring GitLab and other software products.
- [GitHub imports](github_imports.md): Monitor the health and progress of GitLab's GitHub importer with various Prometheus metrics.
- [Monitoring uptime](../../user/admin_area/monitoring/health_check.md): Check the server status using the health check endpoint.
- [IP whitelists](ip_whitelist.md): Configure GitLab for monitoring endpoints that provide health check information when probed.
diff --git a/doc/administration/monitoring/performance/index.md b/doc/administration/monitoring/performance/index.md
index ef71ca1d6c3..4171ade4e70 100644
--- a/doc/administration/monitoring/performance/index.md
+++ b/doc/administration/monitoring/performance/index.md
@@ -17,7 +17,7 @@ documents in order to understand and properly configure GitLab Performance Monit
NOTE: **Note:**
Omnibus GitLab 8.16 includes Prometheus as an additional tool to collect
metrics. It will eventually replace InfluxDB when their metrics collection is
-on par. Read more in the [Prometheus documentation](../prometheus/index.md).
+on par. Read more in the [Prometheus documentation](../../high_availability/prometheus/index.md).
## Introduction to GitLab Performance Monitoring
diff --git a/doc/administration/monitoring/performance/prometheus.md b/doc/administration/monitoring/performance/prometheus.md
index 2c5bab46dd9..cd6391fb8e3 100644
--- a/doc/administration/monitoring/performance/prometheus.md
+++ b/doc/administration/monitoring/performance/prometheus.md
@@ -2,4 +2,4 @@
redirect_to: '../prometheus/index.md'
---
-This document was moved to [monitoring/prometheus](../prometheus/index.md).
+This document was moved to [monitoring/prometheus](../../high_availability/prometheus/index.md).
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index 8319603fea2..91b3f62b483 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -664,7 +664,7 @@ We've also detailed [our architecture of GitLab.com](https://about.gitlab.com/ha
[pgbouncer-charts]: https://docs.gitlab.com/charts/installation/deployment.html#postgresql
[consul-omnibus]: ../administration/high_availability/consul.md
[consul-charts]: https://docs.gitlab.com/charts/installation/deployment.html#postgresql
-[prometheus-omnibus]: ../administration/monitoring/prometheus/index.md
+[prometheus-omnibus]: ../administration/high_availability/prometheus/index.md
[prometheus-charts]: https://github.com/helm/charts/tree/master/stable/prometheus
[grafana-omnibus]: ../administration/monitoring/performance/grafana_configuration.md
[grafana-charts]: https://github.com/helm/charts/tree/master/stable/grafana
@@ -674,15 +674,15 @@ We've also detailed [our architecture of GitLab.com](https://about.gitlab.com/ha
[jaeger-charts]: https://gitlab.com/charts/gitlab/issues/1320
[jaeger-source]: ../development/distributed_tracing.md#enabling-distributed-tracing
[jaeger-gdk]: ../development/distributed_tracing.html#using-jaeger-in-the-gitlab-development-kit
-[redis-exporter-omnibus]: ../administration/monitoring/prometheus/redis_exporter.md
+[redis-exporter-omnibus]: ../administration/high_availability/prometheus/redis_exporter.md
[redis-exporter-charts]: https://docs.gitlab.com/charts/charts/redis/
-[postgres-exporter-omnibus]: ../administration/monitoring/prometheus/postgres_exporter.md
+[postgres-exporter-omnibus]: ../administration/high_availability/prometheus/postgres_exporter.md
[postgres-exporter-charts]: https://github.com/helm/charts/tree/master/stable/postgresql
-[pgbouncer-exporter-omnibus]: ../administration/monitoring/prometheus/pgbouncer_exporter.md
+[pgbouncer-exporter-omnibus]: ../administration/high_availability/prometheus/pgbouncer_exporter.md
[pgbouncer-exporter-charts]: https://docs.gitlab.com/charts/installation/deployment.html#postgresql
-[gitlab-monitor-omnibus]: ../administration/monitoring/prometheus/gitlab_monitor_exporter.md
+[gitlab-monitor-omnibus]: ../administration/high_availability/prometheus/gitlab_monitor_exporter.md
[gitlab-monitor-charts]: https://docs.gitlab.com/charts/charts/gitlab/gitlab-monitor/index.html
-[node-exporter-omnibus]: ../administration/monitoring/prometheus/node_exporter.md
+[node-exporter-omnibus]: ../administration/high_availability/prometheus/node_exporter.md
[node-exporter-charts]: https://gitlab.com/charts/gitlab/issues/1332
[mattermost-omnibus]: https://docs.gitlab.com/omnibus/gitlab-mattermost/
[mattermost-charts]: https://docs.mattermost.com/install/install-mmte-helm-gitlab-helm.html
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 73eaf758923..aceaa83be43 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -575,7 +575,7 @@ After you set it up, login with username `root` and the newly created password.
Apart from Amazon's Cloudwatch which you can enable on various services,
GitLab provides its own integrated monitoring solution based on Prometheus.
For more information on how to set it up, visit the
-[GitLab Prometheus documentation](../../administration/monitoring/prometheus/index.md)
+[GitLab Prometheus documentation](../../administration/high_availability/prometheus/index.md)
GitLab also has various [health check endpoints](../..//user/admin_area/monitoring/health_check.md)
that you can ping and get reports.
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 68c1bcbc801..a45693b6a6f 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -172,7 +172,7 @@ GitLab. Approximately 200MB of memory will be consumed by these processes, with
default settings.
If you would like to disable Prometheus and it's exporters or read more information
-about it, check the [Prometheus documentation](../administration/monitoring/prometheus/index.md).
+about it, check the [Prometheus documentation](../administration/high_availability/prometheus/index.md).
## GitLab Runner
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 6e02761e041..ed2371a3668 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -207,11 +207,11 @@ If the "No data found" screen continues to appear, it could be due to:
[kube]: ./kubernetes.md
[prometheus-k8s-sd]: https://prometheus.io/docs/operating/configuration/#<kubernetes_sd_config>
[prometheus]: https://prometheus.io
-[gitlab-prometheus-k8s-monitor]: ../../../administration/monitoring/prometheus/index.md#configuring-prometheus-to-monitor-kubernetes
+[gitlab-prometheus-k8s-monitor]: ../../../administration/high_availability/prometheus/index.md#configuring-prometheus-to-monitor-kubernetes
[prometheus-docker-image]: https://hub.docker.com/r/prom/prometheus/
[prometheus-yml]:samples/prometheus.yml
[gitlab.com-ip-range]: https://gitlab.com/gitlab-com/infrastructure/issues/434
[ci-environment-slug]: ../../../ci/variables/#predefined-environment-variables
[ce-8935]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935
[ce-10408]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10408
-[promgldocs]: ../../../administration/monitoring/prometheus/index.md
+[promgldocs]: ../../../administration/high_availability/prometheus/index.md