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
Léo-Paul Géneau
gitlab-ce
Commits
68bd15ac
Commit
68bd15ac
authored
Nov 14, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update environments metrics empty state
parent
b55aeca2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
36 deletions
+32
-36
app/assets/javascripts/monitoring/components/empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+27
-21
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+0
-15
changelogs/unreleased/gt-update-env-metrics-empty-state.yml
changelogs/unreleased/gt-update-env-metrics-empty-state.yml
+5
-0
No files found.
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
68bd15ac
...
@@ -44,9 +44,9 @@ export default {
...
@@ -44,9 +44,9 @@ export default {
title
:
'
Get started with performance monitoring
'
,
title
:
'
Get started with performance monitoring
'
,
description
:
`Stay updated about the performance and health
description
:
`Stay updated about the performance and health
of your environment by configuring Prometheus to monitor your deployments.`
,
of your environment by configuring Prometheus to monitor your deployments.`
,
buttonText
:
'
Install
Prometheus
on clusters
'
,
buttonText
:
'
Install on clusters
'
,
buttonPath
:
this
.
clustersPath
,
buttonPath
:
this
.
clustersPath
,
secondaryButtonText
:
'
Configure existing
Prometheus
'
,
secondaryButtonText
:
'
Configure existing
installation
'
,
secondaryButtonPath
:
this
.
settingsPath
,
secondaryButtonPath
:
this
.
settingsPath
,
},
},
loading
:
{
loading
:
{
...
@@ -88,19 +88,23 @@ export default {
...
@@ -88,19 +88,23 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"prometheus-state"
>
<div
class=
"row empty-state js-empty-state"
>
<div
class=
"col-12"
>
<div
class=
"state-svg svg-content"
><img
:src=
"currentState.svgUrl"
/></div>
<div
class=
"state-svg svg-content"
><img
:src=
"currentState.svgUrl"
/></div>
<h4
class=
"state-title"
>
{{
currentState
.
title
}}
</h4>
</div>
<div
class=
"col-12"
>
<div
class=
"text-content"
>
<h4
class=
"state-title text-center"
>
{{
currentState
.
title
}}
</h4>
<p
class=
"state-description"
>
<p
class=
"state-description"
>
{{
currentState
.
description
}}
{{
currentState
.
description
}}
<a
v-if=
"showButtonDescription"
:href=
"settingsPath"
>
Prometheus server
</a>
<a
v-if=
"showButtonDescription"
:href=
"settingsPath"
>
Prometheus server
</a>
</p>
</p>
<div
class=
"state-button"
>
<div
class=
"text-center"
>
<a
v-if=
"currentState.buttonPath"
:href=
"currentState.buttonPath"
class=
"btn btn-success"
>
<a
v-if=
"currentState.buttonPath"
:href=
"currentState.buttonPath"
class=
"btn btn-success"
>
{{
currentState
.
buttonText
}}
{{
currentState
.
buttonText
}}
</a>
</a>
</div>
<div
class=
"state-button"
>
<a
<a
v-if=
"currentState.secondaryButtonPath"
v-if=
"currentState.secondaryButtonPath"
:href=
"currentState.secondaryButtonPath"
:href=
"currentState.secondaryButtonPath"
...
@@ -110,4 +114,6 @@ export default {
...
@@ -110,4 +114,6 @@ export default {
</a>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
app/assets/stylesheets/pages/environments.scss
View file @
68bd15ac
...
@@ -203,21 +203,6 @@
...
@@ -203,21 +203,6 @@
stroke
:
$gray-darkest
;
stroke
:
$gray-darkest
;
}
}
.prometheus-state
{
max-width
:
460px
;
margin
:
10px
auto
;
text-align
:
center
;
.state-svg
{
max-width
:
80vw
;
margin
:
0
auto
;
}
.state-button
{
padding
:
$gl-padding
/
2
;
}
}
.prometheus-graphs
{
.prometheus-graphs
{
.environments
{
.environments
{
.dropdown-menu-toggle
{
.dropdown-menu-toggle
{
...
...
changelogs/unreleased/gt-update-env-metrics-empty-state.yml
0 → 100644
View file @
68bd15ac
---
title
:
Update environments metrics empty state
merge_request
:
23074
author
:
George Tsiolis
type
:
changed
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