foreman_monitoring 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9186b9fa48b695bea2617e3c589b22d0df22bd
-  data.tar.gz: f3dd5db766d37990e59d09ffdf9881a830abc134
+  metadata.gz: 6ec30b6e40aad99c7da94b66100590381d300289
+  data.tar.gz: ef1bb20065f0c5b11544f64babe2ab0c8faa3b6d
 SHA512:
-  metadata.gz: 25700b1a96cebf6cfb1e829b54dfef9f6fd6f934ffbbd1e8a9fa753ee9e51f0a406c478c0bdba8e8cd2b46bbeaf5ae3d2be0a06da9524ea77740b8e042e32f61
-  data.tar.gz: 1f714e3081f6adeb50b7f01f30c6855dc237f3613210993719fc0f0d97ed34828190f58c784e9ac93a6afb6c54d2049c1bd5b82f7e76d088553b3af7ae8f1479
+  metadata.gz: 92fc91db5150b641f8a169fce2468695a4a64e84ec02235259385864deb0c1b7309e49853fb297a88f9e37d143371f88d6aa446c37abebc8d8a2172433a725d1
+  data.tar.gz: 9306c61272155529c75cd7c90b9a115a5d931b11455f0313fa057de42ac565a3a301023cbd95fc8fa744d913e570ea8a8ad3c689f042c45aa5a6d4dc00d944e2

data/README.md

@@ -17,7 +17,16 @@ The gem name is `foreman_monitoring`.
 
 RPM users can install the `tfm-rubygem-foreman_monitoring` package.
 
-This plug-in has not been packaged for Debian, yet.
+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.
+
+```
+foreman-rake db:migrate
+foreman-rake db:seed
+touch ~foreman/tmp/restart.txt
+```
 
 # Usage
 
@@ -37,6 +46,14 @@ panel. You can configure if the sub-status should affect the global status.
 Furthermore it allows to individually set a downtime at the host detail view
 or as a bulk action from the host overview.
 
+# Troubleshooting
+
+Logging entries relevant to the plug-in will be located in the Foreman's log
+which is by default `/var/log/foreman/production.log`.
+
+Also check the troubleshooting section of the Smart Proxy plug-in if problems
+occure in the underlying communication.
+
 ## Contributing
 
 Fork and send a Pull Request. Thanks!

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

@@ -12,7 +12,8 @@ module Api
       param :timestamp, String, :desc => N_('Timestamp of the results')
       param :acknowledged, [true, false], :desc => N_('Is the result acknowledged?')
       param :downtime, [true, false], :desc => N_('Is the result in downtime?')
-      param :result, [0, 1, 2, 3], :desc => N_('State of the monitoring result (0 -> ok, 1 -> warning, 2 -> critical, 3 -> unknown)')
+      param :result, [0, 1, 2, 3],
+            :desc => N_('State of the monitoring result (0 -> ok, 1 -> warning, 2 -> critical, 3 -> unknown)')
 
       def create
         begin

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 => [: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
@@ -20,11 +19,10 @@ module ForemanMonitoring
         process_error(:redirect => host_path, :error_msg => @host.errors.full_messages.to_sentence)
         return false
       end
-      process_success :success_msg => _('Created downtime for %s') % (@host), :success_redirect => :back
+      process_success :success_msg => _('Created downtime for %s') % @host, :success_redirect => :back
     end
 
-    def select_multiple_downtime
-    end
+    def select_multiple_downtime; end
 
     def update_multiple_downtime
       failed_hosts = {}
@@ -60,21 +58,21 @@ module ForemanMonitoring
       validate_multiple_proxy(select_multiple_monitoring_proxy_hosts_path)
     end
 
-    def select_multiple_monitoring_proxy
-    end
+    def select_multiple_monitoring_proxy; end
 
     def update_multiple_monitoring_proxy
       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}",
-        :start_time => DateTime.now.to_time.to_i,
-        :end_time => DateTime.now.advance(:minutes => 30).to_time.to_i
+        :start_time => Time.current.to_i,
+        :end_time => Time.current.advance(:minutes => 30).to_i
       }
-      if User.current.allowed_to?(:controller => :hosts, :action => :select_multiple_downtime) && params[:power][:set_downtime]
+      set_downtime = Foreman::Cast.to_bool(params[:power][:set_downtime])
+      if set_downtime && User.current.allowed_to?(:controller => :hosts, :action => :select_multiple_downtime)
         @hosts.each do |host|
           unless host.monitored?
             logger.debug "Not setting a downtime for #{host} as it is not monitored."
@@ -87,7 +85,7 @@ module ForemanMonitoring
           end
         end
       end
-      update_multiple_power_state_without_monitoring
+      super
     end
 
     private
@@ -96,8 +94,8 @@ module ForemanMonitoring
       {
         :comment => params[:downtime][:comment],
         :author => "Foreman User #{User.current}",
-        :start_time => DateTime.parse(params[:downtime][:starttime]).to_time.to_i,
-        :end_time => DateTime.parse(params[:downtime][:endtime]).to_time.to_i
+        :start_time => Time.zone.parse(params[:downtime][:starttime]).to_i,
+        :end_time => Time.zone.parse(params[:downtime][:endtime]).to_i
       }
     end
 
@@ -118,20 +116,21 @@ module ForemanMonitoring
         process_error(:redirect => redirect_url, :error_msg => 'No start/endtime for downtime!')
         return false
       end
-      begin
-        DateTime.parse(params[:downtime][:starttime])
-        DateTime.parse(params[:downtime][:endtime])
-      rescue ArgumentError
+      starttime = Time.zone.parse(params[:downtime][:starttime])
+      endtime = Time.zone.parse(params[:downtime][:endtime])
+      if starttime.nil? || endtime.nil? || starttime >= endtime
         process_error(:redirect => redirect_url, :error_msg => 'Invalid start/endtime for downtime!')
         return false
       end
+      true
     end
 
     def action_permission
       case params[:action]
-      when 'downtime', 'select_multiple_downtime', 'update_multiple_downtime',
-        'select_multiple_monitoring_proxy', 'update_multiple_monitoring_proxy'
+      when 'downtime', 'select_multiple_downtime', 'update_multiple_downtime'
         :downtime
+      when 'select_multiple_monitoring_proxy', 'update_multiple_monitoring_proxy'
+        :edit
       else
         super
       end

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

@@ -1,18 +1,17 @@
 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
+      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
     end
 
-    def host_title_actions_with_monitoring(host)
+    def host_title_actions(host)
       title_actions(
         button_group(
           display_link_if_authorized(_('Downtime'),
@@ -24,12 +23,10 @@ module ForemanMonitoring
                                      :title    => _('Set a downtime for this host'),
                                      :id       => 'host-downtime',
                                      :data     => { :toggle => 'modal',
-                                                    :target => '#set_host_downtime'
-                                                  }
-                                    )
+                                                    :target => '#set_host_downtime' })
         )
       )
-      host_title_actions_without_monitoring(host)
+      super
     end
 
     def host_monitoring_result_icon_class(result)

data/app/lib/proxy_api/monitoring.rb

@@ -18,19 +18,19 @@ module ProxyAPI
     end
 
     def create_host(host, attributes = {})
-      parse(put({:attributes => attributes}, "host/#{host}"))
+      parse(put({ :attributes => attributes }, "host/#{host}"))
     rescue => 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}"))
+      parse(post({ :attributes => attributes }, "host/#{host}"))
     rescue => e
       raise ProxyException.new(url, e, N_('Unable to update monitoring host object for %s') % host)
     end
 
     def delete_host(host)
-      raise Foreman::Exception.new('Missing hostname.') if host.blank?
+      raise Foreman::Exception, 'Missing hostname.' if host.blank?
       parse(delete("host/#{host}"))
     rescue RestClient::ResourceNotFound
       true
@@ -43,7 +43,7 @@ module ProxyAPI
     rescue RestClient::ResourceNotFound
       nil
     rescue => e
-      raise ProxyException.new(url, e, N_('Unable to query monitoring host object for %s') % host)
+      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
 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'
+      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

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

@@ -11,48 +11,55 @@ module Orchestration::Monitoring
   def queue_monitoring
     return unless monitored? && errors.empty?
     clear_monitoring_object
-    !monitoring_object.has_key?(:attrs) ? queue_monitoring_create : queue_monitoring_update
+    !monitoring_object.key?(:attrs) ? queue_monitoring_create : queue_monitoring_update
   end
 
   def queue_monitoring_create
-    queue.create(:name   => _("Create monitoring object for %s") % self, :priority => 20,
-                 :action => [self, :setMonitoring]) if ::Monitoring.create_action?(:create)
+    return true unless ::Monitoring.create_action?(:create)
+    queue.create(:name   => _('Create monitoring object for %s') % self, :priority => 20,
+                 :action => [self, :setMonitoring])
   end
 
   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.")
-    queue.create(:name   => _("Monitoring update for %s") % old, :priority => 2,
-                 :action => [self, :setMonitoringUpdate]) if ::Monitoring.create_action?(:create)
+    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
   end
 
   def queue_monitoring_destroy
     return unless monitored? && errors.empty?
-    queue.create(:name   => _("Removing monitoring object for %s") % self, :priority => 2,
-                 :action => [self, :delMonitoring]) if ::Monitoring.delete_action?(:delete)
-    queue.create(:name   => _("Set monitoring downtime for %s") % self, :priority => 2,
-                 :action => [self, :setMonitoringDowntime]) if ::Monitoring.delete_action?(:downtime)
+    if ::Monitoring.delete_action?(:delete)
+      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
   end
 
   def setMonitoring
     Rails.logger.info "Adding Monitoring object for #{name}"
     monitoring.create_host(self)
   rescue => e
-    failure _("Failed to create a monitoring object %{name}: %{message}\n ") % { :name => name, :message => e.message }, 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
-    failure _("Failed to delete a monitoring object %{name}: %{message}\n ") % { :name => name, :message => e.message }, 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
-    failure _("Failed to update a monitoring object %{name}: %{message}\n ") % { :name => name, :message => e.message }, e
+    failure format(_("Failed to update a monitoring object %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
   def delMonitoringUpdate; end
@@ -61,14 +68,14 @@ module Orchestration::Monitoring
     Rails.logger.info "Setting Monitoring downtime for #{name}"
     monitoring.set_downtime_host(self, monitoring_downtime_defaults)
   rescue => e
-    failure _("Failed to set a monitoring downtime for %{name}: %{message}\n ") % { :name => name, :message => e.message }, 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
-    failure _("Failed to set a monitoring downtime for %{name}: %{message}\n ") % { :name => name, :message => e.message }, e
+    failure format(_("Failed to set a monitoring downtime for %{name}: %{message}\n "), :name => name, :message => e.message), e
   end
 
   def monitoring_object
@@ -99,7 +106,7 @@ module Orchestration::Monitoring
       end
       desired_v
     end
-    Rails.logger.debug "No monitoring update required."
+    Rails.logger.debug 'No monitoring update required.'
     false
   end
 end

data/app/models/host_status/monitoring_status.rb

@@ -14,6 +14,7 @@ module HostStatus
       grouped_results.each do |resultset, _count|
         result, downtime, acknowledged = resultset
         next if downtime
+        result = map_result_to_status(result)
         result = WARNING if acknowledged || result == UNKNOWN
         state = result if result > state
       end
@@ -70,7 +71,21 @@ module HostStatus
     private
 
     def grouped_results
-      host.monitoring_results.group([:result, :downtime, :acknowledged]).count
+      host.monitoring_results.group(%i[result downtime acknowledged]).count
+    end
+
+    def map_result_to_status(result)
+      return result if Rails::VERSION::MAJOR < 5
+      case result.to_sym
+      when :ok
+        OK
+      when :warning
+        WARNING
+      when :critical
+        CRITICAL
+      else
+        UNKNOWN
+      end
     end
   end
 end

data/app/models/monitoring_result.rb

@@ -1,5 +1,5 @@
 class MonitoringResult < ActiveRecord::Base
-  enum :result => [:ok, :warning, :critical, :unknown]
+  enum :result => %i[ok warning critical unknown]
 
   belongs_to_host
 

data/app/models/setting/monitoring.rb

@@ -1,17 +1,16 @@
 class Setting
   class Monitoring < ::Setting
-
     def self.default_settings
       [
         set('monitoring_affect_global_status',
             _("Monitoring status will affect a host's global status when enabled"),
             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.new {::Monitoring::CREATE_ACTIONS} }),
+            _('What action should be taken when a host is created'),
+            '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.new {::Monitoring::DELETE_ACTIONS} })
+            _('What action should be taken when a host is deleted'),
+            'delete', N_('Host Delete Action'), nil, { :collection => proc { ::Monitoring::DELETE_ACTIONS } })
       ]
     end
 
@@ -20,7 +19,7 @@ class Setting
       return unless super
 
       self.transaction do
-        default_settings.each { |s| self.create! s.update(:category => "Setting::Monitoring")}
+        default_settings.each { |s| self.create! s.update(:category => 'Setting::Monitoring') }
       end
 
       true

data/app/overrides/add_host_monitoring_result_tab.rb

@@ -1,11 +1,9 @@
 Deface::Override.new(:virtual_path  => 'hosts/show',
                      :name          => 'add_monitoring_result_tab',
                      :insert_bottom => 'ul.nav-tabs',
-                     :partial       => 'monitoring_results/host_tab'
-                    )
+                     :partial       => 'monitoring_results/host_tab')
 
 Deface::Override.new(:virtual_path  => 'hosts/show',
                      :name          => 'add_monitoring_result_tab_pane',
                      :insert_bottom => 'div.tab-content',
-                     :partial       => 'monitoring_results/host_tab_pane'
-                    )
+                     :partial       => 'monitoring_results/host_tab_pane')

data/app/overrides/add_host_multiple_power_set_downtime_checkbox.rb

@@ -1,5 +1,4 @@
 Deface::Override.new(:virtual_path  => 'hosts/select_multiple_power_state',
                      :name          => 'add_host_multiple_power_set_downtime_checkbox',
                      :insert_before => "erb[silent]:contains('end')",
-                     :partial       => 'hosts/host_downtime_checkbox'
-                    )
+                     :partial       => 'hosts/host_downtime_checkbox')

data/app/overrides/add_host_set_downtime_modal.rb

@@ -1,5 +1,4 @@
 Deface::Override.new(:virtual_path  => 'hosts/show',
                      :name          => 'add_monitoring_set_downtime_modal',
                      :insert_after => 'div#review_before_build',
-                     :partial       => 'hosts/set_host_downtime'
-                    )
+                     :partial => 'hosts/set_host_downtime')

data/app/services/monitoring.rb

@@ -27,23 +27,22 @@ class Monitoring
   end
 
   def set_downtime_host(host, options = {})
-    proxy_api.create_host_downtime(host.fqdn, default_downtime_options.merge(options))
+    proxy_api.create_host_downtime(host.name, default_downtime_options.merge(options))
   end
 
   def del_downtime_host(host, options = {})
-    proxy_api.remove_host_downtime(host.fqdn, default_downtime_options.merge(options))
+    proxy_api.remove_host_downtime(host.name, default_downtime_options.merge(options))
   end
 
   def create_host(host)
-    proxy_api.create_host(host.fqdn, host.monitoring_attributes)
+    proxy_api.create_host(host.name, host.monitoring_attributes)
   end
 
   def update_host(host)
-    proxy_api.update_host(host.fqdn, host.monitoring_attributes)
+    proxy_api.update_host(host.name, host.monitoring_attributes)
   end
 
   def delete_host(host)
-    # We cannot use host.fqdn here as that is delegated to primary interface that does not exist anymore
     proxy_api.delete_host(host.name)
   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 %>
-<%= datetime_f f, :starttime, :size => "col-md-5", :label => _('Starttime'), :help_inline => _('Time when the downtime should start.'), :value => DateTime.now.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 => DateTime.now.advance(:hours => 2).strftime("%Y-%m-%dT%H:%M"), :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/lib/foreman_monitoring/engine.rb

@@ -7,7 +7,6 @@ module ForemanMonitoring
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
 
     # Add any db migrations
@@ -43,10 +42,13 @@ module ForemanMonitoring
             :resource_type => 'Host'
           permission :upload_monitoring_results,
             :'api/v2/monitoring_results' => [:create]
+          permission :edit_hosts,
+            { :hosts => [:select_multiple_monitoring_proxy, :update_multiple_monitoring_proxy] },
+            :resource_type => 'Host'
         end
 
         role 'Monitoring viewer', [:view_monitoring_results]
-        role 'Monitoring manager', [:view_monitoring_results, :manage_host_downtimes, :upload_monitoring_results]
+        role 'Monitoring manager', [:view_monitoring_results, :manage_host_downtimes]
 
         register_custom_status HostStatus::MonitoringStatus
 
@@ -62,15 +64,17 @@ module ForemanMonitoring
         # add monitoring smart proxy to hosts and hostgroups
         smart_proxy_for Host::Managed, :monitoring_proxy, monitoring_proxy_options
         smart_proxy_for Hostgroup, :monitoring_proxy, monitoring_proxy_options
+
+        add_controller_action_scope(HostsController, :index) { |base_scope| base_scope.includes(:monitoring_proxy) }
       end
     end
 
     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
+        ::Host::Managed.send(:prepend, ForemanMonitoring::HostExtensions)
+        ::Hostgroup.send(:include, ForemanMonitoring::HostgroupExtensions)
+        ::HostsHelper.send(:prepend, ForemanMonitoring::HostsHelperExt)
+        ::HostsController.send(:prepend, 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.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/test/functional/hosts_controller_test.rb

@@ -5,6 +5,9 @@ class HostsControllerExtensionsTest < ActionController::TestCase
   setup do
     User.current = users(:admin)
     disable_monitoring_orchestration
+    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)
   end
 
@@ -19,8 +22,8 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         :id => @host.name,
         :downtime => {
           :comment => 'Maintenance work.',
-          :starttime => DateTime.now,
-          :endtime => DateTime.now
+          :starttime => Time.current,
+          :endtime => Time.current.advance(:hours => 2)
         }
       }, set_session_user
       assert_response :found
@@ -52,13 +55,27 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         :downtime => {
           :comment => 'Maintenance work.',
           :starttime => 'invalid',
-          :endtime => 'invalid' }
+          :endtime => 'invalid'
+        }
       }, set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => @host)
       assert_not_nil flash[:error]
       assert_equal 'Invalid start/endtime for downtime!', flash[:error]
     end
+
+    test 'should parse the times in the correct time zone' do
+      User.current.update_attribute(:timezone, 'Berlin')
+      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
+    end
   end
 
   describe 'setting a downtime on multiple hosts' do
@@ -69,9 +86,10 @@ class HostsControllerExtensionsTest < ActionController::TestCase
 
     test 'show a host selection' do
       host_ids = @hosts.map(&:id)
-      xhr :post, :select_multiple_downtime, {:host_ids => host_ids}, set_session_user
+      xhr :post, :select_multiple_downtime, { :host_ids => host_ids }, set_session_user
       assert_response :success
-      assert response.body =~ /#{@hosts.first.name}.*#{@hosts.last.name}/m
+      assert_includes response.body, @hosts.first.name
+      assert_includes response.body, @hosts.last.name
     end
 
     test 'should set a downtime' do
@@ -80,8 +98,8 @@ class HostsControllerExtensionsTest < ActionController::TestCase
         :host_ids => @hosts.map(&:id),
         :downtime => {
           :comment => 'Maintenance work.',
-          :starttime => DateTime.now,
-          :endtime => DateTime.now
+          :starttime => Time.current,
+          :endtime => Time.current.advance(:hours => 2)
         }
       }
 
@@ -157,9 +175,11 @@ class HostsControllerExtensionsTest < ActionController::TestCase
 
     test 'show a host selection' do
       host_ids = hosts.map(&:id)
-      xhr :post, :select_multiple_monitoring_proxy, {:host_ids => host_ids}, set_session_user
+      xhr :post, :select_multiple_monitoring_proxy, { :host_ids => host_ids }, set_session_user
       assert_response :success
-      assert response.body =~ /#{hosts.first.name}.*#{hosts.last.name}/m
+      hosts.each do |host|
+        assert response.body =~ /#{host.name}/m
+      end
     end
 
     test 'should change the proxy' do
@@ -178,7 +198,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
       assert_response :found
       assert_redirected_to hosts_path
       assert_nil flash[:error]
-      assert_equal "The Monitoring proxy of the selected hosts was set to #{monitoring_proxy.name}.", flash[:notice]
+      assert_equal "The Monitoring proxy of the selected hosts was set to #{monitoring_proxy.name}", flash[:notice]
 
       hosts.each do |host|
         as_admin do

data/test/lib/proxy_api/monitoring_test.rb

@@ -27,13 +27,13 @@ class ProxyApiDhcpTest < ActiveSupport::TestCase
   end
 
   test 'create_host should do put' do
-    @monitoring.expects(:put).with({:attributes => {:ip => '1.1.1.1'}}, 'host/example.com').
+    @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').
+    @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

data/test/unit/host_test.rb

@@ -41,7 +41,7 @@ class HostTest < ActiveSupport::TestCase
       test 'should queue monitoring update' do
         fake_host_query_result = {
           'ip' => '1.1.1.1',
-          'ip6' => '2001:db8::1',
+          'ip6' => '2001:db8::1'
         }
         ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns(fake_host_query_result)
         host.save
@@ -79,7 +79,6 @@ class HostTest < ActiveSupport::TestCase
         Setting[:monitoring_delete_action] = 'downtime'
       end
 
-
       test 'should not queue monitoring create actions' do
         assert_valid host
         tasks = host.queue.all.map(&:name)
@@ -94,6 +93,14 @@ class HostTest < ActiveSupport::TestCase
         assert_includes tasks, "Set monitoring downtime for #{host}"
         assert_equal 1, tasks.size
       end
+
+      test 'should set downtime on delete with correct hostname' do
+        assert host.save
+        host.queue.clear
+        host.stubs(:skip_orchestration?).returns(false) # Enable orchestration
+        ProxyAPI::Monitoring.any_instance.expects(:create_host_downtime).with(host.name, anything).returns(true).once
+        assert host.destroy
+      end
     end
 
     test 'setMonitoring' do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.