summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-14 18:05:18 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-14 18:05:18 +0000
commitbe08202b4b5a17686b300e0fbd2bffccc702a3d1 (patch)
tree886d3cb1c47f9d355c94ae9fcba8670f9639f99d /config
parent0f393724e7de8d764577b6622ccf43964539cb2b (diff)
parent2d0741e562dfcaca777b2d97f0cf11b8ac973f0a (diff)
downloadgitlab-ce-be08202b4b5a17686b300e0fbd2bffccc702a3d1.tar.gz
Merge branch 'bjk/metric_names' into 'master'
Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
Diffstat (limited to 'config')
-rw-r--r--config/initializers/8_metrics.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index c80d28746d6..25630b298ce 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -123,7 +123,7 @@ Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_
Gitlab::Application.configure do |config|
# 0 should be Sentry to catch errors in this middleware
- config.middleware.insert(1, Gitlab::Metrics::ConnectionRackMiddleware)
+ config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware)
end
if Gitlab::Metrics.enabled?