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
2a89d2c9
Commit
2a89d2c9
authored
May 12, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid comma t the end of hash
parent
436e9078
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/prometheus/queries/deployment_query.rb
lib/gitlab/prometheus/queries/deployment_query.rb
+1
-1
lib/gitlab/prometheus/queries/environment_query.rb
lib/gitlab/prometheus/queries/environment_query.rb
+1
-1
spec/support/prometheus_helpers.rb
spec/support/prometheus_helpers.rb
+1
-1
No files found.
lib/gitlab/prometheus/queries/deployment_query.rb
View file @
2a89d2c9
...
...
@@ -19,7 +19,7 @@ module Gitlab::Prometheus::Queries
cpu_values:
client_query_range
(
cpu_query
,
start:
timeframe_start
,
stop:
timeframe_end
),
cpu_before:
client_query
(
cpu_avg_query
,
time:
deployment
.
created_at
.
to_f
),
cpu_after:
client_query
(
cpu_avg_query
,
time:
timeframe_end
)
,
cpu_after:
client_query
(
cpu_avg_query
,
time:
timeframe_end
)
}
end
end
...
...
lib/gitlab/prometheus/queries/environment_query.rb
View file @
2a89d2c9
...
...
@@ -13,7 +13,7 @@ module Gitlab::Prometheus::Queries
memory_values:
client_query_range
(
memory_query
,
start:
timeframe_start
,
stop:
timeframe_end
),
memory_current:
client_query
(
memory_query
,
time:
timeframe_end
),
cpu_values:
client_query_range
(
cpu_query
,
start:
timeframe_start
,
stop:
timeframe_end
),
cpu_current:
client_query
(
cpu_query
,
time:
timeframe_end
)
,
cpu_current:
client_query
(
cpu_query
,
time:
timeframe_end
)
}
end
end
...
...
spec/support/prometheus_helpers.rb
View file @
2a89d2c9
...
...
@@ -89,7 +89,7 @@ module PrometheusHelpers
memory_values:
prometheus_values_body
(
'matrix'
).
dig
(
:data
,
:result
),
memory_current:
prometheus_value_body
(
'vector'
).
dig
(
:data
,
:result
),
cpu_values:
prometheus_values_body
(
'matrix'
).
dig
(
:data
,
:result
),
cpu_current:
prometheus_value_body
(
'vector'
).
dig
(
:data
,
:result
)
,
cpu_current:
prometheus_value_body
(
'vector'
).
dig
(
:data
,
:result
)
},
last_update:
last_update
}
...
...
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