BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
daf15c3c
Commit
daf15c3c
authored
Aug 29, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename and organize vue components
parent
4809ded8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
31 additions
and
32 deletions
+31
-32
dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+6
-7
empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+0
-0
graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+13
-13
deployment.vue
...ts/javascripts/monitoring/components/graph/deployment.vue
+1
-1
flag.vue
app/assets/javascripts/monitoring/components/graph/flag.vue
+1
-1
legend.vue
...assets/javascripts/monitoring/components/graph/legend.vue
+2
-2
graph_row.vue
app/assets/javascripts/monitoring/components/graph_row.vue
+5
-5
monitoring_bundle.js
app/assets/javascripts/monitoring/monitoring_bundle.js
+3
-3
No files found.
app/assets/javascripts/monitoring/components/
monitoring
.vue
→
app/assets/javascripts/monitoring/components/
dashboard
.vue
View file @
daf15c3c
...
...
@@ -3,8 +3,8 @@
import
_
from
'underscore'
;
import
statusCodes
from
'../../lib/utils/http_status'
;
import
MonitoringService
from
'../services/monitoring_service'
;
import
monitoringRow
from
'./monitoring
_row.vue'
;
import
monitoringState
from
'./monitoring
_state.vue'
;
import
GraphRow
from
'./graph
_row.vue'
;
import
EmptyState
from
'./empty
_state.vue'
;
import
MonitoringStore
from
'../stores/monitoring_store'
;
import
eventHub
from
'../event_hub'
;
...
...
@@ -31,8 +31,8 @@
},
components
:
{
monitoring
Row
,
monitoring
State
,
Graph
Row
,
Empty
State
,
},
methods
:
{
...
...
@@ -94,7 +94,6 @@
this
.
updatedAspectRatios
=
0
;
}
},
},
created
()
{
...
...
@@ -132,7 +131,7 @@
<h4>
{{
groupData
.
group
}}
</h4>
</div>
<div
class=
"panel-body"
>
<
monitoring
-row
<
graph
-row
v-for=
"(row, index) in groupData.metrics"
:key=
"index"
:row-data=
"row"
...
...
@@ -144,7 +143,7 @@
</div>
</div>
</div>
<
monitoring
-state
<
empty
-state
:selected-state=
"state"
:documentation-path=
"documentationPath"
:settings-path=
"settingsPath"
...
...
app/assets/javascripts/monitoring/components/
monitoring
_state.vue
→
app/assets/javascripts/monitoring/components/
empty
_state.vue
View file @
daf15c3c
File moved
app/assets/javascripts/monitoring/components/
monitoring_column
.vue
→
app/assets/javascripts/monitoring/components/
graph
.vue
View file @
daf15c3c
<
script
>
import
d3
from
'd3'
;
import
monitoringLegends
from
'./monitoring_legends
.vue'
;
import
monitoringFlag
from
'./monitoring_
flag.vue'
;
import
monitoringDeployment
from
'./monitoring_
deployment.vue'
;
import
GraphLegend
from
'./graph/legend
.vue'
;
import
GraphFlag
from
'./graph/
flag.vue'
;
import
GraphDeployment
from
'./graph/
deployment.vue'
;
import
MonitoringMixin
from
'../mixins/monitoring_mixins'
;
import
eventHub
from
'../event_hub'
;
import
measurements
from
'../utils/measurements'
;
...
...
@@ -14,7 +14,7 @@
export
default
{
props
:
{
column
Data
:
{
graph
Data
:
{
type
:
Object
,
required
:
true
,
},
...
...
@@ -66,9 +66,9 @@
},
components
:
{
monitoringLegends
,
monitoring
Flag
,
monitoring
Deployment
,
GraphLegend
,
Graph
Flag
,
Graph
Deployment
,
},
computed
:
{
...
...
@@ -97,7 +97,7 @@
methods
:
{
draw
()
{
const
breakpointSize
=
bp
.
getBreakpointSize
();
const
query
=
this
.
column
Data
.
queries
[
0
];
const
query
=
this
.
graph
Data
.
queries
[
0
];
this
.
margin
=
measurements
.
large
.
margin
;
if
(
breakpointSize
===
'xs'
||
breakpointSize
===
'sm'
)
{
this
.
graphHeight
=
300
;
...
...
@@ -106,7 +106,7 @@
}
this
.
data
=
query
.
result
[
0
].
values
;
this
.
unitOfDisplay
=
query
.
unit
||
''
;
this
.
yAxisLabel
=
this
.
column
Data
.
y_label
||
'Values'
;
this
.
yAxisLabel
=
this
.
graph
Data
.
y_label
||
'Values'
;
this
.
legendTitle
=
query
.
label
||
'Average'
;
this
.
graphWidth
=
this
.
$refs
.
baseSvg
.
clientWidth
-
this
.
margin
.
left
-
this
.
margin
.
right
;
...
...
@@ -224,7 +224,7 @@
:class=
"classType"
>
<h5
class=
"text-center graph-title"
>
{{
column
Data
.
title
}}
{{
graph
Data
.
title
}}
</h5>
<div
class=
"prometheus-svg-container"
...
...
@@ -240,7 +240,7 @@
class=
"y-axis"
transform=
"translate(70, 20)"
>
</g>
<
monitoring-legends
<
graph-legend
:graph-width=
"graphWidth"
:graph-height=
"graphHeight"
:margin=
"margin"
...
...
@@ -268,13 +268,13 @@
stroke-width=
"2"
transform=
"translate(-5, 20)"
>
</path>
<
monitoring
-deployment
<
graph
-deployment
:show-deploy-info=
"showDeployInfo"
:deployment-data=
"reducedDeploymentData"
:graph-height=
"graphHeight"
:graph-height-offset=
"graphHeightOffset"
/>
<
monitoring
-flag
<
graph
-flag
v-if=
"showFlag"
:current-x-coordinate=
"currentXCoordinate"
:current-y-coordinate=
"currentYCoordinate"
...
...
app/assets/javascripts/monitoring/components/
monitoring_
deployment.vue
→
app/assets/javascripts/monitoring/components/
graph/
deployment.vue
View file @
daf15c3c
<
script
>
import
{
dateFormat
,
timeFormat
}
from
'../utils/date_time_formatters'
;
import
{
dateFormat
,
timeFormat
}
from
'../
../
utils/date_time_formatters'
;
export
default
{
props
:
{
...
...
app/assets/javascripts/monitoring/components/
monitoring_
flag.vue
→
app/assets/javascripts/monitoring/components/
graph/
flag.vue
View file @
daf15c3c
<
script
>
import
{
dateFormat
,
timeFormat
}
from
'../utils/date_time_formatters'
;
import
{
dateFormat
,
timeFormat
}
from
'../
../
utils/date_time_formatters'
;
export
default
{
props
:
{
...
...
app/assets/javascripts/monitoring/components/
monitoring_legends
.vue
→
app/assets/javascripts/monitoring/components/
graph/legend
.vue
View file @
daf15c3c
...
...
@@ -74,7 +74,7 @@
};
</
script
>
<
template
>
<g
<g
class=
"axis-label-container"
>
<line
class=
"label-x-axis-line"
...
...
@@ -100,7 +100,7 @@
:width=
"yLabelWidth"
:height=
"yLabelHeight"
>
</rect>
<text
<text
class=
"label-axis-text y-label-text"
text-anchor=
"middle"
:transform=
"textTransform"
...
...
app/assets/javascripts/monitoring/components/
monitoring
_row.vue
→
app/assets/javascripts/monitoring/components/
graph
_row.vue
View file @
daf15c3c
<
script
>
import
monitoringColumn
from
'./monitoring_column
.vue'
;
import
Graph
from
'./graph
.vue'
;
export
default
{
props
:
{
...
...
@@ -17,7 +17,7 @@
},
},
components
:
{
monitoringColumn
,
Graph
,
},
computed
:
{
bootstrapClass
()
{
...
...
@@ -29,9 +29,9 @@
<
template
>
<div
class=
"prometheus-row row"
>
<
monitoring-column
v-for=
"(
column
, index) in rowData"
:
column-data=
"column
"
<
graph
v-for=
"(
graphData
, index) in rowData"
:
graph-data=
"graphData
"
:class-type=
"bootstrapClass"
:key=
"index"
:update-aspect-ratio=
"updateAspectRatio"
...
...
app/assets/javascripts/monitoring/monitoring_bundle.js
View file @
daf15c3c
import
Vue
from
'vue'
;
import
Monitoring
from
'./components/monitoring
.vue'
;
import
Dashboard
from
'./components/dashboard
.vue'
;
document
.
addEventListener
(
'DOMContentLoaded'
,
()
=>
new
Vue
({
el
:
'#prometheus-graphs'
,
components
:
{
'monitoring-dashboard'
:
Monitoring
,
Dashboard
,
},
render
:
createElement
=>
createElement
(
'
monitoring-
dashboard'
),
render
:
createElement
=>
createElement
(
'dashboard'
),
}));
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