Commit 309d0906 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'docs/update-external-prometheus' into 'master'

Add an explicit mention of puma external Prometheus setup page

See merge request gitlab-org/gitlab!75135
parents 90693f6d b2ee0910
...@@ -259,9 +259,10 @@ To use an external Prometheus server: ...@@ -259,9 +259,10 @@ To use an external Prometheus server:
- 1.1.1.1:9229 - 1.1.1.1:9229
- job_name: gitlab-rails - job_name: gitlab-rails
metrics_path: "/-/metrics" metrics_path: "/-/metrics"
scheme: https
static_configs: static_configs:
- targets: - targets:
- 1.1.1.1:8080 - 1.1.1.1
- job_name: gitlab-sidekiq - job_name: gitlab-sidekiq
static_configs: static_configs:
- targets: - targets:
...@@ -287,6 +288,11 @@ To use an external Prometheus server: ...@@ -287,6 +288,11 @@ To use an external Prometheus server:
- 1.1.1.1:9236 - 1.1.1.1:9236
``` ```
WARNING:
The `gitlab-rails` job in the snippet assumes that GitLab is reachable through HTTPS. If your
deployment doesn't use HTTPS, the job configuration is adapted to use the `http` scheme and port
80.
1. Reload the Prometheus server. 1. Reload the Prometheus server.
## Viewing performance metrics ## Viewing performance metrics
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment