Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-06-25 12:57:29 +0300
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-07-25 11:39:39 +0300
commiteb7c08c7a644fa07b274b83624005ac53acf7faf (patch)
tree08102d7589a06e1aa550d1703a79f845b9333610 /app/views/projects/environments
parent4063141223f9b89248e3c33df5711201f75d3718 (diff)
Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5163 to CE
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r--app/views/projects/environments/metrics.html.haml22
1 files changed, 8 insertions, 14 deletions
diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml
index 290970a1045..af86b8e8e67 100644
--- a/app/views/projects/environments/metrics.html.haml
+++ b/app/views/projects/environments/metrics.html.haml
@@ -2,17 +2,11 @@
- page_title "Metrics for environment", @environment.name
.prometheus-container{ class: container_class }
- #prometheus-graphs{ data: { "settings-path": edit_project_service_path(@project, 'prometheus'),
- "clusters-path": project_clusters_path(@project),
- "current-environment-name": @environment.name,
- "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": additional_metrics_project_environment_path(@project, @environment, format: :json),
- "deployment-endpoint": project_environment_deployments_path(@project, @environment, format: :json),
- "environments-endpoint": project_environments_path(@project, format: :json),
- "project-path": project_path(@project),
- "tags-path": project_tags_path(@project),
- "has-metrics": "#{@environment.has_metrics?}" } }
+ .top-area
+ .row
+ .col-sm-6
+ %h3
+ Environment:
+ = link_to @environment.name, environment_path(@environment)
+
+ #prometheus-graphs{ data: metrics_data(@project, @environment) }