BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
082447ff
Commit
082447ff
authored
Nov 22, 2017
by
Stan Hu
Committed by
Michael Kozono
Nov 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
parent
87b43b73
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
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.
changelogs/unreleased/pawel-disable_prometheus_metrics.yml
0 → 100644
View file @
082447ff
---
title
:
Force disable Prometheus metrics
merge_request
:
author
:
type
:
fixed
lib/gitlab/metrics/prometheus.rb
View file @
082447ff
...
@@ -17,9 +17,9 @@ module Gitlab
...
@@ -17,9 +17,9 @@ module Gitlab
end
end
def
prometheus_metrics_enabled?
def
prometheus_metrics_enabled?
return
@prometheus_metrics_enabled
if
defined?
(
@prometheus_metrics_enabled
)
# force disable prometheus_metrics until
# https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready
@prometheus_metrics_enabled
=
prometheus_metrics_enabled_unmemoized
false
end
end
def
registry
def
registry
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment