diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
commit | 903ccf7c93eb9490c76857bffe744249cc07de09 (patch) | |
tree | 603a3162e91999160e4efc74f351f9405f422d61 /app/helpers/environments_helper.rb | |
parent | 41cb558299b483b44b45351730ee4c0e9fe4ca2c (diff) | |
download | gitlab-ce-903ccf7c93eb9490c76857bffe744249cc07de09.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/environments_helper.rb')
-rw-r--r-- | app/helpers/environments_helper.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb index fcf99644e66..5b640ea6538 100644 --- a/app/helpers/environments_helper.rb +++ b/app/helpers/environments_helper.rb @@ -18,6 +18,10 @@ module EnvironmentsHelper } end + def custom_metrics_available?(project) + can?(current_user, :admin_project, project) + end + def metrics_data(project, environment) { "settings-path" => edit_project_service_path(project, 'prometheus'), @@ -39,7 +43,10 @@ module EnvironmentsHelper "has-metrics" => "#{environment.has_metrics?}", "prometheus-status" => "#{environment.prometheus_status}", "external-dashboard-url" => project.metrics_setting_external_dashboard_url, - "environment-state" => "#{environment.state}" + "environment-state" => "#{environment.state}", + "custom-metrics-path" => project_prometheus_metrics_path(project), + "validate-query-path" => validate_query_project_prometheus_metrics_path(project), + "custom-metrics-available" => "#{custom_metrics_available?(project)}" } end |