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
f4b8ec7e
Commit
f4b8ec7e
authored
Mar 29, 2019
by
Tristan Read
Committed by
Phil Hughes
Mar 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add requested resources to cluster health - ce port
parent
3a477fec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
app/assets/javascripts/monitoring/components/charts/area.vue
app/assets/javascripts/monitoring/components/charts/area.vue
+5
-5
app/assets/javascripts/monitoring/constants.js
app/assets/javascripts/monitoring/constants.js
+0
-1
spec/javascripts/monitoring/charts/area_spec.js
spec/javascripts/monitoring/charts/area_spec.js
+4
-0
spec/javascripts/monitoring/mock_data.js
spec/javascripts/monitoring/mock_data.js
+5
-0
No files found.
app/assets/javascripts/monitoring/components/charts/area.vue
View file @
f4b8ec7e
...
@@ -69,17 +69,17 @@ export default {
...
@@ -69,17 +69,17 @@ export default {
appearance
&&
appearance
.
line
&&
appearance
.
line
.
type
appearance
&&
appearance
.
line
&&
appearance
.
line
.
type
?
appearance
.
line
.
type
?
appearance
.
line
.
type
:
lineTypes
.
default
;
:
lineTypes
.
default
;
const
lineColor
=
lineType
===
lineTypes
.
threshold
?
this
.
primaryColor
:
undefined
;
const
lineWidth
=
appearance
&&
appearance
.
line
&&
appearance
.
line
.
width
?
appearance
.
line
.
width
:
undefined
;
return
{
return
{
name
:
this
.
formatLegendLabel
(
query
),
name
:
this
.
formatLegendLabel
(
query
),
data
:
this
.
concatenateResults
(
query
.
result
),
data
:
this
.
concatenateResults
(
query
.
result
),
lineStyle
:
{
lineStyle
:
{
type
:
lineType
,
type
:
lineType
,
color
:
lineColor
,
width
:
lineWidth
,
},
itemStyle
:
{
color
:
lineColor
,
},
},
areaStyle
:
{
areaStyle
:
{
opacity
:
opacity
:
...
...
app/assets/javascripts/monitoring/constants.js
View file @
f4b8ec7e
...
@@ -6,5 +6,4 @@ export const graphTypes = {
...
@@ -6,5 +6,4 @@ export const graphTypes = {
export
const
lineTypes
=
{
export
const
lineTypes
=
{
default
:
'
solid
'
,
default
:
'
solid
'
,
threshold
:
'
dashed
'
,
};
};
spec/javascripts/monitoring/charts/area_spec.js
View file @
f4b8ec7e
...
@@ -203,6 +203,10 @@ describe('Area component', () => {
...
@@ -203,6 +203,10 @@ describe('Area component', () => {
.
length
,
.
length
,
).
toBe
(
data
.
length
);
).
toBe
(
data
.
length
);
});
});
it
(
'
formats line width correctly
'
,
()
=>
{
expect
(
chartData
[
0
].
lineStyle
.
width
).
toBe
(
2
);
});
});
});
describe
(
'
scatterSeries
'
,
()
=>
{
describe
(
'
scatterSeries
'
,
()
=>
{
...
...
spec/javascripts/monitoring/mock_data.js
View file @
f4b8ec7e
...
@@ -330,6 +330,11 @@ export const metricsGroupsAPIResponse = {
...
@@ -330,6 +330,11 @@ export const metricsGroupsAPIResponse = {
weight
:
1
,
weight
:
1
,
queries
:
[
queries
:
[
{
{
appearance
:
{
line
:
{
width
:
2
,
},
},
query_range
:
query_range
:
'
avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100
'
,
'
avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100
'
,
label
:
'
Core Usage
'
,
label
:
'
Core Usage
'
,
...
...
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