From 6a8ebf3f966cae5f82b8c4d154d091b683f0df92 Mon Sep 17 00:00:00 2001 From: Zahi Akiva Date: Tue, 18 Apr 2017 15:37:05 +0300 Subject: [PATCH] Fix Containers dashboard heatmaps --- app/models/metric/helper.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/metric/helper.rb b/app/models/metric/helper.rb index e4f138540a3..3550afbba0d 100644 --- a/app/models/metric/helper.rb +++ b/app/models/metric/helper.rb @@ -198,4 +198,12 @@ def self.get_time_interval(obj, timestamp) start_time..timestamp end + + def self.latest_metrics(resource_type, resource_ids = nil) + metrics = Metric.where(:resource_type => resource_type) + metrics = metrics.where(:resource_id => resource_ids) if resource_ids + metrics = metrics.order(:resource_id, :timestamp => :desc) + metrics = metrics.where('timestamp > ?', 10.minutes.ago.utc) + metrics.select('DISTINCT ON (metrics.resource_id) metrics.*') + end end