Commit e3c1b6fb authored by Peter Leitzen's avatar Peter Leitzen

Merge branch '122013-add_path_to_logs' into 'master'

Add logs-path to metrics data

See merge request gitlab-org/gitlab!23475
parents ebb80e40 33c45e98
...@@ -46,7 +46,8 @@ module EE ...@@ -46,7 +46,8 @@ module EE
"validate-query-path" => validate_query_project_prometheus_metrics_path(project), "validate-query-path" => validate_query_project_prometheus_metrics_path(project),
"custom-metrics-available" => "#{custom_metrics_available?(project)}", "custom-metrics-available" => "#{custom_metrics_available?(project)}",
"alerts-endpoint" => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json), "alerts-endpoint" => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
"prometheus-alerts-available" => "#{can?(current_user, :read_prometheus_alerts, project)}" "prometheus-alerts-available" => "#{can?(current_user, :read_prometheus_alerts, project)}",
"logs-path" => project_logs_path(project)
} }
super.merge(ee_metrics_data) super.merge(ee_metrics_data)
......
...@@ -26,7 +26,8 @@ describe EnvironmentsHelper do ...@@ -26,7 +26,8 @@ describe EnvironmentsHelper do
'validate-query-path' => validate_query_project_prometheus_metrics_path(project), 'validate-query-path' => validate_query_project_prometheus_metrics_path(project),
'custom-metrics-available' => 'false', 'custom-metrics-available' => 'false',
'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json), 'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
'prometheus-alerts-available' => 'true' 'prometheus-alerts-available' => 'true',
'logs-path' => project_logs_path(project)
) )
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment