Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
693602d9
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
693602d9
编写于
5月 09, 2017
作者:
P
Pawel Chojnacki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Keep presentation logic in one place and remove unecessary arguments.
+ fix tests
上级
4f824d2a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
17 deletion
+22
-17
app/models/deployment.rb
app/models/deployment.rb
+1
-2
app/models/project_services/prometheus_service.rb
app/models/project_services/prometheus_service.rb
+3
-2
spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
+11
-7
spec/models/deployment_spec.rb
spec/models/deployment_spec.rb
+5
-4
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+1
-1
spec/models/project_services/prometheus_service_spec.rb
spec/models/project_services/prometheus_service_spec.rb
+1
-1
未找到文件。
app/models/deployment.rb
浏览文件 @
693602d9
...
...
@@ -106,8 +106,7 @@ class Deployment < ActiveRecord::Base
def
metrics
return
{}
unless
has_metrics?
metrics
=
project
.
monitoring_service
.
deployment_metrics
(
self
)
metrics
&
.
merge
(
deployment_time:
created_at
.
to_i
)
||
{}
project
.
monitoring_service
.
deployment_metrics
(
self
)
end
private
...
...
app/models/project_services/prometheus_service.rb
浏览文件 @
693602d9
...
...
@@ -63,12 +63,13 @@ class PrometheusService < MonitoringService
{
success:
false
,
result:
err
}
end
def
environment_metrics
(
environment
,
**
args
)
def
environment_metrics
(
environment
)
with_reactive_cache
(
Gitlab
::
Prometheus
::
Queries
::
EnvironmentQuery
.
name
,
environment
.
id
,
&
:itself
)
end
def
deployment_metrics
(
deployment
)
with_reactive_cache
(
Gitlab
::
Prometheus
::
Queries
::
DeploymentQuery
.
name
,
deployment
.
id
,
&
:itself
)
metrics
=
with_reactive_cache
(
Gitlab
::
Prometheus
::
Queries
::
DeploymentQuery
.
name
,
deployment
.
id
,
&
:itself
)
metrics
&
.
merge
(
deployment_time:
created_at
.
to_i
)
||
{}
end
# Cache metrics for specific environment
...
...
spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
浏览文件 @
693602d9
require
'spec_helper'
describe
Gitlab
::
Prometheus
::
Queries
::
DeploymentQuery
,
lib:
true
do
let
(
:environment
)
{
create
(
:environment
)
}
let
(
:environment
)
{
create
(
:environment
,
slug:
'environment-slug'
)
}
let
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
)
}
let
(
:client
)
{
double
(
'prometheus_client'
)
}
subject
{
described_class
.
new
(
client
)
}
around
do
|
example
|
Timecop
.
freeze
{
example
.
run
}
end
it
'sends appropriate queries to prometheus'
do
start_time
=
(
deployment
.
created_at
-
30
.
minutes
).
to_f
stop_time
=
(
deployment
.
created_at
+
30
.
minutes
).
to_f
expect
(
client
).
to
receive
(
:query_range
).
with
(
'avg(container_memory_usage_bytes{container_name!="POD",environment="environment
1
"}) / 2^20'
,
expect
(
client
).
to
receive
(
:query_range
).
with
(
'avg(container_memory_usage_bytes{container_name!="POD",environment="environment
-slug
"}) / 2^20'
,
start:
start_time
,
stop:
stop_time
)
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="environment
1
"}[30m]))'
,
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="environment
-slug
"}[30m]))'
,
time:
deployment
.
created_at
.
to_f
)
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="environment
1
"}[30m]))'
,
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="environment
-slug
"}[30m]))'
,
time:
stop_time
)
expect
(
client
).
to
receive
(
:query_range
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
1
"}[2m])) * 100'
,
expect
(
client
).
to
receive
(
:query_range
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
-slug
"}[2m])) * 100'
,
start:
start_time
,
stop:
stop_time
)
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
1
"}[30m])) * 100'
,
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
-slug
"}[30m])) * 100'
,
time:
deployment
.
created_at
.
to_f
)
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
1
"}[30m])) * 100'
,
expect
(
client
).
to
receive
(
:query
).
with
(
'avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="environment
-slug
"}[30m])) * 100'
,
time:
stop_time
)
expect
(
subject
.
query
(
deployment
.
id
)).
to
eq
(
memory_values:
nil
,
memory_before:
nil
,
memory_after:
nil
,
...
...
spec/models/deployment_spec.rb
浏览文件 @
693602d9
...
...
@@ -52,7 +52,7 @@ describe Deployment, models: true do
describe
'#metrics'
do
let
(
:deployment
)
{
create
(
:deployment
)
}
subject
{
deployment
.
metrics
(
1
.
hour
)
}
subject
{
deployment
.
metrics
}
context
'metrics are disabled'
do
it
{
is_expected
.
to
eq
({})
}
...
...
@@ -63,16 +63,17 @@ describe Deployment, models: true do
{
success:
true
,
metrics:
{},
last_update:
42
last_update:
42
,
deployment_time:
1494408956
}
end
before
do
allow
(
deployment
.
project
).
to
receive_message_chain
(
:monitoring_service
,
:metrics
)
allow
(
deployment
.
project
).
to
receive_message_chain
(
:monitoring_service
,
:
deployment_
metrics
)
.
with
(
any_args
).
and_return
(
simple_metrics
)
end
it
{
is_expected
.
to
eq
(
simple_metrics
.
merge
(
deployment_time:
deployment
.
created_at
.
utc
.
to_i
)
)
}
it
{
is_expected
.
to
eq
(
simple_metrics
)
}
end
end
...
...
spec/models/environment_spec.rb
浏览文件 @
693602d9
...
...
@@ -393,7 +393,7 @@ describe Environment, models: true do
it
'returns the metrics from the deployment service'
do
expect
(
project
.
monitoring_service
)
.
to
receive
(
:metrics
).
with
(
environment
)
.
to
receive
(
:
environment_
metrics
).
with
(
environment
)
.
and_return
(
:fake_metrics
)
is_expected
.
to
eq
(
:fake_metrics
)
...
...
spec/models/project_services/prometheus_service_spec.rb
浏览文件 @
693602d9
...
...
@@ -82,7 +82,7 @@ describe PrometheusService, models: true, caching: true do
end
it
'returns reactive data'
do
is_expected
.
to
eq
(
prometheus_data
)
is_expected
.
to
eq
(
prometheus_data
.
merge
(
deployment_time:
deployment
.
created_at
.
to_i
)
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录