Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
75b8f64a
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,发现更多精彩内容 >>
提交
75b8f64a
编写于
9月 05, 2017
作者:
J
Jose Ivan Vargas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added specs for the additional color support
上级
45900c30
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
7 deletion
+22
-7
config/prometheus/additional_metrics.yml
config/prometheus/additional_metrics.yml
+17
-0
spec/javascripts/monitoring/graph/legend_spec.js
spec/javascripts/monitoring/graph/legend_spec.js
+3
-5
spec/javascripts/monitoring/graph_path_spec.js
spec/javascripts/monitoring/graph_path_spec.js
+1
-1
spec/javascripts/monitoring/utils/multiple_time_series_spec.js
...javascripts/monitoring/utils/multiple_time_series_spec.js
+1
-1
未找到文件。
config/prometheus/additional_metrics.yml
浏览文件 @
75b8f64a
...
...
@@ -131,3 +131,20 @@
-
query_range
:
'
sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m]))
/
count(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}})
*
100'
label
:
Average
unit
:
"
%"
-
title
:
"
CPU
usage
by
CPU"
required_metrics
:
-
container_cpu_usage_seconds_total
weight
:
1
queries
:
-
query_range
:
'
avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m]))
by
(cpu)
*
100'
unit
:
Average (%)
label
:
cpu
series
:
-
value
:
cpu00
color
:
red
-
value
:
cpu01
color
:
blue
-
value
:
cpu02
color
:
purple
-
value
:
cpu03
color
:
orange
spec/javascripts/monitoring/graph/legend_spec.js
浏览文件 @
75b8f64a
...
...
@@ -28,7 +28,7 @@ const defaultValuesComponent = {
currentDataIndex
:
0
,
};
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
]
.
result
,
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
],
defaultValuesComponent
.
graphWidth
,
defaultValuesComponent
.
graphHeight
,
defaultValuesComponent
.
graphHeightOffset
);
...
...
@@ -38,7 +38,7 @@ function getTextFromNode(component, selector) {
return
component
.
$el
.
querySelector
(
selector
).
firstChild
.
nodeValue
.
trim
();
}
describe
(
'
GraphLegend
'
,
()
=>
{
f
describe
(
'
GraphLegend
'
,
()
=>
{
describe
(
'
Computed props
'
,
()
=>
{
it
(
'
textTransform
'
,
()
=>
{
const
component
=
createComponent
(
defaultValuesComponent
);
...
...
@@ -93,9 +93,7 @@ describe('GraphLegend', () => {
const
component
=
createComponent
(
defaultValuesComponent
);
const
titles
=
component
.
$el
.
querySelectorAll
(
'
.legend-metric-title
'
);
expect
(
getTextFromNode
(
component
,
'
.legend-metric-title
'
).
indexOf
(
component
.
legendTitle
)).
not
.
toEqual
(
-
1
);
expect
(
titles
[
0
].
textContent
.
indexOf
(
'
Title
'
)).
not
.
toEqual
(
-
1
);
expect
(
titles
[
1
].
textContent
.
indexOf
(
'
Series
'
)).
not
.
toEqual
(
-
1
);
expect
(
titles
[
1
].
textContent
.
indexOf
(
'
series
'
)).
not
.
toEqual
(
-
1
);
expect
(
getTextFromNode
(
component
,
'
.y-label-text
'
)).
toEqual
(
component
.
yAxisLabel
);
});
...
...
spec/javascripts/monitoring/graph_path_spec.js
浏览文件 @
75b8f64a
...
...
@@ -13,7 +13,7 @@ const createComponent = (propsData) => {
const
convertedMetrics
=
convertDatesMultipleSeries
(
singleRowMetricsMultipleSeries
);
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
]
.
result
,
428
,
272
,
120
);
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
],
428
,
272
,
120
);
const
firstTimeSeries
=
timeSeries
[
0
];
describe
(
'
Monitoring Paths
'
,
()
=>
{
...
...
spec/javascripts/monitoring/utils/multiple_time_series_spec.js
浏览文件 @
75b8f64a
...
...
@@ -2,7 +2,7 @@ import createTimeSeries from '~/monitoring/utils/multiple_time_series';
import
{
convertDatesMultipleSeries
,
singleRowMetricsMultipleSeries
}
from
'
../mock_data
'
;
const
convertedMetrics
=
convertDatesMultipleSeries
(
singleRowMetricsMultipleSeries
);
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
]
.
result
,
428
,
272
,
120
);
const
timeSeries
=
createTimeSeries
(
convertedMetrics
[
0
].
queries
[
0
],
428
,
272
,
120
);
const
firstTimeSeries
=
timeSeries
[
0
];
describe
(
'
Multiple time series
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录