foreman_monitoring 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c19621c4296a6cc5d051522ee0176ef3a4726f24bc73eda2c1182c812939c5
-  data.tar.gz: 1691af6f9079acd23c0f826b6052605d99eff64346c127a5b50a2fbac4e38344
+  metadata.gz: 685e5be086aa9ee637a3ef119df3310475334138a687f2583e21148ba63e1743
+  data.tar.gz: 2dd299e15e6a4701e15ff7fc04e95c733c72454bd718f15082315fada5db2e4a
 SHA512:
-  metadata.gz: 57746ee94c93571b9e8fa14050f2ff1358d265fa710908175fa26b9baa799c5597d31ef2b8a71c3d31b9a57c6c6e4e46fc7377700d1a4f686e1db2a18835f54c
-  data.tar.gz: 14c121e8aaf4c486e1fdd74ce09747578658cc8f8d7c5c9e471d897ea55fe27d8e5c5a3068c87373988af09d6b96bfee113fb90428680abed618eca0c825ebbd
+  metadata.gz: 612b798a6f43d52b223c248e63298606fafe545caf2350633c9f24ec08b0f35de0a8459a560171b519a24972e39cc84c974b902c39c578adb680586cfc51f238
+  data.tar.gz: def3221fb65d2d545ee7b404725d173de31f444008dff5140fcbfe6e315d20574cba95f2e8f5a14ad580c3d180fc89022ec8827a51d1ad541df51a08964679fc

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

@@ -97,7 +97,8 @@ module ForemanMonitoring
         :comment => params[:downtime][:comment],
         :author => "Foreman User #{User.current}",
         :start_time => Time.zone.parse(params[:downtime][:starttime]).to_i,
-        :end_time => Time.zone.parse(params[:downtime][:endtime]).to_i
+        :end_time => Time.zone.parse(params[:downtime][:endtime]).to_i,
+        **(params[:downtime][:all_services] == '1' ? { :all_services => true } : {})
       }
     end
 

data/app/helpers/foreman_monitoring/hosts_helper.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module ForemanMonitoring
+  module HostsHelper
+    def monitoring_hosts_multiple_actions
+      actions = []
+      actions << { action: [_('Set downtime'), select_multiple_downtime_hosts_path], priority: 1000 } \
+        if authorized_for(:controller => :hosts, :action => :select_multiple_downtime)
+      actions << { action: [_('Change Monitoring Proxy'), select_multiple_monitoring_proxy_hosts_path], priority: 1000 } \
+        if authorized_for(:controller => :hosts, :action => :select_multiple_monitoring_proxy)
+      actions
+    end
+
+    def host_title_actions(host)
+      title_actions(
+        button_group(
+          display_link_if_authorized(
+            _('Downtime'),
+            hash_for_host_path(:id => host).merge(
+              :auth_object => host,
+              :permission => :manage_downtime_hosts,
+              :anchor => 'set_host_downtime'
+            ),
+            :class => 'btn btn-default',
+            :disabled => !host.monitored?,
+            :title => _('Set a downtime for this host'),
+            :id => 'host-downtime',
+            :data => {
+              :toggle => 'modal',
+              :target => '#set_host_downtime',
+            }
+          )
+        )
+      )
+      super
+    end
+
+    def host_monitoring_result_icon_class(result)
+      icon_class = case result
+                   when :ok
+                     'pficon-ok'
+                   when :warning
+                     'pficon-info'
+                   when :critical
+                     'pficon-error-circle-o'
+                   else
+                     'pficon-help'
+                   end
+
+      "host-status #{icon_class} #{host_monitoring_result_class(result)}"
+    end
+
+    def host_monitoring_result_class(result)
+      case result
+      when :ok
+        'status-ok'
+      when :warning
+        'status-warn'
+      when :critical
+        'status-error'
+      else
+        'status-question'
+      end
+    end
+
+    def monitoring_datetime_f(f, attr, options = {})
+      field(f, attr, options) do
+        addClass options, 'form-control'
+        f.datetime_field attr, options
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
 <%= 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 %>
+<%= checkbox_f f, :all_services, :size => "col-md-5", :label => _('All services'), :help_inline => _("Set downtime for all host's services.") %>

data/lib/foreman_monitoring/engine.rb

@@ -82,13 +82,16 @@ module ForemanMonitoring
         smart_proxy_for Hostgroup, :monitoring_proxy, monitoring_proxy_options
 
         add_controller_action_scope('HostsController', :index) { |base_scope| base_scope.includes(:monitoring_proxy) }
+
+        describe_host do
+          multiple_actions_provider :monitoring_hosts_multiple_actions
+        end
       end
     end
 
     config.to_prepare do
       ::Host::Managed.prepend(ForemanMonitoring::HostExtensions)
       ::Hostgroup.include(ForemanMonitoring::HostgroupExtensions)
-      ::HostsHelper.prepend(ForemanMonitoring::HostsHelperExt)
       ::HostsController.prepend(ForemanMonitoring::HostsControllerExtensions)
     rescue StandardError => e
       Rails.logger.warn "ForemanMonitoring: skipping engine hook (#{e})"

data/lib/foreman_monitoring/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanMonitoring
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -52,7 +52,7 @@ files:
 - app/controllers/api/v2/monitoring_results_controller.rb
 - app/controllers/concerns/foreman_monitoring/find_host_by_client_cert.rb
 - app/controllers/concerns/foreman_monitoring/hosts_controller_extensions.rb
-- app/helpers/concerns/foreman_monitoring/hosts_helper_ext.rb
+- app/helpers/foreman_monitoring/hosts_helper.rb
 - app/lib/proxy_api/monitoring.rb
 - app/models/concerns/foreman_monitoring/host_extensions.rb
 - app/models/concerns/foreman_monitoring/hostgroup_extensions.rb
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.

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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanMonitoring
-  module HostsHelperExt
-    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(host)
-      title_actions(
-        button_group(
-          display_link_if_authorized(_('Downtime'),
-                                     hash_for_host_path(:id => host).merge(:auth_object => host,
-                                                                           :permission => :manage_downtime_hosts,
-                                                                           :anchor => 'set_host_downtime'),
-                                     :class => 'btn btn-default',
-                                     :disabled => !host.monitored?,
-                                     :title => _('Set a downtime for this host'),
-                                     :id => 'host-downtime',
-                                     :data => { :toggle => 'modal',
-                                                :target => '#set_host_downtime' })
-        )
-      )
-      super
-    end
-
-    def host_monitoring_result_icon_class(result)
-      icon_class = case result
-                   when :ok
-                     'pficon-ok'
-                   when :warning
-                     'pficon-info'
-                   when :critical
-                     'pficon-error-circle-o'
-                   else
-                     'pficon-help'
-                   end
-
-      "host-status #{icon_class} #{host_monitoring_result_class(result)}"
-    end
-
-    def host_monitoring_result_class(result)
-      case result
-      when :ok
-        'status-ok'
-      when :warning
-        'status-warn'
-      when :critical
-        'status-error'
-      else
-        'status-question'
-      end
-    end
-
-    def monitoring_datetime_f(f, attr, options = {})
-      field(f, attr, options) do
-        addClass options, 'form-control'
-        f.datetime_field attr, options
-      end
-    end
-  end
-end