foreman_monitoring 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ec30b6e40aad99c7da94b66100590381d300289
-  data.tar.gz: ef1bb20065f0c5b11544f64babe2ab0c8faa3b6d
+SHA256:
+  metadata.gz: f742aa658a66234e28555d6dbba4beca116e6ba3d49db3c02898bd7cc295a5d9
+  data.tar.gz: f11b41bb8dc37e78431df10c3fc255f7680039293e7e0c9ff0268a4c975d49ef
 SHA512:
-  metadata.gz: 92fc91db5150b641f8a169fce2468695a4a64e84ec02235259385864deb0c1b7309e49853fb297a88f9e37d143371f88d6aa446c37abebc8d8a2172433a725d1
-  data.tar.gz: 9306c61272155529c75cd7c90b9a115a5d931b11455f0313fa057de42ac565a3a301023cbd95fc8fa744d913e570ea8a8ad3c689f042c45aa5a6d4dc00d944e2
+  metadata.gz: f7dbdfc58ea1b7669eefff4b603ccc4f813b87a3aadbb4cd4a48ad86de3899403b440709d1b2a1f9145dc5b4b4487875ad0a33de031142d70e47d139278043d1
+  data.tar.gz: 39f27d2331c23bd24392d1abcaa47dc4ec9757463a27503518d501581ba2b276acc2528fa58b2e76f632f58ac00cb91801060d09a821a9853e0754ced75342dc

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

@@ -1,17 +1,18 @@
 module ForemanMonitoring
   module HostsControllerExtensions
-    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
+    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
     end
 
     def downtime
@@ -64,7 +65,7 @@ module ForemanMonitoring
       update_multiple_proxy(_('Monitoring'), :monitoring_proxy=)
     end
 
-    def update_multiple_power_state
+    def update_multiple_power_state_with_monitoring
       options = {
         :comment => 'Power state changed in Foreman',
         :author => "Foreman User #{User.current}",
@@ -85,7 +86,7 @@ module ForemanMonitoring
           end
         end
       end
-      super
+      update_multiple_power_state_without_monitoring
     end
 
     private

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

@@ -1,17 +1,18 @@
 module ForemanMonitoring
   module HostsHelperExt
-    def multiple_actions
-      actions = super
-      if authorized_for(:controller => :hosts, :action => :select_multiple_downtime)
-        actions << [_('Set downtime'), select_multiple_downtime_hosts_path]
-      end
-      if authorized_for(:controller => :hosts, :action => :select_multiple_monitoring_proxy)
-        actions << [_('Change Monitoring Proxy'), select_multiple_monitoring_proxy_hosts_path]
-      end
-      actions
+    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]]
     end
 
-    def host_title_actions(host)
+    def host_title_actions_with_monitoring(host)
       title_actions(
         button_group(
           display_link_if_authorized(_('Downtime'),
@@ -26,7 +27,7 @@ module ForemanMonitoring
                                                     :target => '#set_host_downtime' })
         )
       )
-      super
+      host_title_actions_without_monitoring(host)
     end
 
     def host_monitoring_result_icon_class(result)

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

@@ -1,13 +1,15 @@
 module ForemanMonitoring
   module HostExtensions
-    def self.prepended(base)
-      base.class_eval do
-        include Orchestration::Monitoring
+    extend ActiveSupport::Concern
+    included do
+      include Orchestration::Monitoring
 
-        after_build :downtime_host_build
+      after_build :downtime_host_build
 
-        has_many :monitoring_results, :dependent => :destroy, :foreign_key => 'host_id'
-      end
+      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'
     end
 
     def monitoring_status(options = {})
@@ -40,12 +42,12 @@ module ForemanMonitoring
       monitoring_proxy.present?
     end
 
-    def hostgroup_inherited_attributes
-      super + ['monitoring_proxy_id']
+    def hostgroup_inherited_attributes_with_monitoring
+      hostgroup_inherited_attributes_without_monitoring + ['monitoring_proxy_id']
     end
 
-    def smart_proxy_ids
-      ids = super
+    def smart_proxy_ids_with_monitoring_proxy
+      ids = smart_proxy_ids_without_monitoring_proxy
       [monitoring_proxy, hostgroup.try(:monitoring_proxy)].compact.each do |proxy|
         ids << proxy.id
       end

data/lib/foreman_monitoring/engine.rb

@@ -71,10 +71,10 @@ module ForemanMonitoring
 
     config.to_prepare do
       begin
-        ::Host::Managed.send(:prepend, ForemanMonitoring::HostExtensions)
-        ::Hostgroup.send(:include, ForemanMonitoring::HostgroupExtensions)
-        ::HostsHelper.send(:prepend, ForemanMonitoring::HostsHelperExt)
-        ::HostsController.send(:prepend, ForemanMonitoring::HostsControllerExtensions)
+        ::Host::Managed.send :include, ForemanMonitoring::HostExtensions
+        ::Hostgroup.send :include, ForemanMonitoring::HostgroupExtensions
+        ::HostsHelper.send(:include, ForemanMonitoring::HostsHelperExt)
+        ::HostsController.send :include, ForemanMonitoring::HostsControllerExtensions
       rescue => e
         Rails.logger.warn "ForemanMonitoring: skipping engine hook (#{e})"
       end

data/lib/foreman_monitoring/version.rb

@@ -1,3 +1,3 @@
 module ForemanMonitoring
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.