From 2e302e35e798ae171e08c08b81092e12c34dcfc7 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 26 May 2017 19:54:10 +0530 Subject: Prometheus Metrics Panel View --- .../projects/services/prometheus/_show.html.haml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/views/projects/services/prometheus/_show.html.haml (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml new file mode 100644 index 00000000000..70f53bffe58 --- /dev/null +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -0,0 +1,21 @@ +.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring + .col-lg-3 + %h4.prepend-top-0 + Metrics + %p + Metrics are automatically configured and monitored + based on a library of metrics from popular exporters. + More information + + .col-lg-9 + .panel.panel-default + .panel-heading + %h3.panel-title + Monitored + %span.badge-count.js-monitored-count 0 + .panel-body + .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 -- cgit v1.2.1 From 15908cf29099b994b4495ac864446ef2045d254c Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Wed, 31 May 2017 17:09:21 +0530 Subject: Add Prometheus Metrics Bundle, panel for Missing environment variables --- .../projects/services/prometheus/_show.html.haml | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 70f53bffe58..2f0f539560a 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 -- cgit v1.2.1 From 5cccbde4c66eaf22fc45da5a8d87a3f05552ecc7 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Wed, 31 May 2017 19:05:26 +0530 Subject: Populate Missing env var panel --- app/views/projects/services/prometheus/_show.html.haml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 2f0f539560a..3192116d128 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -8,7 +8,7 @@ %p Metrics are automatically configured and monitored based on a library of metrics from popular exporters. - More information + = link_to 'More information', '#' .col-lg-9 .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } } @@ -27,12 +27,19 @@ View environments %ul.metrics-list.hidden.js-metrics-list - .panel.panel-default.js-panel-missing-env-vars + .panel.panel-default.hidden.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 + .flash-container + .flash-notice + .flash-text + To set up automatic monitoring, add the environment variable + %code + $CI_ENVIRONMENT_SLUG + to exporter's queries. + = link_to 'More information', '#' + %ul.metrics-list.js-missing-var-metrics-list \ No newline at end of file -- cgit v1.2.1 From 85b6b9b6aa3f76bd7e6ea764a49829afbfba9de8 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Wed, 31 May 2017 20:17:31 +0530 Subject: Lint: Fix missing new line at EOF --- app/views/projects/services/prometheus/_show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 3192116d128..bf8bfe4ddcb 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -42,4 +42,4 @@ $CI_ENVIRONMENT_SLUG to exporter's queries. = link_to 'More information', '#' - %ul.metrics-list.js-missing-var-metrics-list \ No newline at end of file + %ul.metrics-list.js-missing-var-metrics-list -- cgit v1.2.1 From 4826ae074f2757e2ca7cddbb201688a11bcf8f8b Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 1 Jun 2017 13:25:48 +0530 Subject: Changes based on UX review --- app/views/projects/services/prometheus/_show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index bf8bfe4ddcb..82d4dd2488f 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -31,7 +31,7 @@ .panel-heading %h3.panel-title = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') - Missing environment variable(s) + Missing environment variable %span.badge-count.js-env-var-count 0 .panel-body.hidden .flash-container @@ -40,6 +40,6 @@ To set up automatic monitoring, add the environment variable %code $CI_ENVIRONMENT_SLUG - to exporter's queries. + to exporter’s queries. = link_to 'More information', '#' %ul.metrics-list.js-missing-var-metrics-list -- cgit v1.2.1 From 3f0eff82592f4a30abb6ffd15ac248a5f773c994 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 1 Jun 2017 21:24:56 +0530 Subject: Update as per review feedback --- app/views/projects/services/prometheus/_show.html.haml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 82d4dd2488f..f0bd8c8bee9 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -11,28 +11,28 @@ = link_to 'More information', '#' .col-lg-9 - .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } } + .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 + %span.badge.js-monitored-count 0 .panel-body .loading-metrics.js-loading-metrics - = icon('spinner spin 3x') + = icon('spinner spin 3x', class: 'metrics-load-spinner') %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 - %ul.metrics-list.hidden.js-metrics-list + %ul.list-unstyled.metrics-list.hidden.js-metrics-list .panel.panel-default.hidden.js-panel-missing-env-vars .panel-heading %h3.panel-title - = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') + = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') Missing environment variable - %span.badge-count.js-env-var-count 0 + %span.badge.js-env-var-count 0 .panel-body.hidden .flash-container .flash-notice @@ -42,4 +42,4 @@ $CI_ENVIRONMENT_SLUG to exporter’s queries. = link_to 'More information', '#' - %ul.metrics-list.js-missing-var-metrics-list + %ul.list-unstyled.metrics-list.js-missing-var-metrics-list -- cgit v1.2.1 From 223abc6df005beba45a514b44af7227b224dadd3 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 2 Jun 2017 17:03:30 +0530 Subject: Use `.text-center` class instead of text-align prop --- app/views/projects/services/prometheus/_show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index f0bd8c8bee9..c4ac384ca1a 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -17,10 +17,10 @@ Monitored %span.badge.js-monitored-count 0 .panel-body - .loading-metrics.js-loading-metrics + .loading-metrics.text-center.js-loading-metrics = icon('spinner spin 3x', class: 'metrics-load-spinner') %p Finding and configuring metrics... - .empty-metrics.hidden.js-empty-metrics + .empty-metrics.text-center.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 -- cgit v1.2.1 From fe13f110412d85c05dc68e5ee1db499f681bf722 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 29 Jun 2017 12:06:35 -0500 Subject: Create and use project path helpers that only need a project, no namespace --- app/views/projects/services/prometheus/_show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index c4ac384ca1a..0996ec06ab7 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -11,7 +11,7 @@ = link_to 'More information', '#' .col-lg-9 - .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project, :json)}" } } + .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{project_prometheus_active_metrics_path(@project, :json)}" } } .panel-heading %h3.panel-title Monitored -- cgit v1.2.1 From 3fc2cbf9f677a2860ed985bc8e51c3c6eff362d2 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Fri, 7 Jul 2017 17:21:03 +0200 Subject: Mor info about prometheus service configuration, and fixing problems with missing labels --- app/views/projects/services/prometheus/_show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/services/prometheus') diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 0996ec06ab7..d8e11500964 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -8,7 +8,7 @@ %p Metrics are automatically configured and monitored based on a library of metrics from popular exporters. - = link_to 'More information', '#' + = link_to 'More information', help_page_path('user/project/integrations/prometheus') .col-lg-9 .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{project_prometheus_active_metrics_path(@project, :json)}" } } @@ -41,5 +41,5 @@ %code $CI_ENVIRONMENT_SLUG to exporter’s queries. - = link_to 'More information', '#' + = link_to 'More information', help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels') %ul.list-unstyled.metrics-list.js-missing-var-metrics-list -- cgit v1.2.1