Merge pull request ManageIQ#15549 from jntullo/enhancement/metric_rol…

…lups_api

rollups_in_range method

app/models/metric_rollup.rb

@@ -8,6 +8,8 @@ class MetricRollup < ApplicationRecord
                                 net_usage_rate_average derived_vm_used_disk_storage
                                 derived_vm_allocated_disk_storage).freeze
 
+  CAPTURE_INTERVAL_NAMES = %w(hourly daily).freeze
+
   #
   # min_max column getters
   #
@@ -53,6 +55,16 @@ def self.latest_rollups(resource_type, resource_ids = nil, capture_interval_name
     metrics.select('DISTINCT ON (metric_rollups.resource_id) metric_rollups.*')
   end
 
+  def self.rollups_in_range(resource_type, resource_ids, capture_interval_name, start_date, end_date = nil)
+    capture_interval_name ||= 'hourly'
+    end_date = end_date.nil? ? Time.zone.today : end_date
+    metrics = where(:resource_type         => resource_type,
+                    :capture_interval_name => capture_interval_name,
+                    :timestamp             => start_date.beginning_of_day...end_date.end_of_day)
+    metrics = metrics.where(:resource_id => resource_ids) if resource_ids
+    metrics
+  end
+
   def chargeback_fields_present?
     return @chargeback_fields_present if defined?(@chargeback_fields_present)
 

db/fixtures/miq_product_features.yml

@@ -6331,3 +6331,14 @@
       :description: Show Most Recent Alerts
       :feature_type: view
       :identifier: monitor_alerts_most_recent
+
+# Metrics
+- :name: Metrics
+  :description: Everything under Metrics
+  :feature_type: node
+  :identifier: metrics
+  :children:
+  - :name: View
+    :description: View Metrics
+    :feature_type: view
+    :identifier: metrics_view

spec/models/metric_rollup_spec.rb

@@ -17,4 +17,28 @@
       end.to raise_error ActiveRecord::EagerLoadPolymorphicError
     end
   end
+
+  context ".rollups_in_range" do
+    before do
+      @current = FactoryGirl.create_list(:metric_rollup_vm_hr, 2)
+      @past = FactoryGirl.create_list(:metric_rollup_vm_hr, 2, :timestamp => Time.now.utc - 5.days)
+    end
+
+    it "returns rollups from the correct range" do
+      rollups = described_class.rollups_in_range('VmOrTemplate', nil, 'hourly', Time.zone.today)
+
+      expect(rollups.size).to eq(2)
+      expect(rollups.pluck(:id)).to match_array(@current.pluck(:id))
+
+      rollups = described_class.rollups_in_range('VmOrTemplate', nil, 'hourly', Time.zone.today - 5.days, Time.zone.today - 4.days)
+
+      expect(rollups.size).to eq(2)
+      expect(rollups.pluck(:id)).to match_array(@past.pluck(:id))
+
+      rollups = described_class.rollups_in_range('VmOrTemplate', nil, 'hourly', Time.zone.today - 5.days)
+
+      expect(rollups.size).to eq(4)
+      expect(rollups.pluck(:id)).to match_array(@current.pluck(:id) + @past.pluck(:id))
+    end
+  end
 end