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:
authorPhil Hughes <me@iamphill.com>2018-07-05 10:42:00 +0300
committerPhil Hughes <me@iamphill.com>2018-07-05 10:42:00 +0300
commita43b7d4a33491a040432229ab91742d3a5981c0a (patch)
tree7f4ac4777a678335d35673f7d78a93b78b38aecf /app/views/projects/environments
parent5c847f1a914558b6ffac511b2ed498700489296f (diff)
parent786edcb4f92ec5eb15c38945da4517dee0d5c100 (diff)
Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into 'master'
Add `environment` drop down to Metrics dashboard Closes #45738 See merge request gitlab-org/gitlab-ce!19833
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r--app/views/projects/environments/metrics.html.haml9
1 files changed, 2 insertions, 7 deletions
diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml
index d6f0b230b58..290970a1045 100644
--- a/app/views/projects/environments/metrics.html.haml
+++ b/app/views/projects/environments/metrics.html.haml
@@ -2,15 +2,9 @@
- page_title "Metrics for environment", @environment.name
.prometheus-container{ class: container_class }
- .top-area
- .row
- .col-sm-6
- %h3
- Environment:
- = link_to @environment.name, environment_path(@environment)
-
#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'),
@@ -18,6 +12,7 @@
"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?}" } }