foreman_monitoring 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4006edcbe7c896898b2b9a2d68c23e0649925364efbc0f18d5bc09311d183cc7
-  data.tar.gz: 033ebafd117fdbab220bc2d64f9afdd844997c8f7af106f5df8f0bf53d48811b
+  metadata.gz: 83bf8624bc1c1ecbb9e8dc6c11340022a204244afe293789405cdaf9e80b10be
+  data.tar.gz: 0d3d42280a04d22a33792c03ed62aee41a9800cf6a307abb16a06589d03ea0af
 SHA512:
-  metadata.gz: b1eb8d83ffb58a6e7e7ee2cd6fcf048662029256dcb15738c5b9cfec6f675e67a00f10f8fcbf9601a80efdef6d9db3b8e4926cfadcec49f2b00972d10de6e762
-  data.tar.gz: bf7116a3092e7226a1513b6a83dde8f1cd51bfc05aac48c9c87cfd5890d6fb5b066ca96bc603d78b37edb061a3eb6e853361658408eda5b4a87fde2b7f0f2985
+  metadata.gz: 3ec31b7e2cf93786431ccbedbbb7ec36e4fdcce70bb4d2beb0c2faf741b9e3287ceec3878c5f168c09bcb2fe190694f1f5f77d435e3f686456d47dd0f90b57aa
+  data.tar.gz: 317ad1fdc9bf7a61008007b6b8edce1eec053aecf55cd0abcda95e97dfc670021c01100f5fbe2f30eebbc543ededbbe3e0f3a4811e44609716be9b570635ed77

data/README.md

@@ -17,7 +17,7 @@ The gem name is `foreman_monitoring`.
 
 RPM users can install the `tfm-rubygem-foreman_monitoring` package.
 
-Deb users can install the `ruby-foreman_monitoring` package.
+Deb users can install the `ruby-foreman-monitoring` package.
 
 If using the gem as installation source database enhancement and service restart must
 be done manually.
@@ -28,6 +28,13 @@ foreman-rake db:seed
 touch ~foreman/tmp/restart.txt
 ```
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| >= 1.15         | ~> 0.1         |
+| >= 1.17         | ~> 1.0         |
+
 # Usage
 
 For managing a host in the monitoring solution a Smart Proxy providing

data/app/controllers/api/v2/monitoring_results_controller.rb

@@ -18,7 +18,7 @@ module Api
       def create
         begin
           MonitoringResult.import(monitoring_result_params.with_indifferent_access)
-        rescue => e
+        rescue StandardError => e
           logger.error "Failed to import monitoring result: #{e.message}"
           logger.debug e.backtrace.join("\n")
           render :json => { 'message' => e.message }, :status => :unprocessable_entity

data/app/controllers/concerns/foreman_monitoring/hosts_controller_extensions.rb

@@ -1,18 +1,17 @@
 module ForemanMonitoring
   module HostsControllerExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :find_resource_with_monitoring, :only => [:downtime]
-      before_action :find_multiple_with_monitoring, :only => %i[select_multiple_downtime update_multiple_downtime
-                                                                select_multiple_monitoring_proxy update_multiple_monitoring_proxy]
-      before_action :validate_host_downtime_params, :only => [:downtime]
-      before_action :validate_hosts_downtime_params, :only => [:update_multiple_downtime]
-      before_action :validate_multiple_monitoring_proxy, :only => :update_multiple_monitoring_proxy
-
-      alias_method :find_resource_with_monitoring, :find_resource
-      alias_method :find_multiple_with_monitoring, :find_multiple
-      alias_method_chain :update_multiple_power_state, :monitoring
+    def self.prepended(base)
+      base.class_eval do
+        before_action :find_resource_with_monitoring, :only => [:downtime]
+        before_action :find_multiple_with_monitoring, :only => %i[select_multiple_downtime update_multiple_downtime
+                                                                  select_multiple_monitoring_proxy update_multiple_monitoring_proxy]
+        before_action :validate_host_downtime_params, :only => [:downtime]
+        before_action :validate_hosts_downtime_params, :only => [:update_multiple_downtime]
+        before_action :validate_multiple_monitoring_proxy, :only => :update_multiple_monitoring_proxy
+
+        alias_method :find_resource_with_monitoring, :find_resource
+        alias_method :find_multiple_with_monitoring, :find_multiple
+      end
     end
 
     def downtime
@@ -39,7 +38,7 @@ module ForemanMonitoring
             failed_hosts[host.name] = error_message
             logger.error "Failed to set a host downtime for #{host}: #{error_message}"
           end
-        rescue => error
+        rescue StandardError => error
           failed_hosts[host.name] = error
           Foreman::Logging.exception(_('Failed to set a host downtime for %s.') % host, error)
         end
@@ -65,7 +64,7 @@ module ForemanMonitoring
       update_multiple_proxy(_('Monitoring'), :monitoring_proxy=)
     end
 
-    def update_multiple_power_state_with_monitoring
+    def update_multiple_power_state
       options = {
         :comment => 'Power state changed in Foreman',
         :author => "Foreman User #{User.current}",
@@ -86,7 +85,7 @@ module ForemanMonitoring
           end
         end
       end
-      update_multiple_power_state_without_monitoring
+      super
     end
 
     private

data/app/helpers/concerns/foreman_monitoring/hosts_helper_ext.rb

@@ -1,18 +1,13 @@
 module ForemanMonitoring
   module HostsHelperExt
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :host_title_actions, :monitoring
-      alias_method_chain :multiple_actions, :monitoring
-    end
-
-    def multiple_actions_with_monitoring
-      return multiple_actions_without_monitoring unless authorized_for(:controller => :hosts, :action => :select_multiple_downtime)
-      multiple_actions_without_monitoring + [[_('Set downtime'), select_multiple_downtime_hosts_path], [_('Change Monitoring Proxy'), select_multiple_monitoring_proxy_hosts_path]]
+    def multiple_actions
+      actions = super
+      actions << [_('Set downtime'), select_multiple_downtime_hosts_path] if authorized_for(:controller => :hosts, :action => :select_multiple_downtime)
+      actions << [_('Change Monitoring Proxy'), select_multiple_monitoring_proxy_hosts_path] if authorized_for(:controller => :hosts, :action => :select_multiple_monitoring_proxy)
+      actions
     end
 
-    def host_title_actions_with_monitoring(host)
+    def host_title_actions(host)
       title_actions(
         button_group(
           display_link_if_authorized(_('Downtime'),
@@ -27,7 +22,7 @@ module ForemanMonitoring
                                                     :target => '#set_host_downtime' })
         )
       )
-      host_title_actions_without_monitoring(host)
+      super
     end
 
     def host_monitoring_result_icon_class(result)
@@ -58,10 +53,10 @@ module ForemanMonitoring
       end
     end
 
-    def monitoring_datetime_f(f, attr, options = {})
+    def datetime_f(f, attr, options = {})
       field(f, attr, options) do
         addClass options, 'form-control'
-        f.datetime_field attr, options
+        f.datetime_local_field attr, options
       end
     end
   end

data/app/lib/proxy_api/monitoring.rb

@@ -7,25 +7,25 @@ module ProxyAPI
 
     def create_host_downtime(host, args = {})
       parse(post(args, "downtime/host/#{host}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to set downtime for %s') % host)
     end
 
     def remove_host_downtime(host, args = {})
       parse(delete("downtime/host/#{host}?#{args.to_query}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to remove downtime for %s') % host)
     end
 
     def create_host(host, attributes = {})
       parse(put({ :attributes => attributes }, "host/#{host}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to create monitoring host object for %s') % host)
     end
 
     def update_host(host, attributes = {})
       parse(post({ :attributes => attributes }, "host/#{host}"))
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to update monitoring host object for %s') % host)
     end
 
@@ -34,7 +34,7 @@ module ProxyAPI
       parse(delete("host/#{host}"))
     rescue RestClient::ResourceNotFound
       true
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to delete monitoring host object for %s') % host)
     end
 
@@ -42,7 +42,7 @@ module ProxyAPI
       parse(get("host/#{host}"))
     rescue RestClient::ResourceNotFound
       nil
-    rescue => e
+    rescue StandardError => e
       raise ProxyException.new(url, e, N_('Unable to query monitoring host object for %{host}: %{message}') % { :host => host, :message => e.try(:response) || e.try(:message) })
     end
   end

data/app/models/concerns/foreman_monitoring/host_extensions.rb

@@ -1,15 +1,13 @@
 module ForemanMonitoring
   module HostExtensions
-    extend ActiveSupport::Concern
-    included do
-      include Orchestration::Monitoring
+    def self.prepended(base)
+      base.class_eval do
+        include Orchestration::Monitoring
 
-      after_build :downtime_host_build
+        after_build :downtime_host_build
 
-      alias_method_chain :smart_proxy_ids, :monitoring_proxy
-      alias_method_chain :hostgroup_inherited_attributes, :monitoring
-
-      has_many :monitoring_results, :dependent => :destroy, :foreign_key => 'host_id'
+        has_many :monitoring_results, :dependent => :destroy, :foreign_key => 'host_id', :inverse_of => :host
+      end
     end
 
     def monitoring_status(options = {})
@@ -42,12 +40,12 @@ module ForemanMonitoring
       monitoring_proxy.present?
     end
 
-    def hostgroup_inherited_attributes_with_monitoring
-      hostgroup_inherited_attributes_without_monitoring + ['monitoring_proxy_id']
+    def hostgroup_inherited_attributes
+      super + ['monitoring_proxy_id']
     end
 
-    def smart_proxy_ids_with_monitoring_proxy
-      ids = smart_proxy_ids_without_monitoring_proxy
+    def smart_proxy_ids
+      ids = super
       [monitoring_proxy, hostgroup.try(:monitoring_proxy)].compact.each do |proxy|
         ids << proxy.id
       end
@@ -66,7 +64,7 @@ module ForemanMonitoring
         :compute_resource => compute_resource.try(:to_label),
         :hostgroup => hostgroup.try(:to_label),
         :organization => organization.try(:name),
-        :location => location.try(:name),
+        :location => organization.try(:name),
         :comment => comment,
         :environment => environment.try(:to_s),
         :owner_name => owner.try(:name)

data/app/models/concerns/foreman_monitoring/hostgroup_extensions.rb

@@ -3,12 +3,12 @@ module ForemanMonitoring
     extend ActiveSupport::Concern
 
     def monitoring_proxy
-      return super unless ancestry.present?
-      SmartProxy.find_by_id(inherited_monitoring_proxy_id)
+      return super if ancestry.blank?
+      SmartProxy.find_by(id: inherited_monitoring_proxy_id)
     end
 
     def inherited_monitoring_proxy_id
-      return monitoring_proxy_id unless ancestry.present?
+      return monitoring_proxy_id if ancestry.blank?
       self[:monitoring_proxy_id] || self.class.sort_by_ancestry(ancestors.where('monitoring_proxy_id is not NULL')).last.try(:monitoring_proxy_id)
     end
   end

data/app/models/concerns/orchestration/monitoring.rb

@@ -23,10 +23,9 @@ module Orchestration::Monitoring
   def queue_monitoring_update
     return unless monitoring_update_required?(monitoring_object[:attrs], monitoring_attributes)
     Rails.logger.debug('Detected a change to the monitoring object is required.')
-    if ::Monitoring.create_action?(:create)
-      queue.create(:name   => _('Monitoring update for %s') % old, :priority => 2,
-                   :action => [self, :setMonitoringUpdate])
-    end
+    return unless ::Monitoring.create_action?(:create)
+    queue.create(:name   => _('Monitoring update for %s') % old, :priority => 2,
+                 :action => [self, :setMonitoringUpdate])
   end
 
   def queue_monitoring_destroy
@@ -35,30 +34,29 @@ module Orchestration::Monitoring
       queue.create(:name   => _('Removing monitoring object for %s') % self, :priority => 2,
                    :action => [self, :delMonitoring])
     end
-    if ::Monitoring.delete_action?(:downtime)
-      queue.create(:name   => _('Set monitoring downtime for %s') % self, :priority => 2,
-                   :action => [self, :setMonitoringDowntime])
-    end
+    return unless ::Monitoring.delete_action?(:downtime)
+    queue.create(:name   => _('Set monitoring downtime for %s') % self, :priority => 2,
+                 :action => [self, :setMonitoringDowntime])
   end
 
   def setMonitoring
     Rails.logger.info "Adding Monitoring object for #{name}"
     monitoring.create_host(self)
-  rescue => e
+  rescue StandardError => e
     failure format(_("Failed to create a monitoring object %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
   def delMonitoring
     Rails.logger.info "Deleting Monitoring object for #{name}"
     monitoring.delete_host(self)
-  rescue => e
+  rescue StandardError => e
     failure format(_("Failed to delete a monitoring object %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
   def setMonitoringUpdate
     Rails.logger.info "Updating Monitoring object for #{name}"
     monitoring.update_host(self)
-  rescue => e
+  rescue StandardError => e
     failure format(_("Failed to update a monitoring object %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
@@ -67,14 +65,14 @@ module Orchestration::Monitoring
   def setMonitoringDowntime
     Rails.logger.info "Setting Monitoring downtime for #{name}"
     monitoring.set_downtime_host(self, monitoring_downtime_defaults)
-  rescue => e
+  rescue StandardError => e
     failure format(_("Failed to set a monitoring downtime for %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
   def delMonitoringDowntime
     Rails.logger.info "Deleting Monitoring downtime for #{name}"
     monitoring.del_downtime_host(self, monitoring_downtime_defaults)
-  rescue => e
+  rescue StandardError => e
     failure format(_("Failed to set a monitoring downtime for %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 

data/app/models/host_status/monitoring_status.rb

@@ -11,7 +11,7 @@ module HostStatus
 
     def to_status(_options = {})
       state = OK
-      grouped_results.each do |resultset, _count|
+      grouped_results.each_key do |resultset|
         result, downtime, acknowledged = resultset
         next if downtime
         result = map_result_to_status(result)
@@ -60,9 +60,7 @@ module HostStatus
       host.monitoring_results.any?
     end
 
-    def host_monitored?
-      host.monitored?
-    end
+    delegate :monitored?, to: :host, prefix: true
 
     def should_affect_global_status?
       Setting[:monitoring_affect_global_status]

data/app/models/monitoring_result.rb

@@ -1,11 +1,10 @@
-class MonitoringResult < ActiveRecord::Base
+class MonitoringResult < ApplicationRecord
   enum :result => %i[ok warning critical unknown]
 
   belongs_to_host
 
-  # rubocop:disable Metrics/AbcSize
   def self.import(result)
-    host = Host.find_by_name(result[:host])
+    host = Host.find_by(name: result[:host])
 
     if host.nil?
       logger.error "Unable to find host #{result[:host]}"
@@ -28,8 +27,7 @@ class MonitoringResult < ActiveRecord::Base
     end
 
     created = MonitoringResult.where(:host => host, :service => result[:service]).first_or_create
-    # rubocop:disable Rails/Date
-    if created.timestamp.blank? || updates[:timestamp].blank? || (created.timestamp.to_time - updates[:timestamp].to_time) < 2
+    if created.timestamp.blank? || updates[:timestamp].blank? || created.timestamp < updates[:timestamp]
       created.update_attributes(updates)
 
       if created.persisted?
@@ -39,9 +37,7 @@ class MonitoringResult < ActiveRecord::Base
     else
       logger.debug "Skipping monitoring result import for #{host} as it is older than what we have."
     end
-    # rubocop:enable Rails/Date
   end
-  # rubocop:enable Metrics/AbcSize
 
   def status
     return :ok if downtime

data/app/models/setting/monitoring.rb

@@ -7,10 +7,10 @@ class Setting
             true, N_('Monitoring status should affect global status')),
         set('monitoring_create_action',
             _('What action should be taken when a host is created'),
-            'create', N_('Host Create Action'), nil, { :collection => proc { ::Monitoring::CREATE_ACTIONS } }),
+            'create', N_('Host Create Action'), nil, :collection => proc { ::Monitoring::CREATE_ACTIONS }),
         set('monitoring_delete_action',
             _('What action should be taken when a host is deleted'),
-            'delete', N_('Host Delete Action'), nil, { :collection => proc { ::Monitoring::DELETE_ACTIONS } })
+            'delete', N_('Host Delete Action'), nil, :collection => proc { ::Monitoring::DELETE_ACTIONS })
       ]
     end
 

data/app/views/hosts/_downtime_fields.html.erb

@@ -1,3 +1,3 @@
 <%= text_f f, :comment, :size => "col-md-5", :label => _('Comment'), :help_inline => _('Short description that explains why the downtime was set.'), :required => true %>
-<%= monitoring_datetime_f f, :starttime, :size => "col-md-5", :label => _('Starttime'), :help_inline => _('Time when the downtime should start.'), :min => DateTime.now, :value => Time.current, :required => true %>
-<%= monitoring_datetime_f f, :endtime, :size => "col-md-5", :label => _('Endtime'), :help_inline => _('Time when the downtime should end.'), :value => Time.current.advance(:hours => 2), :required => true %>
+<%= datetime_f f, :starttime, :size => "col-md-5", :label => _('Starttime'), :help_inline => _('Time when the downtime should start.'), :value => Time.current.strftime("%Y-%m-%dT%H:%M"), :required => true %>
+<%= datetime_f f, :endtime, :size => "col-md-5", :label => _('Endtime'), :help_inline => _('Time when the downtime should end.'), :value => Time.current.advance(:hours => 2).strftime("%Y-%m-%dT%H:%M"), :required => true %>

data/db/migrate/20160817135723_create_monitoring_results.rb

@@ -1,5 +1,6 @@
-class CreateMonitoringResults < ActiveRecord::Migration
+class CreateMonitoringResults < ActiveRecord::Migration[4.2]
   def change
+    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :monitoring_results do |t|
       t.references :host, :null => false
       t.string :service, :null => false
@@ -8,5 +9,6 @@ class CreateMonitoringResults < ActiveRecord::Migration
       t.boolean :acknowledged, :default => false, :null => false
       t.datetime :timestamp
     end
+    # rubocop:enable Rails/CreateTableWithTimestamps
   end
 end

data/db/migrate/20161220201510_add_monitoring_proxy_id_to_host_and_hostgroup.rb

@@ -1,4 +1,4 @@
-class AddMonitoringProxyIdToHostAndHostgroup < ActiveRecord::Migration
+class AddMonitoringProxyIdToHostAndHostgroup < ActiveRecord::Migration[4.2]
   def self.up
     add_column :hosts, :monitoring_proxy_id, :integer
     add_column :hostgroups, :monitoring_proxy_id, :integer

data/lib/foreman_monitoring/engine.rb

@@ -17,10 +17,10 @@ module ForemanMonitoring
     end
 
     initializer 'foreman_monitoring.load_default_settings',
-      :before => :load_config_initializers do |_app|
+                :before => :load_config_initializers do |_app|
       if begin
         Setting.table_exists?
-      rescue
+      rescue StandardError
         false
       end
         require_dependency File.expand_path('../../../app/models/setting/monitoring.rb', __FILE__)
@@ -29,22 +29,22 @@ module ForemanMonitoring
 
     initializer 'foreman_monitoring.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_monitoring do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
 
         apipie_documented_controllers ["#{ForemanMonitoring::Engine.root}/app/controllers/api/v2/*.rb"]
 
         security_block :foreman_monitoring do
           permission :view_monitoring_results,
-            {},
-            :resource_type => 'Host'
+                     {},
+                     :resource_type => 'Host'
           permission :manage_host_downtimes,
-            { :hosts => [:downtime, :select_multiple_downtime, :update_multiple_downtime] },
-            :resource_type => 'Host'
+                     { :hosts => [:downtime, :select_multiple_downtime, :update_multiple_downtime] },
+                     :resource_type => 'Host'
           permission :upload_monitoring_results,
-            :'api/v2/monitoring_results' => [:create]
+                     :'api/v2/monitoring_results' => [:create]
           permission :edit_hosts,
-            { :hosts => [:select_multiple_monitoring_proxy, :update_multiple_monitoring_proxy] },
-            :resource_type => 'Host'
+                     { :hosts => [:select_multiple_monitoring_proxy, :update_multiple_monitoring_proxy] },
+                     :resource_type => 'Host'
         end
 
         role 'Monitoring viewer', [:view_monitoring_results]
@@ -71,11 +71,11 @@ module ForemanMonitoring
 
     config.to_prepare do
       begin
-        ::Host::Managed.send :include, ForemanMonitoring::HostExtensions
-        ::Hostgroup.send :include, ForemanMonitoring::HostgroupExtensions
-        ::HostsHelper.send(:include, ForemanMonitoring::HostsHelperExt)
-        ::HostsController.send :include, ForemanMonitoring::HostsControllerExtensions
-      rescue => e
+        ::Host::Managed.send(:prepend, ForemanMonitoring::HostExtensions)
+        ::Hostgroup.send(:include, ForemanMonitoring::HostgroupExtensions)
+        ::HostsHelper.send(:prepend, ForemanMonitoring::HostsHelperExt)
+        ::HostsController.send(:prepend, ForemanMonitoring::HostsControllerExtensions)
+      rescue StandardError => e
         Rails.logger.warn "ForemanMonitoring: skipping engine hook (#{e})"
       end
     end

data/lib/foreman_monitoring/version.rb

@@ -1,3 +1,3 @@
 module ForemanMonitoring
-  VERSION = '0.1.3'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/tasks/foreman_monitoring_tasks.rake

@@ -19,7 +19,7 @@ namespace :foreman_monitoring do
                          "#{ForemanMonitoring::Engine.root}/lib/**/*.rb",
                          "#{ForemanMonitoring::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 
@@ -30,6 +30,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_monitoring']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_monitoring', 'foreman_monitoring:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_monitoring', 'foreman_monitoring:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/factories/feature.rb

@@ -1,4 +1,4 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :feature do
     trait :monitoring do
       name 'Monitoring'

data/test/factories/host.rb

@@ -1,8 +1,8 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :host do
     trait :with_monitoring do
       monitoring_proxy do
-        FactoryGirl.create(:smart_proxy, :monitoring)
+        FactoryBot.create(:smart_proxy, :monitoring)
       end
     end
 
@@ -12,7 +12,7 @@ FactoryGirl.modify do
       end
       after(:create) do |host, evaluator|
         evaluator.monitoring_result_count.times do
-          FactoryGirl.create(:monitoring_result, :host => host)
+          FactoryBot.create(:monitoring_result, :host => host)
         end
       end
     end

data/test/factories/monitoring_results.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :monitoring_result do
     sequence(:service) { |n| "Service #{n}" }
     result { rand(0..3) }

data/test/factories/smart_proxy.rb

@@ -1,4 +1,4 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :smart_proxy do
     trait :monitoring do
       features { |sp| [sp.association(:feature, :monitoring)] }

data/test/functional/hosts_controller_test.rb

@@ -8,7 +8,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     ProxyAPI::Monitoring.stubs(:create_host).returns(true)
     ProxyAPI::Monitoring.stubs(:update_host).returns(true)
     ProxyAPI::Monitoring.stubs(:delete_host).returns(true)
-    @host = FactoryGirl.create(:host, :managed)
+    @host = FactoryBot.create(:host, :managed)
   end
 
   context 'when setting a host downtime' do
@@ -18,14 +18,16 @@ class HostsControllerExtensionsTest < ActionController::TestCase
 
     test 'the flash should inform it' do
       Host::Managed.any_instance.stubs(:downtime_host).returns(true)
-      put :downtime, {
-        :id => @host.name,
-        :downtime => {
-          :comment => 'Maintenance work.',
-          :starttime => Time.current,
-          :endtime => Time.current.advance(:hours => 2)
-        }
-      }, set_session_user
+      put :downtime,
+          params: {
+            :id => @host.name,
+            :downtime => {
+              :comment   => 'Maintenance work.',
+              :starttime => Time.current,
+              :endtime   => Time.current.advance(:hours => 2)
+            }
+          },
+          session: set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => @host)
       assert_nil flash[:error]
@@ -34,7 +36,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     end
 
     test 'with missing comment param the flash should inform it' do
-      put :downtime, { :id => @host.name }, set_session_user
+      put :downtime, params: { :id => @host.name }, session: set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => @host)
       assert_not_nil flash[:error]
@@ -42,7 +44,9 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     end
 
     test 'with missing date params the flash should inform it' do
-      put :downtime, { :id => @host.name, :downtime => { :comment => 'Maintenance work.' } }, set_session_user
+      put :downtime,
+          params: { :id => @host.name, :downtime => { :comment => 'Maintenance work.' } },
+          session: set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => @host)
       assert_not_nil flash[:error]
@@ -50,14 +54,16 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     end
 
     test 'with invalid starttime the flash should inform it' do
-      put :downtime, {
-        :id => @host.name,
-        :downtime => {
-          :comment => 'Maintenance work.',
-          :starttime => 'invalid',
-          :endtime => 'invalid'
-        }
-      }, set_session_user
+      put :downtime,
+          params: {
+            :id => @host.name,
+            :downtime => {
+              :comment   => 'Maintenance work.',
+              :starttime => 'invalid',
+              :endtime   => 'invalid'
+            }
+          },
+          session: set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => @host)
       assert_not_nil flash[:error]
@@ -65,28 +71,34 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     end
 
     test 'should parse the times in the correct time zone' do
-      User.current.update_attribute(:timezone, 'Berlin')
+      User.current.timezone = 'Berlin'
+      User.current.save
       Host::Managed.any_instance.expects(:downtime_host).with(has_entries(:start_time => 1_492_676_100, :end_time => 1_492_683_300))
-      put :downtime, {
-        :id => @host.name,
-        :downtime => {
-          :comment => 'Maintenance work.',
-          :starttime => '2017-04-20T10:15',
-          :endtime => '2017-04-20T12:15'
-        }
-      }, set_session_user
+      put :downtime,
+          params: {
+            :id => @host.name,
+            :downtime => {
+              :comment   => 'Maintenance work.',
+              :starttime => '2017-04-20T10:15',
+              :endtime   => '2017-04-20T12:15'
+            }
+          },
+          session: set_session_user
     end
   end
 
   describe 'setting a downtime on multiple hosts' do
     before do
-      @hosts = FactoryGirl.create_list(:host, 2, :with_monitoring)
+      @hosts = FactoryBot.create_list(:host, 2, :with_monitoring)
       @request.env['HTTP_REFERER'] = hosts_path
     end
 
     test 'show a host selection' do
       host_ids = @hosts.map(&:id)
-      xhr :post, :select_multiple_downtime, { :host_ids => host_ids }, set_session_user
+      post :select_multiple_downtime,
+           params: { :host_ids => host_ids },
+           session: set_session_user,
+           xhr: true
       assert_response :success
       assert_includes response.body, @hosts.first.name
       assert_includes response.body, @hosts.last.name
@@ -103,8 +115,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         }
       }
 
-      post :update_multiple_downtime, params,
-           set_session_user
+      post :update_multiple_downtime, params: params, session: set_session_user
 
       assert_response :found
       assert_redirected_to hosts_path
@@ -116,7 +127,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
 
   describe 'changing the power state on multiple hosts' do
     before do
-      @hosts = FactoryGirl.create_list(:host, 2, :with_monitoring)
+      @hosts = FactoryBot.create_list(:host, 2, :with_monitoring)
       @request.env['HTTP_REFERER'] = hosts_path
 
       power_mock = mock('power')
@@ -135,8 +146,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         }
       }
 
-      post :update_multiple_power_state, params,
-           set_session_user
+      post :update_multiple_power_state, params: params, session: set_session_user
 
       assert_response :found
       assert_redirected_to hosts_path
@@ -155,8 +165,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         }
       }
 
-      post :update_multiple_power_state, params,
-           set_session_user
+      post :update_multiple_power_state, params: params, session: set_session_user
 
       assert_response :found
       assert_redirected_to hosts_path
@@ -167,15 +176,18 @@ class HostsControllerExtensionsTest < ActionController::TestCase
   end
 
   describe 'changing the monitoring proxy of multiple hosts' do
-    let(:hosts) { FactoryGirl.create_list(:host, 2, :with_monitoring) }
-    let(:monitoring_proxy) { FactoryGirl.create(:smart_proxy, :monitoring, :organizations => [hosts.first.organization], :locations => [hosts.first.location]) }
+    let(:hosts) { FactoryBot.create_list(:host, 2, :with_monitoring) }
+    let(:monitoring_proxy) { FactoryBot.create(:smart_proxy, :monitoring, :organizations => [hosts.first.organization], :locations => [hosts.first.location]) }
     before do
       @request.env['HTTP_REFERER'] = hosts_path
     end
 
     test 'show a host selection' do
       host_ids = hosts.map(&:id)
-      xhr :post, :select_multiple_monitoring_proxy, { :host_ids => host_ids }, set_session_user
+      post :select_multiple_monitoring_proxy,
+           params: { :host_ids => host_ids },
+           session: set_session_user,
+           xhr: true
       assert_response :success
       hosts.each do |host|
         assert response.body =~ /#{host.name}/m
@@ -192,8 +204,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         :proxy => { :proxy_id => monitoring_proxy.id }
       }
 
-      post :update_multiple_monitoring_proxy, params,
-           set_session_user
+      post :update_multiple_monitoring_proxy, params: params, session: set_session_user
 
       assert_response :found
       assert_redirected_to hosts_path

data/test/lib/proxy_api/monitoring_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ProxyApiDhcpTest < ActiveSupport::TestCase
   def setup
     @url = 'http://localhost:8443'
-    @monitoring = ProxyAPI::Monitoring.new({ :url => @url })
+    @monitoring = ProxyAPI::Monitoring.new(:url => @url)
   end
 
   test 'constructor should complete' do
@@ -15,38 +15,38 @@ class ProxyApiDhcpTest < ActiveSupport::TestCase
   end
 
   test 'create_host_downtime should do post' do
-    @monitoring.expects(:post).with({}, 'downtime/host/example.com').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:post).with({}, 'downtime/host/example.com')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.create_host_downtime('example.com'))
   end
 
   test 'remove_host_downtime should do delete' do
-    @monitoring.expects(:delete).with('downtime/host/example.com?comment=bla').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:delete).with('downtime/host/example.com?comment=bla')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.remove_host_downtime('example.com', :comment => 'bla'))
   end
 
   test 'create_host should do put' do
-    @monitoring.expects(:put).with({ :attributes => { :ip => '1.1.1.1' } }, 'host/example.com').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:put).with({ :attributes => { :ip => '1.1.1.1' } }, 'host/example.com')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.create_host('example.com', :ip => '1.1.1.1'))
   end
 
   test 'update_host should do post' do
-    @monitoring.expects(:post).with({ :attributes => { :ip => '1.1.1.1' } }, 'host/example.com').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:post).with({ :attributes => { :ip => '1.1.1.1' } }, 'host/example.com')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.update_host('example.com', :ip => '1.1.1.1'))
   end
 
   test 'delete_host should do delete' do
-    @monitoring.expects(:delete).with('host/example.com').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:delete).with('host/example.com')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.delete_host('example.com'))
   end
 
   test 'query_host should do get' do
-    @monitoring.expects(:get).with('host/example.com').
-      returns(fake_rest_client_response({ 'result' => {} }))
+    @monitoring.expects(:get).with('host/example.com')
+               .returns(fake_rest_client_response('result' => {}))
     assert_equal({ 'result' => {} }, @monitoring.query_host('example.com'))
   end
 end

data/test/test_plugin_helper.rb

@@ -2,9 +2,9 @@
 require 'test_helper'
 require 'database_cleaner'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload
 
 # Foreman's setup doesn't handle cleaning up for Minitest::Spec
 DatabaseCleaner.strategy = :transaction

data/test/unit/host_status/monitoring_status_test.rb

@@ -6,55 +6,55 @@ class MonitoringStatusTest < ActiveSupport::TestCase
     disable_monitoring_orchestration
   end
 
-  let(:host) { FactoryGirl.create(:host, :with_monitoring) }
+  let(:host) { FactoryBot.create(:host, :with_monitoring) }
   let(:status) { HostStatus::MonitoringStatus.new(:host => host) }
 
   context 'status changes' do
     test '#to_status should change when monitoring results change' do
-      FactoryGirl.create(:monitoring_result, :ok, :host => host)
+      FactoryBot.create(:monitoring_result, :ok, :host => host)
       assert_equal HostStatus::MonitoringStatus::OK, status.to_status
 
-      FactoryGirl.create(:monitoring_result, :warning, :host => host)
+      FactoryBot.create(:monitoring_result, :warning, :host => host)
       assert_equal HostStatus::MonitoringStatus::WARNING, status.to_status
 
-      FactoryGirl.create(:monitoring_result, :unknown, :host => host)
+      FactoryBot.create(:monitoring_result, :unknown, :host => host)
       assert_equal HostStatus::MonitoringStatus::WARNING, status.to_status
 
-      FactoryGirl.create(:monitoring_result, :critical, :host => host)
+      FactoryBot.create(:monitoring_result, :critical, :host => host)
       assert_equal HostStatus::MonitoringStatus::CRITICAL, status.to_status
     end
 
     test '#to_status should be warning with critical acknowledged' do
-      FactoryGirl.create(:monitoring_result, :critical, :acknowledged, :host => host)
+      FactoryBot.create(:monitoring_result, :critical, :acknowledged, :host => host)
       assert_equal HostStatus::MonitoringStatus::WARNING, status.to_status
     end
 
     test '#to_status should be ok with critical in downtime' do
-      FactoryGirl.create(:monitoring_result, :critical, :downtime, :host => host)
+      FactoryBot.create(:monitoring_result, :critical, :downtime, :host => host)
       assert_equal HostStatus::MonitoringStatus::OK, status.to_status
     end
 
     test '#to_global should change when monitoring results change' do
-      FactoryGirl.create(:monitoring_result, :ok, :host => host)
+      FactoryBot.create(:monitoring_result, :ok, :host => host)
       status.refresh
       assert_equal HostStatus::Global::OK, status.to_global
 
-      FactoryGirl.create(:monitoring_result, :warning, :host => host)
+      FactoryBot.create(:monitoring_result, :warning, :host => host)
       status.refresh
       assert_equal HostStatus::Global::WARN, status.to_global
 
-      FactoryGirl.create(:monitoring_result, :unknown, :host => host)
+      FactoryBot.create(:monitoring_result, :unknown, :host => host)
       status.refresh
       assert_equal HostStatus::Global::WARN, status.to_global
 
-      FactoryGirl.create(:monitoring_result, :critical, :host => host)
+      FactoryBot.create(:monitoring_result, :critical, :host => host)
       status.refresh
       assert_equal HostStatus::Global::ERROR, status.to_global
     end
   end
 
   context 'status with host with monitoring results' do
-    let(:host) { FactoryGirl.create(:host, :with_monitoring, :with_monitoring_results) }
+    let(:host) { FactoryBot.create(:host, :with_monitoring, :with_monitoring_results) }
 
     test '#relevant? is only for hosts not in build mode' do
       host.build = false

data/test/unit/host_test.rb

@@ -2,14 +2,14 @@ require 'test_plugin_helper'
 
 class HostTest < ActiveSupport::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = FactoryBot.build(:user, :admin)
     setup_settings
     disable_orchestration
     disable_monitoring_orchestration
   end
 
   context 'downtime handling' do
-    let(:host) { FactoryGirl.create(:host, :managed) }
+    let(:host) { FactoryBot.create(:host, :managed) }
 
     test 'it should set a downtime when build status changes' do
       host.expects(:downtime_host).once
@@ -22,7 +22,7 @@ class HostTest < ActiveSupport::TestCase
   end
 
   context 'a host with monitoring orchestration' do
-    let(:host) { FactoryGirl.build(:host, :managed, :with_monitoring) }
+    let(:host) { FactoryBot.build(:host, :managed, :with_monitoring) }
 
     context 'with create/delete actions' do
       setup do
@@ -125,7 +125,7 @@ class HostTest < ActiveSupport::TestCase
   end
 
   context 'a host without monitoring' do
-    let(:host) { FactoryGirl.build(:host, :managed) }
+    let(:host) { FactoryBot.build(:host, :managed) }
 
     test 'should not queue any monitoring actions' do
       assert_valid host

data/test/unit/monitoring_test.rb

@@ -2,13 +2,13 @@ require 'test_plugin_helper'
 
 class MonitoringTest < ActiveSupport::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = FactoryBot.build(:user, :admin)
     setup_settings
     disable_monitoring_orchestration
   end
 
-  let(:monitoring_proxy) { FactoryGirl.create(:smart_proxy, :monitoring) }
-  let(:host) { FactoryGirl.create(:host, :managed, :with_monitoring, :monitoring_proxy => monitoring_proxy) }
+  let(:monitoring_proxy) { FactoryBot.create(:smart_proxy, :monitoring) }
+  let(:host) { FactoryBot.create(:host, :managed, :with_monitoring, :monitoring_proxy => monitoring_proxy) }
   let(:monitoring) { Monitoring.new(:monitoring_proxy => monitoring_proxy) }
 
   test '#set_downtime_host should call proxy api' do

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,6 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/host_status/monitoring_status_test.rb
 - test/unit/host_test.rb
-- test/unit/monitoring_result_test.rb
 - test/unit/monitoring_test.rb
 homepage: http://www.github.com/theforeman/foreman_monitoring
 licenses:
@@ -131,14 +130,13 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.
 test_files:
-- test/unit/host_test.rb
-- test/unit/monitoring_result_test.rb
-- test/unit/host_status/monitoring_status_test.rb
-- test/unit/monitoring_test.rb
-- test/factories/smart_proxy.rb
-- test/factories/monitoring_results.rb
 - test/factories/feature.rb
 - test/factories/host.rb
+- test/factories/monitoring_results.rb
+- test/factories/smart_proxy.rb
+- test/functional/hosts_controller_test.rb
 - test/lib/proxy_api/monitoring_test.rb
 - test/test_plugin_helper.rb
-- test/functional/hosts_controller_test.rb
+- test/unit/host_status/monitoring_status_test.rb
+- test/unit/host_test.rb
+- test/unit/monitoring_test.rb

data/test/unit/monitoring_result_test.rb

@@ -1,73 +0,0 @@
-require 'test_plugin_helper'
-
-class MonitoringResultTest < ActiveSupport::TestCase
-  setup do
-    User.current = FactoryBot.build(:user, :admin)
-    setup_settings
-    disable_orchestration
-    disable_monitoring_orchestration
-  end
-
-  context '#import' do
-    let(:host) { FactoryBot.create(:host, :managed, :with_monitoring) }
-
-    let(:initial) do
-      {
-        host: host.name,
-        service: 'cpu metrics',
-        timestamp: 1_516_365_380.8834700584,
-        result: 1,
-        acknowledged: true
-      }
-    end
-
-    let(:acknowledegment_cleared) do
-      {
-        host: host.name,
-        service: 'cpu metrics',
-        timestamp: 1_516_365_971.2455039024,
-        acknowledged: false
-      }
-    end
-
-    let(:state_change) do
-      {
-        host: host.name,
-        service: 'cpu metrics',
-        timestamp: 1_516_365_971.2461779118,
-        result: 0
-      }
-    end
-
-    test 'imports a monitoring result' do
-      MonitoringResult.import(initial)
-      imported = host.monitoring_results.last
-      assert_equal true, imported.acknowledged?
-    end
-
-    test 'handles ack and state change in correct order' do
-      MonitoringResult.import(initial)
-      MonitoringResult.import(acknowledegment_cleared)
-      MonitoringResult.import(state_change)
-      imported = host.monitoring_results.last
-      assert_equal :ok, imported.status
-      assert_equal false, imported.acknowledged?
-    end
-
-    test 'handles ack and state change in reverse order' do
-      MonitoringResult.import(initial)
-      MonitoringResult.import(state_change)
-      MonitoringResult.import(acknowledegment_cleared)
-      imported = host.monitoring_results.last
-      assert_equal :ok, imported.status
-      assert_equal false, imported.acknowledged?
-    end
-
-    test 'ignores old data' do
-      MonitoringResult.import(state_change)
-      MonitoringResult.import(initial)
-      imported = host.monitoring_results.last
-      assert_equal false, imported.acknowledged?
-    end
-  end
-end