diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-07-25 09:31:50 +0100 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-07-25 09:39:39 +0100 |
commit | fab7dacc2614142dcc7d57a7199ea0db4f05f38e (patch) | |
tree | aba3c041de7547d4d377485bb8b8baed0d2ee2a2 /lib/gitlab/prometheus/queries | |
parent | f7abde937dda342ee78618f26ee8f86f46e9072d (diff) | |
download | gitlab-ce-fab7dacc2614142dcc7d57a7199ea0db4f05f38e.tar.gz |
Updates CE backportce-5158-metrics-alerting
Diffstat (limited to 'lib/gitlab/prometheus/queries')
-rw-r--r-- | lib/gitlab/prometheus/queries/query_additional_metrics.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb index ddddc299240..3be35f189d0 100644 --- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb +++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb @@ -14,12 +14,16 @@ module Gitlab lambda do |group| metrics = group.metrics.map do |metric| - { + metric_hsh = { title: metric.title, weight: metric.weight, y_label: metric.y_label, queries: metric.queries.map(&query_processor).select(&method(:query_with_result)) } + + metric_hsh[:id] = metric.id if metric.id + + metric_hsh end { |