foreman_monitoring 0.1.2 → 2.1.0

data/test/test_plugin_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # This calls the main test_helper in Foreman-core
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class MonitoringStatusTest < ActiveSupport::TestCase
@@ -6,62 +8,62 @@ 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
       assert status.relevant?
 
       host.build = true
-      refute status.relevant?
+      assert_not status.relevant?
     end
 
     test '#host_known_in_monitoring? should be true' do
@@ -76,10 +78,10 @@ class MonitoringStatusTest < ActiveSupport::TestCase
   context 'status with host without monitoring results' do
     test '#relevant? is always false when build changes' do
       host.build = false
-      refute status.relevant?
+      assert_not status.relevant?
 
       host.build = true
-      refute status.relevant?
+      assert_not status.relevant?
     end
 
     test '#refresh! refreshes the date and persists the record' do
@@ -90,7 +92,7 @@ class MonitoringStatusTest < ActiveSupport::TestCase
     end
 
     test '#host_known_in_monitoring? should be false' do
-      refute status.host_known_in_monitoring?
+      assert_not status.host_known_in_monitoring?
     end
   end
 end

data/test/unit/host_test.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 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 +24,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 +127,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_result_test.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+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

data/test/unit/monitoring_test.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 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,31 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -62,7 +104,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/api/v2/downtime_controller.rb
 - 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/lib/proxy_api/monitoring.rb
@@ -86,6 +130,7 @@ files:
 - config/routes.rb
 - 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/seeds.d/60-monitoring_proxy_feature.rb
 - lib/foreman_monitoring.rb
 - lib/foreman_monitoring/engine.rb
@@ -95,6 +140,7 @@ files:
 - locale/en/foreman_monitoring.po
 - locale/foreman_monitoring.pot
 - locale/gemspec.rb
+- test/controllers/api/v2/downtime_controller_test.rb
 - test/factories/feature.rb
 - test/factories/host.rb
 - test/factories/monitoring_results.rb
@@ -104,10 +150,11 @@ 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
+homepage: https://github.com/theforeman/foreman_monitoring
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -124,19 +171,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.
 test_files:
-- 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/factories/feature.rb
 - test/lib/proxy_api/monitoring_test.rb
+- test/functional/hosts_controller_test.rb
+- test/controllers/api/v2/downtime_controller_test.rb
 - test/test_plugin_helper.rb
-- test/unit/host_status/monitoring_status_test.rb
+- test/unit/monitoring_result_test.rb
 - test/unit/host_test.rb
 - test/unit/monitoring_test.rb
+- test/unit/host_status/monitoring_status_test.rb