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
b78c370a
Commit
b78c370a
authored
Jun 06, 2019
by
Adriel Santiago
Committed by
Mike Greiling
Jun 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add frontend support for cluster health alerts
Adds a new query text input for metric alerts
parent
7d47ec54
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+4
-0
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+1
-0
No files found.
app/controllers/projects/clusters_controller.rb
View file @
b78c370a
...
@@ -4,6 +4,10 @@ class Projects::ClustersController < Clusters::ClustersController
...
@@ -4,6 +4,10 @@ class Projects::ClustersController < Clusters::ClustersController
prepend_before_action
:project
prepend_before_action
:project
before_action
:repository
before_action
:repository
before_action
do
push_frontend_feature_flag
(
:prometheus_computed_alerts
)
end
layout
'project'
layout
'project'
private
private
...
...
app/controllers/projects/environments_controller.rb
View file @
b78c370a
...
@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_show_multiple_dashboards
)
push_frontend_feature_flag
(
:environment_metrics_show_multiple_dashboards
)
push_frontend_feature_flag
(
:grafana_dashboard_link
)
push_frontend_feature_flag
(
:grafana_dashboard_link
)
push_frontend_feature_flag
(
:prometheus_computed_alerts
)
end
end
def
index
def
index
...
...
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