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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
57902dbe
Commit
57902dbe
authored
May 22, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Changelog fix textual description in config.ru
parent
dc4d4c18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
...d/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
+4
-0
config.ru
config.ru
+1
-1
No files found.
changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
0 → 100644
View file @
57902dbe
---
title
:
Add prometheus based metrics collection to gitlab webapp
merge_request
:
author
:
config.ru
View file @
57902dbe
...
@@ -14,7 +14,7 @@ if defined?(Unicorn)
...
@@ -14,7 +14,7 @@ if defined?(Unicorn)
use
Unicorn
::
WorkerKiller
::
Oom
,
min
,
max
use
Unicorn
::
WorkerKiller
::
Oom
,
min
,
max
end
end
end
end
# set default for multiproces metrics gathering
# set default
directory
for multiproces metrics gathering
ENV
[
'prometheus_multiproc_dir'
]
||=
'tmp/prometheus_data_dir'
ENV
[
'prometheus_multiproc_dir'
]
||=
'tmp/prometheus_data_dir'
require
::
File
.
expand_path
(
'../config/environment'
,
__FILE__
)
require
::
File
.
expand_path
(
'../config/environment'
,
__FILE__
)
...
...
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