foreman_monitoring 0.0.3 → 0.1.0

data/test/lib/proxy_api/monitoring_test.rb

@@ -19,4 +19,34 @@ class ProxyApiDhcpTest < ActiveSupport::TestCase
       returns(fake_rest_client_response({ 'result' => {} }))
     assert_equal({ 'result' => {} }, @monitoring.create_host_downtime('example.com'))
   end
+
+  test 'remove_host_downtime should do delete' do
+    @monitoring.expects(:delete).with('downtime/host/example.com?comment=bla').
+      returns(fake_rest_client_response({ 'result' => {} }))
+    assert_equal({ 'result' => {} }, @monitoring.remove_host_downtime('example.com', :comment => 'bla'))
+  end
+
+  test 'create_host should do put' do
+    @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').
+      returns(fake_rest_client_response({ 'result' => {} }))
+    assert_equal({ 'result' => {} }, @monitoring.update_host('example.com', :ip => '1.1.1.1'))
+  end
+
+  test 'delete_host should do delete' do
+    @monitoring.expects(:delete).with('host/example.com').
+      returns(fake_rest_client_response({ 'result' => {} }))
+    assert_equal({ 'result' => {} }, @monitoring.delete_host('example.com'))
+  end
+
+  test 'query_host should do get' do
+    @monitoring.expects(:get).with('host/example.com').
+      returns(fake_rest_client_response({ 'result' => {} }))
+    assert_equal({ 'result' => {} }, @monitoring.query_host('example.com'))
+  end
 end

data/test/test_plugin_helper.rb

@@ -13,6 +13,10 @@ def setup_settings
   Setting::Monitoring.load_defaults
 end
 
+def disable_monitoring_orchestration
+  ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns({})
+end
+
 class Minitest::Spec
   before :each do
     DatabaseCleaner.start

data/test/unit/host_status/monitoring_status_test.rb

@@ -3,9 +3,10 @@ require 'test_plugin_helper'
 class MonitoringStatusTest < ActiveSupport::TestCase
   setup do
     setup_settings
+    disable_monitoring_orchestration
   end
 
-  let(:host) { FactoryGirl.create(:host) }
+  let(:host) { FactoryGirl.create(:host, :with_monitoring) }
   let(:status) { HostStatus::MonitoringStatus.new(:host => host) }
 
   context 'status changes' do
@@ -53,7 +54,7 @@ class MonitoringStatusTest < ActiveSupport::TestCase
   end
 
   context 'status with host with monitoring results' do
-    let(:host) { FactoryGirl.create(:host, :with_monitoring_results) }
+    let(:host) { FactoryGirl.create(:host, :with_monitoring, :with_monitoring_results) }
 
     test '#relevant? is only for hosts not in build mode' do
       host.build = false
@@ -66,6 +67,10 @@ class MonitoringStatusTest < ActiveSupport::TestCase
     test '#host_known_in_monitoring? should be true' do
       assert status.host_known_in_monitoring?
     end
+
+    test '#host_monitored? should be true' do
+      assert status.host_monitored?
+    end
   end
 
   context 'status with host without monitoring results' do

data/test/unit/host_test.rb

@@ -4,16 +4,13 @@ class HostTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryGirl.build(:user, :admin)
     setup_settings
+    disable_orchestration
+    disable_monitoring_orchestration
   end
 
   context 'downtime handling' do
     let(:host) { FactoryGirl.create(:host, :managed) }
 
-    test 'it should set a downtime when host is deleted' do
-      host.expects(:downtime_host).once
-      assert host.destroy
-    end
-
     test 'it should set a downtime when build status changes' do
       host.expects(:downtime_host).once
 
@@ -23,4 +20,113 @@ class HostTest < ActiveSupport::TestCase
       assert host.save
     end
   end
+
+  context 'a host with monitoring orchestration' do
+    let(:host) { FactoryGirl.build(:host, :managed, :with_monitoring) }
+
+    context 'with create/delete actions' do
+      setup do
+        Setting[:monitoring_create_action] = 'create'
+        Setting[:monitoring_delete_action] = 'delete'
+      end
+
+      test 'should queue monitoring create' do
+        ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns(nil)
+        assert_valid host
+        tasks = host.queue.all.map(&:name)
+        assert_includes tasks, "Create monitoring object for #{host}"
+        assert_equal 1, tasks.size
+      end
+
+      test 'should queue monitoring update' do
+        fake_host_query_result = {
+          'ip' => '1.1.1.1',
+          'ip6' => '2001:db8::1',
+        }
+        ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns(fake_host_query_result)
+        host.save
+        host.queue.clear
+        assert_valid host
+        tasks = host.queue.all.map(&:name)
+        assert_includes tasks, "Monitoring update for #{host}"
+        assert_equal 1, tasks.size
+      end
+
+      test 'should not queue monitoring update' do
+        ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns({})
+        host.save
+        host.queue.clear
+        fake_host_query_result = host.monitoring_attributes
+        ProxyAPI::Monitoring.any_instance.stubs(:query_host).returns(fake_host_query_result)
+        assert_valid host
+        tasks = host.queue.all.map(&:name)
+        assert_equal [], tasks
+      end
+
+      test 'should queue monitoring destroy' do
+        assert_valid host
+        host.queue.clear
+        host.send(:queue_monitoring_destroy)
+        tasks = host.queue.all.map(&:name)
+        assert_includes tasks, "Removing monitoring object for #{host}"
+        assert_equal 1, tasks.size
+      end
+    end
+
+    context 'with none/downtime actions' do
+      setup do
+        Setting[:monitoring_create_action] = 'none'
+        Setting[:monitoring_delete_action] = 'downtime'
+      end
+
+
+      test 'should not queue monitoring create actions' do
+        assert_valid host
+        tasks = host.queue.all.map(&:name)
+        assert_equal [], tasks
+      end
+
+      test 'should queue monitoring downtime on host destroy' do
+        assert_valid host
+        host.queue.clear
+        host.send(:queue_monitoring_destroy)
+        tasks = host.queue.all.map(&:name)
+        assert_includes tasks, "Set monitoring downtime for #{host}"
+        assert_equal 1, tasks.size
+      end
+    end
+
+    test 'setMonitoring' do
+      ProxyAPI::Monitoring.any_instance.expects(:create_host).once
+      host.send(:setMonitoring)
+    end
+
+    test 'delMonitoring' do
+      ProxyAPI::Monitoring.any_instance.expects(:delete_host).once
+      host.send(:delMonitoring)
+    end
+
+    test 'setMonitoringDowntime' do
+      ProxyAPI::Monitoring.any_instance.expects(:create_host_downtime).once
+      host.send(:setMonitoringDowntime)
+    end
+
+    test 'delMonitoringDowntime' do
+      ProxyAPI::Monitoring.any_instance.expects(:remove_host_downtime).once
+      host.send(:delMonitoringDowntime)
+    end
+  end
+
+  context 'a host without monitoring' do
+    let(:host) { FactoryGirl.build(:host, :managed) }
+
+    test 'should not queue any monitoring actions' do
+      assert_valid host
+      host.queue.clear
+      host.send(:queue_monitoring)
+      host.send(:queue_monitoring_destroy)
+      tasks = host.queue.all.map(&:name)
+      assert_equal [], tasks
+    end
+  end
 end

data/test/unit/monitoring_test.rb

@@ -4,14 +4,20 @@ class MonitoringTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryGirl.build(:user, :admin)
     setup_settings
-    @proxy = FactoryGirl.create(:smart_proxy, :monitoring)
+    disable_monitoring_orchestration
   end
 
-  let(:host) { FactoryGirl.create(:host, :managed) }
-  let(:monitoring) { Monitoring.new }
+  let(:monitoring_proxy) { FactoryGirl.create(:smart_proxy, :monitoring) }
+  let(:host) { FactoryGirl.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
     ProxyAPI::Monitoring.any_instance.expects(:create_host_downtime).returns({}).once
     monitoring.set_downtime_host(host)
   end
+
+  test '#query_host should call proxy api' do
+    ProxyAPI::Monitoring.any_instance.expects(:query_host).returns({}).once
+    monitoring.query_host(host)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -63,18 +63,29 @@ files:
 - README.md
 - Rakefile
 - app/controllers/api/v2/monitoring_results_controller.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
 - app/models/concerns/foreman_monitoring/host_extensions.rb
+- app/models/concerns/foreman_monitoring/hostgroup_extensions.rb
+- 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
 - app/services/monitoring.rb
+- app/views/hosts/_downtime_fields.html.erb
+- app/views/hosts/_host_downtime_checkbox.html.erb
+- app/views/hosts/_set_host_downtime.html.erb
+- app/views/hosts/select_multiple_downtime.html.erb
+- app/views/hosts/select_multiple_monitoring_proxy.html.erb
 - app/views/monitoring_results/_host_tab.html.erb
 - app/views/monitoring_results/_host_tab_pane.html.erb
 - config/routes.rb
 - db/migrate/20160817135723_create_monitoring_results.rb
+- db/migrate/20161220201510_add_monitoring_proxy_id_to_host_and_hostgroup.rb
 - db/seeds.d/60-monitoring_proxy_feature.rb
 - lib/foreman_monitoring.rb
 - lib/foreman_monitoring/engine.rb
@@ -88,6 +99,7 @@ files:
 - 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/unit/host_status/monitoring_status_test.rb
@@ -113,17 +125,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 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/factories/host.rb
-- test/factories/feature.rb
-- test/test_plugin_helper.rb
+- test/functional/hosts_controller_test.rb
 - test/lib/proxy_api/monitoring_test.rb
+- test/test_plugin_helper.rb
 - test/unit/host_status/monitoring_status_test.rb
 - test/unit/host_test.rb
 - test/unit/monitoring_test.rb