Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1fcceb29
Commit
1fcceb29
authored
Jun 26, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9e6fd75d
fc35892a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
app/controllers/concerns/requires_whitelisted_monitoring_client.rb
...ollers/concerns/requires_whitelisted_monitoring_client.rb
+4
-0
changelogs/unreleased/always-allow-prometheus-access-in-dev.yml
...logs/unreleased/always-allow-prometheus-access-in-dev.yml
+5
-0
No files found.
app/controllers/concerns/requires_whitelisted_monitoring_client.rb
View file @
1fcceb29
...
...
@@ -14,6 +14,10 @@ module RequiresWhitelistedMonitoringClient
end
def
client_ip_whitelisted?
# Always allow developers to access http://localhost:3000/-/metrics for
# debugging purposes
return
true
if
Rails
.
env
.
development?
&&
request
.
local?
ip_whitelist
.
any?
{
|
e
|
e
.
include?
(
Gitlab
::
RequestContext
.
client_ip
)
}
end
...
...
changelogs/unreleased/always-allow-prometheus-access-in-dev.yml
0 → 100644
View file @
1fcceb29
---
title
:
Always allow access to health endpoints from localhost in dev
merge_request
:
29930
author
:
type
:
other
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