diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2019-07-01 12:06:45 +0200 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-07-08 12:18:29 +0200 |
| commit | c85d8dba62cd931b8431a0a57d9597247147bfe3 (patch) | |
| tree | a3ffffdc6425a702d43b420f27ae9011600539f2 | |
| parent | 4f6ec719a2c49472591b28455f909e3d6800923c (diff) | |
| download | gitlab-ce-pl-prometheus-env-warning.tar.gz | |
Avoid warnings from Prometheus client in dev/testpl-prometheus-env-warning
Set ennvar `prometheus_multiproc_dir` before initializing Prometheus
client's configuration.o
After https://gitlab.com/gitlab-org/prometheus-client-mmap/commit/7a8bb0f
Prometheus client will warn if the envvar `prometheus_multiproc_dir` is
not set.
| -rw-r--r-- | changelogs/unreleased/pl-prometheus-env-warning.yml | 5 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changelogs/unreleased/pl-prometheus-env-warning.yml b/changelogs/unreleased/pl-prometheus-env-warning.yml new file mode 100644 index 00000000000..5c4601ef468 --- /dev/null +++ b/changelogs/unreleased/pl-prometheus-env-warning.yml @@ -0,0 +1,5 @@ +--- +title: Avoid warnings from Prometheus client +merge_request: 30225 +author: +type: fixed diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 741c8ef1ca0..99d303c4ca4 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -16,13 +16,15 @@ def prometheus_default_multiproc_dir end end +# Avoid warning about missing prometheus_multiproc_dir +# See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/29 +ENV['prometheus_multiproc_dir'] ||= prometheus_default_multiproc_dir.to_s + Prometheus::Client.configure do |config| config.logger = Rails.logger config.initial_mmap_file_size = 4 * 1024 - config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] || prometheus_default_multiproc_dir - config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider) end |