diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 09:06:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 09:06:05 +0300 |
| commit | 535d167d40638105527bc6c9a86f33d2ffd62743 (patch) | |
| tree | 27c73f33497378f6bb84840223ce7d3fda42cc0a /config/gitlab.yml.example | |
| parent | bee11af56deccfd13243cf5f31d42bd992404066 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 814ea551e19..3b7abdfe17e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1017,7 +1017,14 @@ production: &base sidekiq_exporter: # enabled: true # address: localhost - # port: 3807 + # port: 8082 + + # Web exporter is webserver built in to Unicorn/Puma to expose Prometheus metrics + # It runs alongside the `/metrics` endpoints to ease the publish of metrics + web_exporter: + # enabled: true + # address: localhost + # port: 8083 ## Prometheus settings # Do not modify these settings here. They should be modified in /etc/gitlab/gitlab.rb @@ -1061,6 +1068,21 @@ production: &base development: <<: *base + # We want to run web/sidekiq exporters for devs + # to catch errors from using them. + # + # We use random port to not block ability to run + # multiple instances of the service + monitoring: + sidekiq_exporter: + enabled: true + address: 127.0.0.1 + port: 0 + web_exporter: + enabled: true + address: 127.0.0.1 + port: 0 + test: <<: *base gravatar: |