diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-19 17:03:10 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | 0f4050430d400daffbc5a68b15d79b896bb8a692 (patch) | |
| tree | 7140c4edba672350570f53f26effe85ba4ba6289 /config | |
| parent | cf932df2348dc3ccd06ca557b68edc60f518c893 (diff) | |
| download | gitlab-ce-0f4050430d400daffbc5a68b15d79b896bb8a692.tar.gz | |
Split metrics from health controller into metrics controller
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d2aeb66ebf6..a6e4337912b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -102,6 +102,11 @@ production: &base # The default is 'shared/cache/archive/' relative to the root of the Rails app. # repository_downloads_path: shared/cache/archive/ + ## Prometheus Client Data directory + # To be used efficiently in multiprocess Ruby setup like Unicorn, Prometheus client needs to share metrics with other instances. + # The default is 'tmp/prometheus_data_dir' relative to Rails.root + # prometheus_multiproc_dir: tmp/prometheus_data_dir + ## Reply by email # Allow users to comment on issues and merge requests by replying to notification emails. # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 45ea2040d23..5db8746ef4c 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -242,6 +242,7 @@ Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab google_code fog Settings.gitlab['trusted_proxies'] ||= [] Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml')) Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil? +Settings.gitlab['prometheus_multiproc_dir'] ||= ENV['prometheus_multiproc_dir'] || 'tmp/prometheus_data_dir' # # CI |