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
d5f9d73f
Commit
d5f9d73f
authored
Mar 19, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences for clusters/show
parent
159c0d36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
app/views/clusters/clusters/show.html.haml
app/views/clusters/clusters/show.html.haml
+1
-3
ee/app/views/projects/clusters/_health.html.haml
ee/app/views/projects/clusters/_health.html.haml
+16
-15
No files found.
app/views/clusters/clusters/show.html.haml
View file @
d5f9d73f
...
...
@@ -34,9 +34,7 @@
=
render
'banner'
=
render
'form'
-# EE-specific
-
if
@cluster
.
project_type?
&&
@cluster
.
project
.
feature_available?
(
:cluster_health
)
=
render
'health'
=
render_if_exists
'health'
.cluster-applications-table
#js-cluster-applications
...
...
ee/app/views/projects/clusters/_health.html.haml
View file @
d5f9d73f
%section
.settings.no-animate.expanded.cluster-health-graphs
#cluster-health
%h4
=
s_
(
'ClusterIntegration|Cluster health'
)
-
if
@cluster
.
project_type?
&&
@cluster
.
project
.
feature_available?
(
:cluster_health
)
%section
.settings.no-animate.expanded.cluster-health-graphs
#cluster-health
%h4
=
s_
(
'ClusterIntegration|Cluster health'
)
-
if
@cluster
&
.
application_prometheus_available?
#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'
),
"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'
),
"metrics-endpoint"
:
metrics_namespace_project_cluster_path
(
format: :json
),
"project-path"
:
project_path
(
@project
),
"tags-path"
:
project_tags_path
(
@project
)
}
}
-
if
@cluster
&
.
application_prometheus_available?
#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'
),
"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'
),
"metrics-endpoint"
:
metrics_namespace_project_cluster_path
(
format: :json
),
"project-path"
:
project_path
(
@project
),
"tags-path"
:
project_tags_path
(
@project
)
}
}
-
else
%p
.settings-message.text-center
=
s_
(
"ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus below."
)
-
else
%p
.settings-message.text-center
=
s_
(
"ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus below."
)
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