diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-05 00:51:01 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-05 00:51:01 +0200 |
| commit | 1eca48819a7cc78a5e96d617332bbee0365e6dca (patch) | |
| tree | f792cf6298382a7888e4bf27dcabadaf79cfece2 /config/gitlab.yml.example | |
| parent | 6d60e265b1bb0212803d301d723c12affe366397 (diff) | |
| download | gitlab-ce-1eca48819a7cc78a5e96d617332bbee0365e6dca.tar.gz | |
Merge prometheus unicorn sampler settigns within monitoring settings
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c31b7e12fdc..e588b813c50 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -543,14 +543,12 @@ production: &base # enabled: true # host: localhost # port: 3808 - prometheus: - # Time between sampling of unicorn socket metrics, in seconds - # unicorn_sampler_interval: 10 - ## Monitoring # Built in monitoring settings monitoring: + # Time between sampling of unicorn socket metrics, in seconds + # unicorn_sampler_interval: 10 # IP whitelist to access monitoring endpoints ip_whitelist: - 127.0.0.0/8 |