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
830ed6e9
Commit
830ed6e9
authored
Apr 21, 2020
by
Vitali Tatarintev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont merge alerts-endpoint to cluster health data
`alerts-endoint` key is calculated inside `ClusterablePresenter`
parent
83bc462c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
ee/app/views/clusters/clusters/_health.html.haml
ee/app/views/clusters/clusters/_health.html.haml
+1
-2
No files found.
ee/app/views/clusters/clusters/_health.html.haml
View file @
830ed6e9
%section
.settings.no-animate.expanded.cluster-health-graphs.qa-cluster-health-section
#cluster-health
-
if
@cluster
&
.
application_prometheus_available?
#prometheus-graphs
{
data:
@cluster
.
health_data
(
clusterable
).
merge
({
"alerts-endpoint"
=>
(
'/'
if
Feature
.
enabled?
(
:prometheus_computed_alerts
)),
"prometheus-alerts-available"
=>
(
'true'
if
Feature
.
enabled?
(
:prometheus_computed_alerts
))
})
}
#prometheus-graphs
{
data:
@cluster
.
health_data
(
clusterable
)
}
-
else
%p
.settings-message.text-center
=
s_
(
"ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus in the Applications tab."
)
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