ovirt_metrics 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46aa30051329934e20b2d398bea92e479b9c83d5
-  data.tar.gz: e76da24f38bf64960e153e6bdb3bbb799ed46532
+  metadata.gz: b8f6eb0cee5ba8ae32e0f2fa316048a258204db1
+  data.tar.gz: 16b8c4b956bdbf7016483bb4dc225dde3779a6c7
 SHA512:
-  metadata.gz: 02aae111c03834c1df61d379c8c272a197ed21e46c349a66fc68261e5ce0467ef636e4c64099a6b730b57338192b89048a583518ff09ddfad681487a5b150780
-  data.tar.gz: b6622dbb636612cb2650ea10dfc0793e8c2efcb989e2f5557b4a2d7c0e317171adcc4d42acdeda6bb228f219072b35e05d3273cd6534ca4377f963472ac2c400
+  metadata.gz: ebde982b37176d5d7374792f54508747feda496cc2b4a4166548c6117c3fae3fab73a1a1fc434c39a16ceb727f665c7f85fd7d535acf6474927766137395520e
+  data.tar.gz: b215b596b463b6c07b7230ada719f7f07c1c642ac28c807e7d5c93f0a266393dc17c6614a7306e8b84b227c64d0278c61a1864f588e4baf484378ca5ab5b8164

data/lib/ovirt_metrics.rb

@@ -1,5 +1,6 @@
 require "active_record"
 require "ovirt_metrics/version"
+require "ovirt_metrics/configurator"
 require "ovirt_metrics/column_definitions"
 require "ovirt_metrics/nic_metrics"
 
@@ -12,6 +13,12 @@ module OvirtMetrics
   DEFAULT_HISTORY_DATABASE_NAME_3_0 = "rhevm_history".freeze
   VM_NOT_RUNNING                    = 0
 
+  def self.config
+    @config ||= Configurator.new
+    yield @config if block_given?
+    @config
+  end
+
   def self.establish_connection(opts)
     self.connect(opts)
   end
@@ -38,8 +45,15 @@ module OvirtMetrics
     OvirtHistory.establish_connection(opts)
   end
 
+  # Note: This method is expected to raise PGErrors and other exceptions
   def self.connected?
-    OvirtHistory.connection.active?
+    OvirtHistory.connection.active? && OvirtHistory.connected?
+  rescue ActiveRecord::ConnectionNotEstablished => e
+    if e.message =~ /No connection pool.+found/
+      false
+    else
+      raise
+    end
   end
 
   def self.disconnect
@@ -59,7 +73,14 @@ module OvirtMetrics
     host_realtime_metrics_to_hashes(metrics, nic_metrics)
   end
 
-  private
+  def self.warn(message)
+    unless config.suppress_warnings
+      puts "#{message}  To hide this warning, use OvirtMetrics.config.suppress_warnings = true"
+    end
+  end
+
+  # The methods below this line are PRIVATE not meant to be used out of the scope
+  # of this class. TODO refactor to force privacy or remove this line.
 
   def self.query_host_realtime_metrics(host_id, start_time = nil, end_time = nil)
     HostSamplesHistory.where(:host_id => host_id).includes(:host_configuration).with_time_range(start_time, end_time)
@@ -82,10 +103,14 @@ module OvirtMetrics
   end
 
   def self.query_vm_disk_realtime_metrics(vm_id, start_time = nil, end_time = nil)
-    disk_ids = DisksVmMap.where(:vm_id => vm_id).collect(&:vm_disk_id)
+    disk_ids = vms_disk_ids_for(vm_id)
     VmDiskSamplesHistory.where(:vm_disk_id => disk_ids).with_time_range(start_time, end_time)
   end
 
+  def self.vms_disk_ids_for(vm_id)
+    VmDeviceHistory.where(:vm_id => vm_id).disks.attached.pluck('DISTINCT device_id')
+  end
+
   def self.query_vm_nic_realtime_metrics(vm_id, start_time = nil, end_time = nil)
     nic_ids = VmInterfaceConfiguration.where(:vm_id => vm_id).collect(&:vm_interface_id)
     VmInterfaceSamplesHistory.where(:vm_interface_id => nic_ids).with_time_range(start_time, end_time)

data/lib/ovirt_metrics/configurator.rb

@@ -0,0 +1,24 @@
+module OvirtMetrics
+  class Configurator
+    def initialize
+      self.suppress_warnings = false
+      self.connection_specification_name = 'ovirt_metrics' if ActiveRecord::VERSION::MAJOR >= 5
+    end
+
+    attr_accessor :suppress_warnings
+
+    attr_reader :connection_specification_name
+
+    def connection_specification_name=(value)
+      if ActiveRecord::VERSION::MAJOR < 5
+        OvirtMetrics.warn "WARNING: ovirt_metric's " \
+          "connection_specification_name option is only available with " \
+          "Active Record 5 or newer. The main application pool " \
+          "('primary') will be used by default until you connect to a " \
+          "separate Ovirt database."
+      else
+        @connection_specification_name = value
+      end
+    end
+  end
+end

data/lib/ovirt_metrics/models/ovirt_history.rb

@@ -1,8 +1,17 @@
 module OvirtMetrics
   class OvirtHistory < ActiveRecord::Base
+    attr_writer :connection_specification_name if ActiveRecord::VERSION::MAJOR < 5
+
     self.abstract_class = true
     self.pluralize_table_names = false
 
+    def self.connection_specification_name
+      if !defined?(@connection_specification_name) || @connection_specification_name.nil?
+        return self == OvirtHistory ? OvirtMetrics.config.connection_specification_name : superclass.connection_specification_name
+      end
+      @connection_specification_name
+    end
+
     def self.with_time_range(start_time = nil, end_time = nil)
       return all if start_time.nil?
       where(:history_datetime => (start_time..(end_time || Time.now.utc)))

data/lib/ovirt_metrics/models/vm_device_history.rb

@@ -0,0 +1,10 @@
+module OvirtMetrics
+  class VmDeviceHistory < OvirtHistory
+    # have to rename the inheritance_column since this table has a column
+    # called "type"
+    self.inheritance_column = :_type_disabled
+
+    scope :disks,    -> { where(:type => "disk") }
+    scope :attached, -> { where(:delete_date => nil) }
+  end
+end

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/ovirt_metrics_spec.rb

@@ -1,6 +1,36 @@
 describe OvirtMetrics do
   shared_examples_for "OvirtMetrics" do |multiplication_required|
     let(:multiplication_required) { multiplication_required }
+    describe ".vms_disk_ids_for" do
+      before(:each) do
+        @vm1_id = 1
+        @device_id1 = "device1"
+        @device_id2 = "device2"
+        generic_params = {
+          :vm_id       => @vm1_id,
+          :device_id   => @device_id1,
+          :type        => "disk",
+          :address     => "address",
+          :create_date => 1.week.ago
+        }
+        OvirtMetrics::VmDeviceHistory.create(generic_params)
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:address => "duplicate_with_same_device_id"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:device_id => @device_id2))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:vm_id => 2, :device_id => "disk_from_other_vm"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:type      => "nic",
+                                                                  :device_id => "device_of_non_disk_type"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:device_id   => "device_that_was_deleted",
+                                                                  :delete_date => 2.days.ago))
+      end
+
+      subject { described_class.vms_disk_ids_for(@vm1_id) }
+
+      it { is_expected.to match_array([@device_id1, @device_id2]) }
+      it { is_expected.not_to include("disk_from_other_vm") }
+      it { is_expected.not_to include("device_of_non_disk_type") }
+      it { is_expected.not_to include("device_that_was_deleted") }
+    end
+
     context ".vm_realtime" do
       it "when vm_id finds no matches" do
         expect(described_class.vm_realtime(42)).to eq([{}, {}])
@@ -57,11 +87,6 @@ describe OvirtMetrics do
 
   end
 
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
-    it_should_behave_like "OvirtMetrics", true
-  end
-
   context "RHEV 3.1" do
     before(:each) { load_rhev_31 }
     it_should_behave_like "OvirtMetrics", true

data/spec/spec_helper.rb

@@ -77,6 +77,7 @@ RSpec.configure do |config|
 end
 
 require 'support/active_record'
+require 'ovirt_metrics'
 
 begin
   require 'coveralls'
@@ -84,4 +85,11 @@ begin
 rescue LoadError
 end
 
-require 'ovirt_metrics'
+OvirtMetrics.config do |c|
+  # Necessary because you currently cannot specify the
+  # connection name for ActiveRecord::Schema, which we use
+  # in tests to reset db schema for different RHEV versions.
+  c.connection_specification_name = 'primary' if ActiveRecord::VERSION::MAJOR >= 5
+end
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+

data/spec/support/active_record.rb

@@ -1,7 +1,5 @@
 require 'active_record'
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
-
 module ActiveModel::Validations
   # Extension to enhance `should have` on AR Model instances.  Calls
   # model.valid? in order to prepare the object's errors object.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,7 @@ files:
 - lib/active_record/connection_adapters/ovirt_legacy_postgresql_adapter.rb
 - lib/ovirt_metrics.rb
 - lib/ovirt_metrics/column_definitions.rb
+- lib/ovirt_metrics/configurator.rb
 - lib/ovirt_metrics/models/calendar.rb
 - lib/ovirt_metrics/models/cluster_configuration.rb
 - lib/ovirt_metrics/models/datacenter_configuration.rb
@@ -204,6 +205,7 @@ files:
 - lib/ovirt_metrics/models/tag_relations_history.rb
 - lib/ovirt_metrics/models/vm_configuration.rb
 - lib/ovirt_metrics/models/vm_daily_history.rb
+- lib/ovirt_metrics/models/vm_device_history.rb
 - lib/ovirt_metrics/models/vm_disk_configuration.rb
 - lib/ovirt_metrics/models/vm_disk_daily_history.rb
 - lib/ovirt_metrics/models/vm_disk_hourly_history.rb