Merge branch 'pawel/disable_prometheus_metrics' into 'master'

Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549 (cherry picked from commit 3193f13b) bf77f1cd Force disable Prometheus metrics

Merge branch 'pawel/disable_prometheus_metrics' into 'master'
082447ff · Stan Hu · Michael Kozono · 87b43b73 · 082447ff · 082447ff
Commit 082447ff authored Nov 22, 2017 by Stan Hu Committed by Michael Kozono Nov 22, 2017
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

pawel-disable_prometheus_metrics.yml changelogs/unreleased/pawel-disable_prometheus_metrics.yml +5 -0

prometheus.rb lib/gitlab/metrics/prometheus.rb +3 -3

No files found.
--- a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
+++ b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
+---
+title: Force disable Prometheus metrics
+merge_request:
+author:
+type: fixed
--- 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