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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e2065ed6
Commit
e2065ed6
authored
Jan 29, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add noData empty state to prometheus graphs
parent
86dc5985
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+7
-1
app/assets/javascripts/monitoring/components/empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+9
-2
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
e2065ed6
...
@@ -76,7 +76,13 @@
...
@@ -76,7 +76,13 @@
.
then
(
data
=>
this
.
store
.
storeDeploymentData
(
data
))
.
then
(
data
=>
this
.
store
.
storeDeploymentData
(
data
))
.
catch
(()
=>
new
Flash
(
'
Error getting deployment information.
'
)),
.
catch
(()
=>
new
Flash
(
'
Error getting deployment information.
'
)),
])
])
.
then
(()
=>
{
this
.
showEmptyState
=
false
;
})
.
then
(()
=>
{
if
(
this
.
store
.
groups
.
length
<
1
)
{
this
.
state
=
'
noData
'
;
return
;
}
this
.
showEmptyState
=
false
;
})
.
catch
(()
=>
{
this
.
state
=
'
unableToConnect
'
;
});
.
catch
(()
=>
{
this
.
state
=
'
unableToConnect
'
;
});
},
},
...
...
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
e2065ed6
...
@@ -34,16 +34,23 @@
...
@@ -34,16 +34,23 @@
svgUrl
:
this
.
emptyGettingStartedSvgPath
,
svgUrl
:
this
.
emptyGettingStartedSvgPath
,
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
:
'
Configure Prometheus
'
,
buttonText
:
'
Configure Prometheus
'
,
},
},
loading
:
{
loading
:
{
svgUrl
:
this
.
emptyLoadingSvgPath
,
svgUrl
:
this
.
emptyLoadingSvgPath
,
title
:
'
Waiting for performance data
'
,
title
:
'
Waiting for performance data
'
,
description
:
`Creating graphs uses the data from the Prometheus server.
description
:
`Creating graphs uses the data from the Prometheus server.
If this takes a long time, ensure that data is available.`
,
If this takes a long time, ensure that data is available.`
,
buttonText
:
'
View documentation
'
,
buttonText
:
'
View documentation
'
,
},
},
noData
:
{
svgUrl
:
this
.
emptyUnableToConnectSvgPath
,
title
:
'
No data found
'
,
description
:
`You are connected to the Prometheus server, but there is currently
no data to display.`
,
buttonText
:
'
Configure Prometheus
'
,
},
unableToConnect
:
{
unableToConnect
:
{
svgUrl
:
this
.
emptyUnableToConnectSvgPath
,
svgUrl
:
this
.
emptyUnableToConnectSvgPath
,
title
:
'
Unable to connect to Prometheus server
'
,
title
:
'
Unable to connect to Prometheus server
'
,
...
...
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