summaryrefslogtreecommitdiff
path: root/doc/administration/monitoring/prometheus
diff options
context:
space:
mode:
Diffstat (limited to 'doc/administration/monitoring/prometheus')
-rw-r--r--doc/administration/monitoring/prometheus/gitlab_exporter.md (renamed from doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md)12
-rw-r--r--doc/administration/monitoring/prometheus/index.md16
2 files changed, 14 insertions, 14 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md b/doc/administration/monitoring/prometheus/gitlab_exporter.md
index 9aa4dfa5ab7..cfd9f55acc3 100644
--- a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
+++ b/doc/administration/monitoring/prometheus/gitlab_exporter.md
@@ -1,30 +1,30 @@
-# GitLab monitor exporter
+# GitLab exporter
>**Note:**
Available since [Omnibus GitLab 8.17][1132]. For installations from source
you'll have to install and configure it yourself.
-The [GitLab monitor exporter] allows you to measure various GitLab metrics, pulled from Redis and the database.
+The [GitLab exporter] allows you to measure various GitLab metrics, pulled from Redis and the database.
-To enable the GitLab monitor exporter:
+To enable the GitLab exporter:
1. [Enable Prometheus](index.md#configuring-prometheus)
1. Edit `/etc/gitlab/gitlab.rb`
1. Add or find and uncomment the following line, making sure it's set to `true`:
```ruby
- gitlab_monitor['enable'] = true
+ gitlab_exporter['enable'] = true
```
1. Save the file and [reconfigure GitLab][reconfigure] for the changes to
take effect
Prometheus will now automatically begin collecting performance data from
-the GitLab monitor exporter exposed under `localhost:9168`.
+the GitLab exporter exposed under `localhost:9168`.
[← Back to the main Prometheus page](index.md)
[1132]: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1132
-[GitLab monitor exporter]: https://gitlab.com/gitlab-org/gitlab-monitor
+[GitLab exporter]: https://gitlab.com/gitlab-org/gitlab-exporter
[prometheus]: https://prometheus.io
[reconfigure]: ../../restart_gitlab.md#omnibus-gitlab-reconfigure
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index c8968c51393..9228ebf4fed 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -97,9 +97,9 @@ To use an external Prometheus server:
1. Set each bundled service's [exporter](#bundled-software-metrics) to listen on a network address, for example:
```ruby
- gitlab_monitor['listen_address'] = '0.0.0.0'
+ gitlab_exporter['listen_address'] = '0.0.0.0'
sidekiq['listen_address'] = '0.0.0.0'
- gitlab_monitor['listen_port'] = '9168'
+ gitlab_exporter['listen_port'] = '9168'
node_exporter['listen_address'] = '0.0.0.0:9100'
redis_exporter['listen_address'] = '0.0.0.0:9121'
postgres_exporter['listen_address'] = '0.0.0.0:9187'
@@ -163,17 +163,17 @@ To use an external Prometheus server:
static_configs:
- targets:
- 1.1.1.1:8082
- - job_name: gitlab_monitor_database
+ - job_name: gitlab_exporter_database
metrics_path: "/database"
static_configs:
- targets:
- 1.1.1.1:9168
- - job_name: gitlab_monitor_sidekiq
+ - job_name: gitlab_exporter_sidekiq
metrics_path: "/sidekiq"
static_configs:
- targets:
- 1.1.1.1:9168
- - job_name: gitlab_monitor_process
+ - job_name: gitlab_exporter_process
metrics_path: "/process"
static_configs:
- targets:
@@ -263,11 +263,11 @@ The PgBouncer exporter allows you to measure various PgBouncer metrics.
[➔ Read more about the PgBouncer exporter.](pgbouncer_exporter.md)
-### GitLab monitor exporter
+### GitLab exporter
-The GitLab monitor exporter allows you to measure various GitLab metrics, pulled from Redis and the database.
+The GitLab exporter allows you to measure various GitLab metrics, pulled from Redis and the database.
-[➔ Read more about the GitLab monitor exporter.](gitlab_monitor_exporter.md)
+[➔ Read more about the GitLab exporter.](gitlab_exporter.md)
## Configuring Prometheus to monitor Kubernetes