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
Boxiang Sun
gitlab-ce
Commits
8d1be1af
Commit
8d1be1af
authored
Mar 19, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add no_data illustration to monitoring empty state
parent
4b6b68d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+5
-0
app/assets/javascripts/monitoring/components/empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+5
-1
app/views/projects/environments/metrics.html.haml
app/views/projects/environments/metrics.html.haml
+1
-0
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
8d1be1af
...
@@ -73,6 +73,10 @@
...
@@ -73,6 +73,10 @@
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
emptyNoDataSvgPath
:
{
type
:
String
,
required
:
true
,
},
emptyUnableToConnectSvgPath
:
{
emptyUnableToConnectSvgPath
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
...
@@ -188,6 +192,7 @@
...
@@ -188,6 +192,7 @@
:clusters-path=
"clustersPath"
:clusters-path=
"clustersPath"
:empty-getting-started-svg-path=
"emptyGettingStartedSvgPath"
:empty-getting-started-svg-path=
"emptyGettingStartedSvgPath"
:empty-loading-svg-path=
"emptyLoadingSvgPath"
:empty-loading-svg-path=
"emptyLoadingSvgPath"
:empty-no-data-svg-path=
"emptyNoDataSvgPath"
:empty-unable-to-connect-svg-path=
"emptyUnableToConnectSvgPath"
:empty-unable-to-connect-svg-path=
"emptyUnableToConnectSvgPath"
/>
/>
</
template
>
</
template
>
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
8d1be1af
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
emptyNoDataSvgPath
:
{
type
:
String
,
required
:
true
,
},
emptyUnableToConnectSvgPath
:
{
emptyUnableToConnectSvgPath
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
...
@@ -54,7 +58,7 @@
...
@@ -54,7 +58,7 @@
buttonPath
:
this
.
documentationPath
,
buttonPath
:
this
.
documentationPath
,
},
},
noData
:
{
noData
:
{
svgUrl
:
this
.
empty
UnableToConnect
SvgPath
,
svgUrl
:
this
.
empty
NoData
SvgPath
,
title
:
'
No data found
'
,
title
:
'
No data found
'
,
description
:
`You are connected to the Prometheus server, but there is currently
description
:
`You are connected to the Prometheus server, but there is currently
no data to display.`
,
no data to display.`
,
...
...
app/views/projects/environments/metrics.html.haml
View file @
8d1be1af
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
"documentation-path"
:
help_page_path
(
'administration/monitoring/prometheus/index.md'
),
"documentation-path"
:
help_page_path
(
'administration/monitoring/prometheus/index.md'
),
"empty-getting-started-svg-path"
:
image_path
(
'illustrations/monitoring/getting_started.svg'
),
"empty-getting-started-svg-path"
:
image_path
(
'illustrations/monitoring/getting_started.svg'
),
"empty-loading-svg-path"
:
image_path
(
'illustrations/monitoring/loading.svg'
),
"empty-loading-svg-path"
:
image_path
(
'illustrations/monitoring/loading.svg'
),
"empty-no-data-svg-path"
:
image_path
(
'illustrations/monitoring/no_data.svg'
),
"empty-unable-to-connect-svg-path"
:
image_path
(
'illustrations/monitoring/unable_to_connect.svg'
),
"empty-unable-to-connect-svg-path"
:
image_path
(
'illustrations/monitoring/unable_to_connect.svg'
),
"metrics-endpoint"
:
additional_metrics_project_environment_path
(
@project
,
@environment
,
format: :json
),
"metrics-endpoint"
:
additional_metrics_project_environment_path
(
@project
,
@environment
,
format: :json
),
"deployment-endpoint"
:
project_environment_deployments_path
(
@project
,
@environment
,
format: :json
),
"deployment-endpoint"
:
project_environment_deployments_path
(
@project
,
@environment
,
format: :json
),
...
...
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