foreman_icinga 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5fe9e348c1efab758fe5a284d1930996c46c7de
-  data.tar.gz: e0a372b1d4874cca69ea5ec54ec92b62e42926c0
+  metadata.gz: 3277325729411ef0c006c242754b121f24c567fd
+  data.tar.gz: a3e5077b6524e54541f846ddfd9e88eaac02bdda
 SHA512:
-  metadata.gz: e7cac06f97608db518c02d48e690b64937528299d3f6b8d83fb87d67caf9a05a57b9c9b583ef565fa329cd75d6b06eeb71b0c07e587f5a3fc67d1ef842581f31
-  data.tar.gz: b56b4203b95f04b32ca6963ce08a7f32730f9879ba9736ea6cb89b7f7ff40fbb8c181163a15be8aec616eb011d36463125c21fc27bc269d1edad64ee037e2ecc
+  metadata.gz: 09c9ea01e0cf162bcdf8f28139f80fc9e1e73043463b16619a98a350505a777d981cfa23953bf9ff06b2b56d28e414d85c3d3eaa2f2827ea0489c0b8d45b36ce
+  data.tar.gz: 28735b6498e8d5dffc73607fd80c10d97c3f28cc95d1d933ff79ef805c08ecceabca5c92b2e8677d325c182889ac6a3cbdb8683978882ae0e337e9eb10518329

data/app/models/host_status/icinga_status.rb

@@ -5,7 +5,7 @@ module HostStatus
     CRITICAL = 2
     UNKNOWN = 3
 
-    def relevant?
+    def relevant?(options = {})
       host_not_in_build? && host_known_in_icinga?
     end
 
@@ -62,9 +62,12 @@ module HostStatus
 
     def call_icinga
       client.call('deployment/health/check', '', 'host' => host.name)
+    rescue RestClient::Unauthorized
+      nil
     end
 
     def parse_host_status(response)
+      return UNKNOWN if response.nil?
       return UNKNOWN if response.key?('status') && response['status'] == 'error'
       return UNKNOWN unless response.key?('healthy')
       if response['healthy']

data/app/services/icinga.rb

@@ -47,7 +47,6 @@ class Icinga
 
   def default_params
     {
-      'token' => token,
       'json'  => true
     }
   end
@@ -83,6 +82,6 @@ class Icinga
   def icinga_url_for(route, params = {})
     base = URI.join(address, route).to_s
     return base if params.empty?
-    base + '?' + params.to_query
+    base + '?' + params.to_query + '&token=' + token
   end
 end

data/lib/foreman_icinga/engine.rb

@@ -18,7 +18,7 @@ module ForemanIcinga
       end
     end
 
-    initializer 'foreman_icinga.register_plugin', :after => :finisher_hook do |_app|
+    initializer 'foreman_icinga.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_icinga do
         requires_foreman '>= 1.10'
         register_custom_status HostStatus::IcingaStatus

data/lib/foreman_icinga/version.rb

@@ -1,3 +1,3 @@
 module ForemanIcinga
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/unit/icinga_test.rb

@@ -6,16 +6,10 @@ class IcingaTest < ActiveSupport::TestCase
     @icinga = Icinga.new
   end
 
-  test '#default_params should contain token' do
-    default_params = @icinga.send('default_params')
-    assert_kind_of Hash, default_params
-    assert_equal '123456', default_params['token']
-  end
-
   test '#icinga_url_for should return valid urls' do
-    assert_equal 'http://example.com/test/bla',
+    assert_equal 'http://example.com/test/bla&token=123456',
                  @icinga.send('icinga_url_for', 'test/bla')
-    assert_equal 'http://example.com/test/blubb?param=1',
+    assert_equal 'http://example.com/test/blubb?param=1&token=123456',
                  @icinga.send('icinga_url_for', 'test/blubb', 'param' => '1')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_icinga
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client