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
8b69523b
Commit
8b69523b
authored
Jun 16, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move additional_metrics.yaml into prometheus/ config folder
parent
6e4d5334
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
config/prometheus/additional_metrics.yml
config/prometheus/additional_metrics.yml
+0
-0
lib/gitlab/prometheus/additional_metrics_parser.rb
lib/gitlab/prometheus/additional_metrics_parser.rb
+1
-1
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+1
-1
No files found.
config/additional_metrics.yml
→
config/
prometheus/
additional_metrics.yml
View file @
8b69523b
File moved
lib/gitlab/prometheus/additional_metrics_parser.rb
View file @
8b69523b
...
@@ -27,7 +27,7 @@ module Gitlab
...
@@ -27,7 +27,7 @@ module Gitlab
end
end
def
load_yaml_file
def
load_yaml_file
YAML
.
load_file
(
Rails
.
root
.
join
(
'config/additional_metrics.yml'
))
YAML
.
load_file
(
Rails
.
root
.
join
(
'config/
prometheus/
additional_metrics.yml'
))
end
end
end
end
end
end
...
...
spec/models/environment_spec.rb
View file @
8b69523b
...
@@ -475,7 +475,7 @@ describe Environment, models: true do
...
@@ -475,7 +475,7 @@ describe Environment, models: true do
end
end
it
'returns the additional metrics from the deployment service'
do
it
'returns the additional metrics from the deployment service'
do
expect
(
environmen
t
.
prometheus_service
).
to
receive
(
:additional_environment_metrics
)
expect
(
projec
t
.
prometheus_service
).
to
receive
(
:additional_environment_metrics
)
.
with
(
environment
)
.
with
(
environment
)
.
and_return
(
:fake_metrics
)
.
and_return
(
:fake_metrics
)
...
...
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