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
d9c8c995
Unverified
Commit
d9c8c995
authored
Jan 31, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add link to cluster configuration from prometheus "getting started" state
parent
3a565d5d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
10 deletions
+31
-10
dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+2
-0
empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+23
-9
environments.scss
app/assets/stylesheets/pages/environments.scss
+5
-1
metrics.html.haml
app/views/projects/environments/metrics.html.haml
+1
-0
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
d9c8c995
...
...
@@ -27,6 +27,7 @@
hasMetrics
:
convertPermissionToBoolean
(
metricsData
.
hasMetrics
),
documentationPath
:
metricsData
.
documentationPath
,
settingsPath
:
metricsData
.
settingsPath
,
clustersPath
:
metricsData
.
clustersPath
,
tagsPath
:
metricsData
.
tagsPath
,
projectPath
:
metricsData
.
projectPath
,
metricsEndpoint
:
metricsData
.
additionalMetrics
,
...
...
@@ -132,6 +133,7 @@
:selected-state=
"state"
:documentation-path=
"documentationPath"
:settings-path=
"settingsPath"
:clusters-path=
"clustersPath"
:empty-getting-started-svg-path=
"emptyGettingStartedSvgPath"
:empty-loading-svg-path=
"emptyLoadingSvgPath"
:empty-unable-to-connect-svg-path=
"emptyUnableToConnectSvgPath"
...
...
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
d9c8c995
...
...
@@ -10,6 +10,11 @@
required
:
false
,
default
:
''
,
},
clustersPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
selectedState
:
{
type
:
String
,
required
:
true
,
...
...
@@ -35,7 +40,10 @@
title
:
'Get started with performance monitoring'
,
description
:
`Stay updated about the performance and health
of your environment by configuring Prometheus to monitor your deployments.`
,
buttonText
:
'Configure Prometheus'
,
buttonText
:
'Install Prometheus on clusters'
,
buttonPath
:
this
.
clustersPath
,
secondaryButtonText
:
'Configure existing Prometheus'
,
secondaryButtonPath
:
this
.
settingsPath
,
},
loading
:
{
svgUrl
:
this
.
emptyLoadingSvgPath
,
...
...
@@ -43,6 +51,7 @@
description
:
`Creating graphs uses the data from the Prometheus server.
If this takes a long time, ensure that data is available.`
,
buttonText
:
'View documentation'
,
buttonPath
:
this
.
documentationPath
,
},
noData
:
{
svgUrl
:
this
.
emptyUnableToConnectSvgPath
,
...
...
@@ -50,12 +59,14 @@
description
:
`You are connected to the Prometheus server, but there is currently
no data to display.`
,
buttonText
:
'Configure Prometheus'
,
buttonPath
:
this
.
settingsPath
,
},
unableToConnect
:
{
svgUrl
:
this
.
emptyUnableToConnectSvgPath
,
title
:
'Unable to connect to Prometheus server'
,
description
:
'Ensure connectivity is available from the GitLab server to the '
,
buttonText
:
'View documentation'
,
buttonPath
:
this
.
documentationPath
,
},
},
};
...
...
@@ -65,13 +76,6 @@
return
this
.
states
[
this
.
selectedState
];
},
buttonPath
()
{
if
(
this
.
selectedState
===
'gettingStarted'
)
{
return
this
.
settingsPath
;
}
return
this
.
documentationPath
;
},
showButtonDescription
()
{
if
(
this
.
selectedState
===
'unableToConnect'
)
return
true
;
return
false
;
...
...
@@ -99,11 +103,21 @@
</p>
<div
class=
"state-button"
>
<a
v-if=
"currentState.buttonPath"
class=
"btn btn-success"
:href=
"buttonPath"
:href=
"
currentState.
buttonPath"
>
{{
currentState
.
buttonText
}}
</a>
</div>
<div
class=
"state-button"
>
<a
v-if=
"currentState.secondaryButtonPath"
class=
"btn"
:href=
"currentState.secondaryButtonPath"
>
{{
currentState
.
secondaryButtonText
}}
</a>
</div>
</div>
</
template
>
app/assets/stylesheets/pages/environments.scss
View file @
d9c8c995
...
...
@@ -205,7 +205,7 @@
}
.prometheus-state
{
max-width
:
4
3
0px
;
max-width
:
4
6
0px
;
margin
:
10px
auto
;
text-align
:
center
;
...
...
@@ -213,6 +213,10 @@
max-width
:
80vw
;
margin
:
0
auto
;
}
.state-button
{
padding
:
$gl-padding
/
2
;
}
}
.environments-actions
{
...
...
app/views/projects/environments/metrics.html.haml
View file @
d9c8c995
...
...
@@ -13,6 +13,7 @@
=
link_to
@environment
.
name
,
environment_path
(
@environment
)
#prometheus-graphs
{
data:
{
"settings-path"
:
edit_project_service_path
(
@project
,
'prometheus'
),
"clusters-path"
:
project_clusters_path
(
@project
),
"documentation-path"
:
help_page_path
(
'administration/monitoring/prometheus/index.md'
),
"empty-getting-started-svg-path"
:
image_path
(
'illustrations/monitoring/getting_started.svg'
),
"empty-loading-svg-path"
:
image_path
(
'illustrations/monitoring/loading.svg'
),
...
...
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