summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-01-22 14:14:46 +0100
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-01-22 14:14:46 +0100
commit73375c18cd97a49dae9c4e8f043f08d17c830430 (patch)
tree9590900b173fd4fa2901a54b910a095bf75c3a6e /doc/administration
parent243b18c7ed2bf15d85462c7ad5afcd582d917823 (diff)
downloadgitlab-ce-73375c18cd97a49dae9c4e8f043f08d17c830430.tar.gz
Expose Prometheus docs to the main README
[ci skip]
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/monitoring/performance/introduction.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/administration/monitoring/performance/introduction.md b/doc/administration/monitoring/performance/introduction.md
index 79904916b7e..8b106e89cc2 100644
--- a/doc/administration/monitoring/performance/introduction.md
+++ b/doc/administration/monitoring/performance/introduction.md
@@ -12,6 +12,11 @@ documents in order to understand and properly configure GitLab Performance Monit
- [InfluxDB Schema](influxdb_schema.md)
- [Grafana Install/Configuration](grafana_configuration.md)
+>**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.md).
+
## Introduction to GitLab Performance Monitoring
GitLab Performance Monitoring makes it possible to measure a wide variety of statistics