Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c7a1da80
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,发现更多精彩内容 >>
提交
c7a1da80
编写于
6月 06, 2017
作者:
P
Pawel Chojnacki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Explicitly require format.json in prometheus_controller
+ add missing prometheus_controller tests!
上级
c0a66dbd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
76 addition
and
7 deletion
+76
-7
app/controllers/projects/deployments_controller.rb
app/controllers/projects/deployments_controller.rb
+3
-2
app/controllers/projects/prometheus_controller.rb
app/controllers/projects/prometheus_controller.rb
+13
-5
spec/controllers/projects/prometheus_controller_spec.rb
spec/controllers/projects/prometheus_controller_spec.rb
+60
-0
未找到文件。
app/controllers/projects/deployments_controller.rb
浏览文件 @
c7a1da80
...
...
@@ -24,10 +24,11 @@ class Projects::DeploymentsController < Projects::ApplicationController
def
additional_metrics
return
render_404
unless
deployment
.
has_additional_metrics?
metrics
=
deployment
.
additional_metrics
if
metrics
&
.
any?
render
json:
metrics
,
status: :ok
if
metrics
.
any?
render
json:
metrics
else
head
:no_content
end
...
...
app/controllers/projects/prometheus_controller.rb
浏览文件 @
c7a1da80
...
...
@@ -3,17 +3,25 @@ class Projects::PrometheusController < Projects::ApplicationController
before_action
:require_prometheus_metrics!
def
active_metrics
matched_metrics
=
prometheus_service
.
reactive_query
(
Gitlab
::
Prometheus
::
Queries
::
MatchedMetricsQuery
.
name
,
&
:itself
)
matched_metrics
=
prometheus_service
.
reactive_query
(
Gitlab
::
Prometheus
::
Queries
::
MatchedMetricsQuery
.
name
,
&
:itself
)
||
{}
if
matched_metrics
render
json:
matched_metrics
,
status: :ok
else
head
:no_content
respond_to
do
|
format
|
format
.
json
do
if
matched_metrics
.
any?
render
json:
matched_metrics
else
head
:no_content
end
end
end
end
private
rescue_from
(
ActionController
::
UnknownFormat
)
do
|
e
|
render_404
end
def
prometheus_service
project
.
monitoring_service
end
...
...
spec/controllers/projects/prometheus_controller_spec.rb
0 → 100644
浏览文件 @
c7a1da80
require
(
'spec_helper'
)
describe
Projects
::
PrometheusController
do
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:empty_project
)
}
let
(
:prometheus_service
)
{
double
(
'prometheus_service'
)
}
before
do
allow
(
controller
).
to
receive
(
:project
).
and_return
(
project
)
allow
(
project
).
to
receive
(
:monitoring_service
).
and_return
(
prometheus_service
)
project
.
add_master
(
user
)
sign_in
(
user
)
end
describe
'GET #active_metrics'
do
context
'when prometheus metrics are enabled'
do
before
do
allow
(
prometheus_service
).
to
receive
(
:reactive_query
)
end
context
'when data is not present'
do
it
'returns no content response'
do
get
:active_metrics
,
project_params
(
format: :json
)
expect
(
response
).
to
have_http_status
(
204
)
end
end
context
'when data is available'
do
let
(
:sample_response
)
{
{
some_data:
1
}
}
before
do
allow
(
prometheus_service
).
to
receive
(
:reactive_query
).
with
(
Gitlab
::
Prometheus
::
Queries
::
MatchedMetricsQuery
.
name
)
.
and_return
(
sample_response
)
end
it
'returns no content response'
do
get
:active_metrics
,
project_params
(
format: :json
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
).
to
eq
(
sample_response
.
deep_stringify_keys
)
end
end
context
'when requesting non json response'
do
it
'returns not found response'
do
get
:active_metrics
,
project_params
expect
(
response
).
to
have_http_status
(
404
)
end
end
end
end
def
project_params
(
opts
=
{})
opts
.
reverse_merge
(
namespace_id:
project
.
namespace
,
project_id:
project
)
end
end
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录