diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 21:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 21:09:23 +0000 |
| commit | ab593c8ded443f7ade3540ff8dac69ee51bc74fd (patch) | |
| tree | 1fb8b2e194747f135d8610cd4b77766ac458b3a7 /config/gitlab.yml.example | |
| parent | 860efb35e24e07a1a22bcafcddb5f0409d40354c (diff) | |
| download | gitlab-ce-ab593c8ded443f7ade3540ff8dac69ee51bc74fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 841e7670e45..91b197afd32 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1266,24 +1266,29 @@ production: &base ip_whitelist: - 127.0.0.0/8 - # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics + # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: # enabled: true # log_enabled: false # address: localhost # port: 8082 + # tls_enabled: false + # tls_cert_path: /path/to/cert.pem + # tls_key_path: /path/to/key.pem sidekiq_health_checks: # enabled: true # address: localhost # port: 8092 - # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics - # It runs alongside the `/metrics` endpoints to ease the publish of metrics + # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: # enabled: true # address: localhost # port: 8083 + # tls_enabled: false + # tls_cert_path: /path/to/cert.pem + # tls_key_path: /path/to/key.pem ## Prometheus settings # Do not modify these settings here. They should be modified in /etc/gitlab/gitlab.rb |