summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-11-23 00:37:55 +0100
committerPawel Chojnacki <pawel@chojnacki.ws>2017-11-23 23:33:00 +0100
commit9884c0f4a0ea634fe08235ef0a0c7f997f19a782 (patch)
tree9c4a25555e52d6c4497176b683ba8e38c725c19c /lib
parentcdcbeaccbec09fefe81b7b90badacf5308751ce9 (diff)
downloadgitlab-ce-9884c0f4a0ea634fe08235ef0a0c7f997f19a782.tar.gz
Reenable prometheus metrics
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/metrics/prometheus.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index 4f165d12a94..09103b4ca2d 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -17,9 +17,9 @@ module Gitlab
end
def prometheus_metrics_enabled?
- # force disable prometheus_metrics until
- # https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready
- false
+ return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
+
+ @prometheus_metrics_enabled = prometheus_metrics_enabled_unmemoized
end
def registry