foreman_monitoring 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e703d5ad965ed3aecba3fee0dc31a7a2c80a84eab893392484555fda8ba8ab1
-  data.tar.gz: 6dce2771bea3df536cb244aadfbad6483387d71157c4b70d5cbe0256b27f508c
+  metadata.gz: bba72edc0a48bb00f5818a0662ef643ea892cef4f457b474fd35332471bf1751
+  data.tar.gz: b62364ba84ac51878993cd2d6d7be654cfb10aa2c2a565b2ec71f6dc38f933a1
 SHA512:
-  metadata.gz: e3c24e7c223b0103333d21717636f338176cb2756028d60943c8e6276ffaa366de039dec2b5afd527b5f50464737194b6cc6d5e357f9696d6b56aff167b7fc6e
-  data.tar.gz: ca91aa5af43494a254fbe03bd13cb4e4e30dccfdab8e47befb8252f97b2cce1bd8ab850739993d1675d194f3253a8b5825b248f6d95cc75b6b7c4915252356eb
+  metadata.gz: d1d0834a1dc76d2009dc1bd1bbd35c0fbcfc166e1b1206c87a3ba1fd7d8543c693d22550cd899129b41d9dcbf76d0a379ab7c0ef6a7d83e2ffa1960c0b8ec3a2
+  data.tar.gz: 8715c42a9d55a3f491a860373c74dcda03351be2752a14e2dc798781f1ab807b55ff332822ead436637b1d479702920cbe9c19b6b30bff4844418acbe3d8611f

data/README.md

@@ -34,6 +34,9 @@ touch ~foreman/tmp/restart.txt
 | --------------- | --------------:|
 | >= 1.15         | ~> 0.1         |
 | >= 1.17         | ~> 1.0         |
+| >= 2.0          | ~> 2.0         |
+| >= 2.2          | ~> 2.1         |
+| >= 3.0          | ~> 3.0         |
 
 # Usage
 

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

@@ -7,6 +7,7 @@ module ForemanMonitoring
     module ClassMethods
       def authorize_host_by_client_cert(actions, _options = {})
         skip_before_action :require_login, :only => actions, :raise => false
+        skip_before_action :check_user_enabled, :only => actions, :raise => false
         skip_before_action :authorize, :only => actions
         skip_before_action :verify_authenticity_token, :only => actions
         skip_before_action :set_taxonomy, :only => actions, :raise => false

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

@@ -56,7 +56,7 @@ module ForemanMonitoring
     end
 
     def monitoring_attributes
-      {
+      attributes = {
         :ip => ip,
         :ip6 => ip6,
         :architecture => architecture.try(:name),
@@ -69,9 +69,12 @@ module ForemanMonitoring
         :organization => organization.try(:name),
         :location => location.try(:name),
         :comment => comment,
-        :environment => environment.try(:to_s),
         :owner_name => owner.try(:name)
       }
+
+      attributes[:environment] = environment.try(:to_s) if defined?(ForemanPuppet)
+
+      attributes
     end
 
     private

data/db/migrate/201910180900_rename_downtime_host_permission.rb

@@ -3,13 +3,13 @@
 class RenameDowntimeHostPermission < ActiveRecord::Migration[5.2]
   def up
     # rubocop:disable Rails/SkipsModelValidations
-    Permission.where(name: 'manage_host_downtimes').update_all(name: 'manage_downtime_hosts')
+    Permission.where(name: 'manage_host_downtimes').update_all(name: 'manage_downtime_hosts') if table_exists?(:permissions)
     # rubocop:enable Rails/SkipsModelValidations
   end
 
   def down
     # rubocop:disable Rails/SkipsModelValidations
-    Permission.where(name: 'manage_downtime_hosts').update_all(name: 'manage_host_downtimes')
+    Permission.where(name: 'manage_downtime_hosts').update_all(name: 'manage_host_downtimes') if table_exists?(:permissions)
     # rubocop:enable Rails/SkipsModelValidations
   end
 end

data/db/migrate/20221026065954_fix_monitoring_settings_category_to_dsl.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class FixMonitoringSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Setting.where(category: 'Setting::Monitoring').update_all(category: 'Setting')
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/foreman_monitoring/engine.rb

@@ -18,19 +18,31 @@ module ForemanMonitoring
       end
     end
 
-    initializer 'foreman_monitoring.load_default_settings',
-                :before => :load_config_initializers do |_app|
-      setting_table_exists = begin
-                               Setting.table_exists?
-                             rescue StandardError
-                               false
-                             end
-      require_dependency File.expand_path('../../app/models/setting/monitoring.rb', __dir__) if setting_table_exists
-    end
-
     initializer 'foreman_monitoring.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_monitoring do
-        requires_foreman '>= 2.0'
+        requires_foreman '>= 3.0'
+
+        settings do
+          category(:monitoring, N_('Monitoring')) do
+            setting('monitoring_affect_global_status',
+                    type: :boolean,
+                    description: N_("Monitoring status will affect a host's global status when enabled"),
+                    default: true,
+                    full_name: N_('Monitoring status should affect global status'))
+            setting('monitoring_create_action',
+                    type: :string,
+                    description: N_('What action should be taken when a host is created'),
+                    default: 'create',
+                    full_name: N_('Host Create Action'),
+                    collection: proc { ::Monitoring::CREATE_ACTIONS })
+            setting('monitoring_delete_action',
+                    type: :string,
+                    description: N_('What action should be taken when a host is deleted'),
+                    default: 'delete',
+                    full_name: N_('Host Delete Action'),
+                    collection: proc { ::Monitoring::DELETE_ACTIONS })
+          end
+        end
 
         apipie_documented_controllers ["#{ForemanMonitoring::Engine.root}/app/controllers/api/v2/*.rb"]
 

data/lib/foreman_monitoring/version.rb

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

data/test/controllers/api/v2/downtime_controller_test.rb

@@ -8,7 +8,7 @@ class Api::V2::DowntimeControllerTest < ActionController::TestCase
   context 'with user authentication' do
     context '#create' do
       test 'should deny access' do
-        put :create
+        post :create
         assert_response :forbidden
       end
     end
@@ -29,7 +29,7 @@ class Api::V2::DowntimeControllerTest < ActionController::TestCase
 
     context '#create' do
       test 'should create downtime' do
-        put :create
+        post :create
         assert_response :success
       end
     end
@@ -37,13 +37,13 @@ class Api::V2::DowntimeControllerTest < ActionController::TestCase
     context '#create with duration' do
       test 'should create downtime with given duration' do
         Host::Managed.any_instance.expects(:downtime_host).with { |params| params[:end_time] - params[:start_time] == 3600 }
-        put :create, params: { duration: 3600 }
+        post :create, params: { duration: 3600 }
         assert_response :success
       end
 
       test 'should create downtime with given duration as string' do
         Host::Managed.any_instance.expects(:downtime_host).with { |params| params[:end_time] - params[:start_time] == 3600 }
-        put :create, params: { duration: '3600' }
+        post :create, params: { duration: '3600' }
         assert_response :success
       end
     end
@@ -51,7 +51,7 @@ class Api::V2::DowntimeControllerTest < ActionController::TestCase
     context '#create with reason' do
       test 'should create downtime with given reason' do
         Host::Managed.any_instance.expects(:downtime_host).with { |params| params[:comment] == 'In testing' }
-        put :create, params: { reason: 'In testing' }
+        post :create, params: { reason: 'In testing' }
         assert_response :success
       end
     end

data/test/test_plugin_helper.rb

@@ -11,10 +11,6 @@ FactoryBot.reload
 # Foreman's setup doesn't handle cleaning up for Minitest::Spec
 DatabaseCleaner.strategy = :transaction
 
-def setup_settings
-  Setting::Monitoring.load_defaults
-end
-
 def disable_monitoring_orchestration
   ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns({})
 end

data/test/unit/host_status/monitoring_status_test.rb

@@ -4,7 +4,6 @@ require 'test_plugin_helper'
 
 class MonitoringStatusTest < ActiveSupport::TestCase
   setup do
-    setup_settings
     disable_monitoring_orchestration
   end
 

data/test/unit/host_test.rb

@@ -5,7 +5,6 @@ require 'test_plugin_helper'
 class HostTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
     disable_orchestration
     disable_monitoring_orchestration
   end

data/test/unit/monitoring_result_test.rb

@@ -5,7 +5,6 @@ require 'test_plugin_helper'
 class MonitoringResultTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
     disable_orchestration
     disable_monitoring_orchestration
   end

data/test/unit/monitoring_test.rb

@@ -5,7 +5,6 @@ require 'test_plugin_helper'
 class MonitoringTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
     disable_monitoring_orchestration
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -115,7 +115,6 @@ files:
 - app/models/concerns/orchestration/monitoring.rb
 - app/models/host_status/monitoring_status.rb
 - app/models/monitoring_result.rb
-- app/models/setting/monitoring.rb
 - app/overrides/add_host_monitoring_result_tab.rb
 - app/overrides/add_host_multiple_power_set_downtime_checkbox.rb
 - app/overrides/add_host_set_downtime_modal.rb
@@ -131,6 +130,7 @@ files:
 - db/migrate/20160817135723_create_monitoring_results.rb
 - db/migrate/20161220201510_add_monitoring_proxy_id_to_host_and_hostgroup.rb
 - db/migrate/201910180900_rename_downtime_host_permission.rb
+- db/migrate/20221026065954_fix_monitoring_settings_category_to_dsl.rb
 - db/seeds.d/60-monitoring_proxy_feature.rb
 - lib/foreman_monitoring.rb
 - lib/foreman_monitoring/engine.rb
@@ -171,20 +171,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 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/controllers/api/v2/downtime_controller_test.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/controllers/api/v2/downtime_controller_test.rb
-- test/functional/hosts_controller_test.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

data/app/models/setting/monitoring.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-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 { ::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 })
-      ]
-    end
-
-    def self.load_defaults
-      # Check the table exists
-      return unless super
-
-      self.transaction do
-        default_settings.each { |s| self.create! s.update(:category => 'Setting::Monitoring') }
-      end
-
-      true
-    end
-
-    def self.humanized_category
-      N_('Monitoring')
-    end
-  end
-end