diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-22 18:59:35 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-11-22 19:10:36 +0000 |
| commit | 082447ffa72582de0c44aaf9479851fe4a05a6db (patch) | |
| tree | b1cf6f3ff2547f8dabb34c72e3dc63426178397d | |
| parent | 87b43b731d21955af83ab511de080855aa0ac771 (diff) | |
| download | gitlab-ce-082447ffa72582de0c44aaf9479851fe4a05a6db.tar.gz | |
Merge branch 'pawel/disable_prometheus_metrics' into 'master'10-2-stable-patch-1
Temporarily force disable prometheus metrics
See merge request gitlab-org/gitlab-ce!15549
(cherry picked from commit 3193f13b444dc08366ebe2c223fb59ef2862f30b)
bf77f1cd Force disable Prometheus metrics
| -rw-r--r-- | changelogs/unreleased/pawel-disable_prometheus_metrics.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/metrics/prometheus.rb | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml new file mode 100644 index 00000000000..74d83256603 --- /dev/null +++ b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml @@ -0,0 +1,5 @@ +--- +title: Force disable Prometheus metrics +merge_request: +author: +type: fixed diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb index 09103b4ca2d..4f165d12a94 100644 --- a/lib/gitlab/metrics/prometheus.rb +++ b/lib/gitlab/metrics/prometheus.rb @@ -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 |