kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'pawel/disable_prometheus_metrics' into 'master' 

Temporarily force disable prometheus metrics

See merge request gitlab-org/gitlab-ce!15549
This commit is contained in:
Stan Hu 2017-11-22 18:59:35 +00:00
parent 48b65bb0ef bf77f1cd10
commit 3193f13b44
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/pawel-disable_prometheus_metrics.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Force disable Prometheus metrics
merge_request:
author:
type: fixed

6
lib/gitlab/metrics/prometheus.rb
View File

@ -17,9 +17,9 @@ module Gitlab
end
def prometheus_metrics_enabled?
return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
@prometheus_metrics_enabled = prometheus_metrics_enabled_unmemoized
# force disable prometheus_metrics until
# https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready
false
end
def registry