From 15908cf29099b994b4495ac864446ef2045d254c Mon Sep 17 00:00:00 2001 From: kushalpandya <kushal@gitlab.com> Date: Wed, 31 May 2017 17:09:21 +0530 Subject: [PATCH] Add Prometheus Metrics Bundle, panel for Missing environment variables --- app/views/projects/services/prometheus/_show.html.haml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 70f53bf..2f0f539 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -1,4 +1,7 @@ -.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring +- content_for :page_specific_javascripts do + = webpack_bundle_tag('prometheus_metrics') + +.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring.js-prometheus-metrics-monitoring .col-lg-3 %h4.prepend-top-0 Metrics @@ -8,14 +11,28 @@ More information .col-lg-9 - .panel.panel-default + .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } } .panel-heading %h3.panel-title Monitored %span.badge-count.js-monitored-count 0 .panel-body - .empty-metrics + .loading-metrics.js-loading-metrics + = icon('spinner spin 3x') + %p Finding and configuring metrics... + .empty-metrics.hidden.js-empty-metrics = custom_icon('icon_empty_metrics') %p No metrics are being monitored. To start monitoring, deploy to an environment. = link_to project_environments_path(@project), title: 'View environments', class: 'btn btn-success' do - View environments \ No newline at end of file + View environments + %ul.metrics-list.hidden.js-metrics-list + + .panel.panel-default.js-panel-missing-env-vars + .panel-heading + %h3.panel-title + = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') + Missing environment variable(s) + %span.badge-count.js-env-var-count 0 + .panel-body.hidden + .empty-metrics + %p Nothing to show here at the moment \ No newline at end of file -- libgit2 0.27.1