diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 22:47:24 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 22:47:24 +0000 |
| commit | 1558bd1263ffa733f70d9b1268d2010bc0f704b8 (patch) | |
| tree | 55b5eb4f9d595f183a0762febbe8f1e5994f6ccb /app/views | |
| parent | fa797c42edc6f0eca6d5640231270c15fd59dad9 (diff) | |
| parent | 8780abfd55c9b2917c3716fc4b67437c52369b60 (diff) | |
| download | gitlab-ce-1558bd1263ffa733f70d9b1268d2010bc0f704b8.tar.gz | |
Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'
backport of custom metrics for the common metrics section of CE
See merge request gitlab-org/gitlab-ce!17586
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/services/prometheus/_show.html.haml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 6dc2b85fd32..43e6a173108 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -7,21 +7,19 @@ = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus') .col-lg-9 - .panel.panel-default.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(@project, :json) } } + .panel.panel-default.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(@project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } } .panel-heading %h3.panel-title - = s_('PrometheusService|Monitored') + = s_('PrometheusService|Common metrics') %span.badge.js-monitored-count 0 .panel-body - .loading-metrics.text-center.js-loading-metrics - = icon('spinner spin 3x', class: 'metrics-load-spinner') - %p + .loading-metrics.js-loading-metrics + %p.prepend-top-10.prepend-left-10 + = icon('spinner spin', class: 'metrics-load-spinner') = s_('PrometheusService|Finding and configuring metrics...') - .empty-metrics.text-center.hidden.js-empty-metrics - = custom_icon('icon_empty_metrics') - %p - = s_('PrometheusService|No metrics are being monitored. To start monitoring, deploy to an environment.') - = link_to s_('PrometheusService|View environments'), project_environments_path(@project), class: 'btn btn-success' + .empty-metrics.hidden.js-empty-metrics + %p.text-tertiary.prepend-top-10.prepend-left-10 + = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics') %ul.list-unstyled.metrics-list.hidden.js-metrics-list .panel.panel-default.hidden.js-panel-missing-env-vars |