ovirt_metrics 1.4.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b8f6eb0cee5ba8ae32e0f2fa316048a258204db1
-  data.tar.gz: 16b8c4b956bdbf7016483bb4dc225dde3779a6c7
+SHA256:
+  metadata.gz: 7f0ba1b25053d917e9c2d6f5e7f9cb235deef53a597bad8cb9523329cfa5ce74
+  data.tar.gz: 4a6bc156bf7fccad545193483265a57e19c11beca06aa5ff49071cc4fbce531f
 SHA512:
-  metadata.gz: ebde982b37176d5d7374792f54508747feda496cc2b4a4166548c6117c3fae3fab73a1a1fc434c39a16ceb727f665c7f85fd7d535acf6474927766137395520e
-  data.tar.gz: b215b596b463b6c07b7230ada719f7f07c1c642ac28c807e7d5c93f0a266393dc17c6614a7306e8b84b227c64d0278c61a1864f588e4baf484378ca5ab5b8164
+  metadata.gz: 623f858aa39b3a53716a72e8d20a1e9fbb31b68d23737e200a5b9223de4b199f9c5d356da898936929d4082f25949b84153dd823c88bd3b32dc134f785234e66
+  data.tar.gz: bf77f0ac83a14b57b22f6b5e7b6590487c84bfca65fd58acf17183deb4247703763f8d8806a9b46da5198a4152ff02a760850616b0de665f039ce923477adab1

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/ManageIQ/ovirt_metrics.svg?branch=master)](https://travis-ci.org/ManageIQ/ovirt_metrics)
 [![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/ovirt_metrics.svg)](https://codeclimate.com/github/ManageIQ/ovirt_metrics)
 [![Coverage Status](http://img.shields.io/coveralls/ManageIQ/ovirt_metrics.svg)](https://coveralls.io/r/ManageIQ/ovirt_metrics)
-[![Dependency Status](https://gemnasium.com/ManageIQ/ovirt_metrics.svg)](https://gemnasium.com/ManageIQ/ovirt_metrics)
 
 OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 

data/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module ConnectionHandling # :nodoc:
+    def ovirt_postgresql_connection(config)
+      conn_params = config.symbolize_keys
+
+      conn_params.delete_if { |_, v| v.nil? }
+
+      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
+      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
+
+      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      conn_params.slice!(*valid_conn_param_keys)
+
+      ConnectionAdapters::OvirtPostgreSQLAdapter.new(nil, logger, conn_params, config)
+    end
+  end
+
+  module ConnectionAdapters
+    class OvirtPostgreSQLAdapter < PostgreSQLAdapter
+      ADAPTER_NAME = "OvirtPostgreSQL"
+
+      def check_version
+        msg = "The version of PostgreSQL (#{postgresql_version}) is too old (9.2+ required)"
+        if postgresql_version < 90200
+          raise msg
+        end
+      end
+    end
+  end
+end

data/lib/ovirt_metrics.rb

@@ -27,14 +27,10 @@ module OvirtMetrics
     opts            ||= {}
     opts[:port]     ||= 5432
     opts[:database] ||= DEFAULT_HISTORY_DATABASE_NAME
-    opts[:adapter]    = begin
-                          if ActiveRecord::VERSION::MAJOR > 4
-                            require "active_record/connection_adapters/ovirt_legacy_postgresql_adapter"
-                            'ovirt_legacy_postgresql'
-                          else
-                            'postgresql'
-                          end
-                        end
+    opts[:adapter] = begin
+                       require "active_record/connection_adapters/ovirt_postgresql_adapter"
+                       'ovirt_postgresql'
+                     end
 
     # Don't allow accidental connections to localhost.  A blank host will
     # connect to localhost, so don't allow that at all.
@@ -111,8 +107,12 @@ module OvirtMetrics
     VmDeviceHistory.where(:vm_id => vm_id).disks.attached.pluck('DISTINCT device_id')
   end
 
+  def self.vms_nic_ids_for(vm_id)
+    VmDeviceHistory.where(:vm_id => vm_id).nics.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)
+    nic_ids = vms_nic_ids_for(vm_id)
     VmInterfaceSamplesHistory.where(:vm_interface_id => nic_ids).with_time_range(start_time, end_time)
   end
 

data/lib/ovirt_metrics/column_definitions.rb

@@ -21,7 +21,7 @@ module OvirtMetrics
         :counter_key           => "cpu_usagemhz_rate_average",
         :instance              => "",
         :capture_interval      => "20",
-        :precision             => 2,
+        :precision             => 1,
         :rollup                => "average",
         :unit_key              => "megahertz",
         :capture_interval_name => "realtime"
@@ -55,7 +55,7 @@ module OvirtMetrics
         :counter_key           => "disk_usage_rate_average",
         :instance              => "",
         :capture_interval      => "20",
-        :precision             => 2,
+        :precision             => 1,
         :rollup                => "average",
         :unit_key              => "kilobytespersecond",
         :capture_interval_name => "realtime"
@@ -69,7 +69,7 @@ module OvirtMetrics
         :counter_key           => "net_usage_rate_average",
         :instance              => "",
         :capture_interval      => "20",
-        :precision             => 2,
+        :precision             => 1,
         :rollup                => "average",
         :unit_key              => "kilobytespersecond",
         :capture_interval_name => "realtime"
@@ -89,7 +89,7 @@ module OvirtMetrics
         :counter_key           => "net_usage_rate_average",
         :instance              => "",
         :capture_interval      => "20",
-        :precision             => 2,
+        :precision             => 1,
         :rollup                => "average",
         :unit_key              => "kilobytespersecond",
         :capture_interval_name => "realtime"

data/lib/ovirt_metrics/models/host_configuration.rb

@@ -3,19 +3,5 @@ module OvirtMetrics
     has_many :host_interface_configurations, :foreign_key => :host_configuration_version
 
     belongs_to :cluster_configuration, :foreign_key => :cluster_configuration_version
-
-    GHZ_REGEX = /.*\@\s*(\d+\.\d+)GHz/
-    MHZ_REGEX = /.*\@\s*(\d+\.\d+)MHz/
-    def speed_in_mhz
-      if self.cpu_model.respond_to?(:match)
-        match = self.cpu_model.match(GHZ_REGEX)
-        return (match[1].to_f * 1024) if match
-
-        match = self.cpu_model.match(MHZ_REGEX)
-        return match[1].to_f if match
-      end
-
-      return nil
-    end
   end
 end

data/lib/ovirt_metrics/models/host_samples_history.rb

@@ -4,7 +4,7 @@ module OvirtMetrics
 
     def cpu_usagemhz_rate_average
       return 0.0 if self.host_configuration.nil?
-      speed_of_host = self.host_configuration.speed_in_mhz.to_f * self.host_configuration.number_of_cores.to_i
+      speed_of_host = self.host_configuration.cpu_speed_mh.to_f * self.host_configuration.number_of_cores.to_i
       return (speed_of_host * (self.cpu_usage_percent.to_f / 100.0))
     end
   end

data/lib/ovirt_metrics/models/vm_device_history.rb

@@ -5,6 +5,7 @@ module OvirtMetrics
     self.inheritance_column = :_type_disabled
 
     scope :disks,    -> { where(:type => "disk") }
+    scope :nics,     -> { where(:type => "interface") }
     scope :attached, -> { where(:delete_date => nil) }
   end
 end

data/lib/ovirt_metrics/models/vm_samples_history.rb

@@ -4,7 +4,7 @@ module OvirtMetrics
     belongs_to :vm_configuration,   :foreign_key => :vm_configuration_version
 
     def cpu_usagemhz_rate_average
-      speed_of_host = self.host_configuration.try(:speed_in_mhz).to_f
+      speed_of_host = self.host_configuration.try(:cpu_speed_mh).to_f
 
       # TODO: Research if self.host_configuration.speed_in_mhz is aggregate or per core/socket
       # enumerator    = self.vm_configuration.cpu_per_socket * self.vm_configuration.number_of_sockets

data/lib/ovirt_metrics/version.rb

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

data/spec/models/host_samples_history_spec.rb

@@ -9,25 +9,25 @@ describe OvirtMetrics::HostSamplesHistory do
 
       context "when host_configuration exists" do
         before(:each) { @host_configuration = OvirtMetrics::HostConfiguration.new }
-        it "and speed_in_mhz and number_of_cores is nil" do
+        it "and cpu_speed_mh and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
           expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
-        it "and speed_in_mhz is nil and number_of_cores is numeric" do
+        it "and cpu_speed_mh is nil and number_of_cores is numeric" do
           host_history = described_class.new(:host_configuration => @host_configuration)
           allow(@host_configuration).to receive_messages(:number_of_cores => 1)
           expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
-        it "and speed_in_mhz is numeric and number_of_cores is nil" do
+        it "and cpu_speed_mh is numeric and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          allow(@host_configuration).to receive_messages(:cpu_speed_mh => 2048.0)
           expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
-        it "and speed_in_mhz is numeric and number_of_cores is numeric" do
-          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+        it "and cpu_speed_mh is numeric and number_of_cores is numeric" do
+          allow(@host_configuration).to receive_messages(:cpu_speed_mh => 2048.0)
           allow(@host_configuration).to receive_messages(:number_of_cores => 2)
 
           host_history = described_class.new(
@@ -40,13 +40,13 @@ describe OvirtMetrics::HostSamplesHistory do
     end
   end
 
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
+  context "RHEV 3.1" do
+    before(:each) { load_rhev_31 }
     it_should_behave_like "HostSamplesHistory"
   end
 
-  context "RHEV 3.1" do
-    before(:each) { load_rhev_31 }
+  context "RHEV 4" do
+    before(:each) { load_rhev_40 }
     it_should_behave_like "HostSamplesHistory"
   end
 end

data/spec/models/vm_disk_samples_history_spec.rb

@@ -30,13 +30,13 @@ describe OvirtMetrics::VmDiskSamplesHistory do
     end
   end
 
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
+  context "RHEV 3.1" do
+    before(:each) { load_rhev_31 }
     it_should_behave_like "VmDiskSamplesHistory"
   end
 
-  context "RHEV 3.1" do
-    before(:each) { load_rhev_31 }
+  context "RHEV 4" do
+    before(:each) { load_rhev_40 }
     it_should_behave_like "VmDiskSamplesHistory"
   end
 end

data/spec/models/vm_samples_history_spec.rb

@@ -9,14 +9,14 @@ describe OvirtMetrics::VmSamplesHistory do
       end
 
       context "when host_configuration exists" do
-        it "and speed_in_mhz is nil" do
+        it "and cpu_speed_mh is nil" do
           vm_history = described_class.new(:host_configuration => OvirtMetrics::HostConfiguration.new)
           expect(vm_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
-        it "and speed_in_mhz is not nil" do
+        it "and cpu_speed_mh is not nil" do
           host_configuration = OvirtMetrics::HostConfiguration.new
-          allow(host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          allow(host_configuration).to receive_messages(:cpu_speed_mh => 2048.0)
 
           vm_history = described_class.new(
             :cpu_usage_percent  => 50,
@@ -28,11 +28,6 @@ describe OvirtMetrics::VmSamplesHistory do
     end
   end
 
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
-    it_should_behave_like "VmSamplesHistory"
-  end
-
   context "RHEV 3.1" do
     before(:each) { load_rhev_31 }
     it_should_behave_like "VmSamplesHistory"

data/spec/ovirt_metrics_spec.rb

@@ -31,6 +31,36 @@ describe OvirtMetrics do
       it { is_expected.not_to include("device_that_was_deleted") }
     end
 
+    describe ".vms_nic_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        => "interface",
+          :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      => "disk",
+                                                                  :device_id => "device_of_non_nic_type"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:device_id   => "device_that_was_deleted",
+                                                                  :delete_date => 2.days.ago))
+      end
+
+      subject { described_class.vms_nic_ids_for(@vm1_id) }
+
+      it { is_expected.to match_array([@device_id1, @device_id2]) }
+      it { is_expected.not_to include("nic_from_other_vm") }
+      it { is_expected.not_to include("device_of_non_nic_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([{}, {}])

data/spec/support/active_record.rb

@@ -29,12 +29,6 @@ RSpec.configure do |config|
   end
 end
 
-def load_rhev_30
-  ActiveRecord::Schema.verbose = false
-  load File.join(File.dirname(__FILE__), %w{.. schemas schema_rhev30.rb})
-  reset_models
-end
-
 def load_rhev_31
   ActiveRecord::Schema.verbose = false
   load File.join(File.dirname(__FILE__), %w{.. schemas schema_rhev31.rb})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +71,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -99,22 +99,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -141,39 +135,7 @@ files:
 - ".rspec"
 - LICENSE.txt
 - README.md
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/column.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/database_statements.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/explain_pretty_printer.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/array.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit_varying.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bytea.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/cidr.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/date_time.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/decimal.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/enum.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/hstore.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/inet.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/json.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/jsonb.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/money.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/point.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/rails_5_1_point.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/range.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/specialized_string.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/type_map_initializer.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/uuid.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/vector.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/xml.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/quoting.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/referential_integrity.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_definitions.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_dumper.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_statements.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/type_metadata.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql/utils.rb
-- lib/active_record/connection_adapters/ovirt_legacy_postgresql_adapter.rb
+- lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb
 - lib/ovirt_metrics.rb
 - lib/ovirt_metrics/column_definitions.rb
 - lib/ovirt_metrics/configurator.rb
@@ -221,13 +183,11 @@ files:
 - lib/ovirt_metrics/models/vm_samples_history.rb
 - lib/ovirt_metrics/nic_metrics.rb
 - lib/ovirt_metrics/version.rb
-- spec/models/host_configuration_spec.rb
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
 - spec/models/vm_samples_history_spec.rb
 - spec/nic_metrics_spec.rb
 - spec/ovirt_metrics_spec.rb
-- spec/schemas/schema_rhev30.rb
 - spec/schemas/schema_rhev31.rb
 - spec/schemas/schema_rhev40.rb
 - spec/spec_helper.rb
@@ -244,26 +204,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 test_files:
-- spec/models/host_configuration_spec.rb
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
 - spec/models/vm_samples_history_spec.rb
 - spec/nic_metrics_spec.rb
 - spec/ovirt_metrics_spec.rb
-- spec/schemas/schema_rhev30.rb
 - spec/schemas/schema_rhev31.rb
 - spec/schemas/schema_rhev40.rb
 - spec/spec_helper.rb