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
Jérome Perrin
gitlab-ce
Commits
9ec791ee
Commit
9ec791ee
authored
Jul 04, 2017
by
Joshua Lambert
Committed by
Jose Ivan Vargas
Jul 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct field for label name, fix default for unit to be blank
parent
674f05d2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/monitoring/components/monitoring_column.vue
...s/javascripts/monitoring/components/monitoring_column.vue
+9
-9
No files found.
app/assets/javascripts/monitoring/components/monitoring_column.vue
View file @
9ec791ee
...
@@ -105,9 +105,9 @@
...
@@ -105,9 +105,9 @@
this
.
measurements
=
measurements
.
small
;
this
.
measurements
=
measurements
.
small
;
}
}
this
.
data
=
query
.
result
[
0
].
values
;
this
.
data
=
query
.
result
[
0
].
values
;
this
.
unitOfDisplay
=
query
.
unit
||
'
N/A
'
;
this
.
unitOfDisplay
=
query
.
unit
||
''
;
this
.
yAxisLabel
=
this
.
columnData
.
y_label
||
'
Values
'
;
this
.
yAxisLabel
=
this
.
columnData
.
y_label
||
'
Values
'
;
this
.
legendTitle
=
query
.
l
egend
||
'
Average
'
;
this
.
legendTitle
=
query
.
l
abel
||
'
Average
'
;
this
.
graphWidth
=
this
.
$refs
.
baseSvg
.
clientWidth
-
this
.
graphWidth
=
this
.
$refs
.
baseSvg
.
clientWidth
-
this
.
margin
.
left
-
this
.
margin
.
right
;
this
.
margin
.
left
-
this
.
margin
.
right
;
this
.
graphHeight
=
this
.
graphHeight
-
this
.
margin
.
top
-
this
.
margin
.
bottom
;
this
.
graphHeight
=
this
.
graphHeight
-
this
.
margin
.
top
-
this
.
margin
.
bottom
;
...
@@ -215,16 +215,16 @@
...
@@ -215,16 +215,16 @@
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
<div
:class=
"classType"
>
:class=
"classType"
>
<h5
<h5
class=
"text-center graph-title"
>
class=
"text-center graph-title"
>
{{
columnData
.
title
}}
{{
columnData
.
title
}}
</h5>
</h5>
<div
<div
class=
"prometheus-svg-container"
class=
"prometheus-svg-container"
:style=
"paddingBottomRootSvg"
>
:style=
"paddingBottomRootSvg"
>
<svg
<svg
:viewBox=
"outterViewBox"
:viewBox=
"outterViewBox"
ref=
"baseSvg"
>
ref=
"baseSvg"
>
<g
<g
...
@@ -235,7 +235,7 @@
...
@@ -235,7 +235,7 @@
class=
"y-axis"
class=
"y-axis"
transform=
"translate(70, 20)"
>
transform=
"translate(70, 20)"
>
</g>
</g>
<monitoring-legends
<monitoring-legends
:graph-width=
"graphWidth"
:graph-width=
"graphWidth"
:graph-height=
"graphHeight"
:graph-height=
"graphHeight"
:margin=
"margin"
:margin=
"margin"
...
@@ -245,7 +245,7 @@
...
@@ -245,7 +245,7 @@
:y-axis-label=
"yAxisLabel"
:y-axis-label=
"yAxisLabel"
:metric-usage=
"metricUsage"
:metric-usage=
"metricUsage"
/>
/>
<svg
<svg
class=
"graph-data"
class=
"graph-data"
:viewBox=
"innerViewBox"
:viewBox=
"innerViewBox"
ref=
"graphData"
>
ref=
"graphData"
>
...
@@ -263,7 +263,7 @@
...
@@ -263,7 +263,7 @@
stroke-width=
"2"
stroke-width=
"2"
transform=
"translate(-5, 20)"
>
transform=
"translate(-5, 20)"
>
</path>
</path>
<rect
<rect
class=
"prometheus-graph-overlay"
class=
"prometheus-graph-overlay"
:width=
"(graphWidth - 70)"
:width=
"(graphWidth - 70)"
:height=
"(graphHeight - 100)"
:height=
"(graphHeight - 100)"
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
:graph-height=
"graphHeight"
:graph-height=
"graphHeight"
:graph-height-offset=
"graphHeightOffset"
:graph-height-offset=
"graphHeightOffset"
/>
/>
<monitoring-flag
<monitoring-flag
v-if=
"showFlag"
v-if=
"showFlag"
:current-x-coordinate=
"currentXCoordinate"
:current-x-coordinate=
"currentXCoordinate"
:current-y-coordinate=
"currentYCoordinate"
:current-y-coordinate=
"currentYCoordinate"
...
...
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