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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b71eb1da
Commit
b71eb1da
authored
Sep 07, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added minor details to specs
parent
93ba3fdd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
changelogs/unreleased/additional-time-series-charts.yml
changelogs/unreleased/additional-time-series-charts.yml
+1
-1
config/prometheus/additional_metrics.yml
config/prometheus/additional_metrics.yml
+17
-0
spec/javascripts/monitoring/graph_path_spec.js
spec/javascripts/monitoring/graph_path_spec.js
+4
-4
No files found.
changelogs/unreleased/additional-time-series-charts.yml
View file @
b71eb1da
---
---
title
:
Added support
for multiple time series
title
:
Added support
the multiple time series for prometheus monitoring
merge_request
:
!36893
merge_request
:
!36893
author
:
author
:
type
:
changed
type
:
changed
config/prometheus/additional_metrics.yml
View file @
b71eb1da
...
@@ -131,3 +131,20 @@
...
@@ -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'
-
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
label
:
Average
unit
:
"
%"
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_path_spec.js
View file @
b71eb1da
...
@@ -21,15 +21,15 @@ describe('Monitoring Paths', () => {
...
@@ -21,15 +21,15 @@ describe('Monitoring Paths', () => {
const
component
=
createComponent
({
const
component
=
createComponent
({
generatedLinePath
:
firstTimeSeries
.
linePath
,
generatedLinePath
:
firstTimeSeries
.
linePath
,
generatedAreaPath
:
firstTimeSeries
.
areaPath
,
generatedAreaPath
:
firstTimeSeries
.
areaPath
,
lineColor
:
'
#ccc
'
,
lineColor
:
firstTimeSeries
.
lineColor
,
areaColor
:
'
#fff
'
,
areaColor
:
firstTimeSeries
.
areaColor
,
});
});
const
metricArea
=
component
.
$el
.
querySelector
(
'
.metric-area
'
);
const
metricArea
=
component
.
$el
.
querySelector
(
'
.metric-area
'
);
const
metricLine
=
component
.
$el
.
querySelector
(
'
.metric-line
'
);
const
metricLine
=
component
.
$el
.
querySelector
(
'
.metric-line
'
);
expect
(
metricArea
.
getAttribute
(
'
fill
'
)).
toBe
(
'
#
fff
'
);
expect
(
metricArea
.
getAttribute
(
'
fill
'
)).
toBe
(
'
#
8dd5aa
'
);
expect
(
metricArea
.
getAttribute
(
'
d
'
)).
toBe
(
firstTimeSeries
.
areaPath
);
expect
(
metricArea
.
getAttribute
(
'
d
'
)).
toBe
(
firstTimeSeries
.
areaPath
);
expect
(
metricLine
.
getAttribute
(
'
stroke
'
)).
toBe
(
'
#
ccc
'
);
expect
(
metricLine
.
getAttribute
(
'
stroke
'
)).
toBe
(
'
#
1aaa55
'
);
expect
(
metricLine
.
getAttribute
(
'
d
'
)).
toBe
(
firstTimeSeries
.
linePath
);
expect
(
metricLine
.
getAttribute
(
'
d
'
)).
toBe
(
firstTimeSeries
.
linePath
);
});
});
});
});
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