diff options
author | Stan Hu <stanhu@gmail.com> | 2017-08-18 19:55:31 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-08-18 19:55:31 +0000 |
commit | cd9b6175564f4e50db0ac54350e93ed32dc08b04 (patch) | |
tree | 598d7c28864ba14400b5123ba5b20a7502a637f8 | |
parent | 11661c2a1dfe042f37e3ba1eac69315daa0edb9b (diff) | |
parent | e4cf164a9fbbfbc7f37554b4738d79ea4b5d0f4b (diff) | |
download | gitlab-ce-cd9b6175564f4e50db0ac54350e93ed32dc08b04.tar.gz |
Merge branch 'pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metrics' into 'master'
Update prometheus mmap client library to fix performance issues when rendering many metrics.
See merge request !13674
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -287,7 +287,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta11' + gem 'prometheus-client-mmap', '~>0.7.0.beta12' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index c0a8294b20a..5118f9764d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -619,7 +619,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta11) + prometheus-client-mmap (0.7.0.beta12) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1094,7 +1094,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta11) + prometheus-client-mmap (~> 0.7.0.beta12) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |