diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-28 13:42:54 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-28 13:42:54 +0300 |
commit | cf200b64d8f4aa70a97b9d1b672a93e813587630 (patch) | |
tree | b907b925d977d0f093f1a08118f24562c04d5ae7 /lib | |
parent | 11f8a97f4a53b0f9bd2271d8dee02e7b5cfe252b (diff) | |
parent | 2cd7b783910230bec4c6a704d820631e3ff048ed (diff) |
Merge branch '51970-correct-ordering-of-metrics' into 'master'
Correct the ordering of metrics on performance dashboard
Closes #51970
See merge request gitlab-org/gitlab-ce!23630
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/prometheus/metric_group.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb index 8f30cdee232..394556e8708 100644 --- a/lib/gitlab/prometheus/metric_group.rb +++ b/lib/gitlab/prometheus/metric_group.rb @@ -10,9 +10,15 @@ module Gitlab validates :name, :priority, :metrics, presence: true def self.common_metrics - ::PrometheusMetric.common.group_by(&:group_title).map do |name, metrics| - MetricGroup.new(name: name, priority: 0, metrics: metrics.map(&:to_query_metric)) + all_groups = ::PrometheusMetric.common.group_by(&:group_title).map do |name, metrics| + MetricGroup.new( + name: name, + priority: metrics.map(&:priority).max, + metrics: metrics.map(&:to_query_metric) + ) end + + all_groups.sort_by(&:priority).reverse end # EE only |