foreman_icinga 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3277325729411ef0c006c242754b121f24c567fd
-  data.tar.gz: a3e5077b6524e54541f846ddfd9e88eaac02bdda
+  metadata.gz: a19abcebbff33e10eb8dbe58e71d5577fda543dd
+  data.tar.gz: a239355f620a1e1b8a540424259e4e6309a76334
 SHA512:
-  metadata.gz: 09c9ea01e0cf162bcdf8f28139f80fc9e1e73043463b16619a98a350505a777d981cfa23953bf9ff06b2b56d28e414d85c3d3eaa2f2827ea0489c0b8d45b36ce
-  data.tar.gz: 28735b6498e8d5dffc73607fd80c10d97c3f28cc95d1d933ff79ef805c08ecceabca5c92b2e8677d325c182889ac6a3cbdb8683978882ae0e337e9eb10518329
+  metadata.gz: 7ba9da13812cfb4b1c1f287502a1ac85bbd20d73f3e9758b4de405524d9350ecd578447d5803c32e612b1eb97a430cc8aa53f508d6bed1162d120d0228b5dc78
+  data.tar.gz: 24c126884c8c83f289300aa272f500c9f9eb528c39e7a37543ddbaa5c9904066951877cbe322895663e7c144d161cfabc88efaeee86ad00c1c37cc8c6e4ef11b

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

@@ -40,7 +40,7 @@ module ForemanIcinga
           'comment' => 'host deleted in foreman',
           'duration' => '7200'
         }
-        response = icinga.call('deployment/downtime/schedule', '', params)
+        response = icinga.call('deployment/downtime/schedule', {}, params)
 
         if response['status'] == 'error' && ! icinga_ignore_failed_action?
           errors.add(:base, _("Error from Icinga server: '%s'") % response['message'])

data/app/models/host_status/icinga_status.rb

@@ -61,7 +61,7 @@ module HostStatus
     end
 
     def call_icinga
-      client.call('deployment/health/check', '', 'host' => host.name)
+      client.call('deployment/health/check', {}, {'host' => host.name}, :get)
     rescue RestClient::Unauthorized
       nil
     end

data/app/services/icinga.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 
 class Icinga
+  delegate :logger, :to => :Rails
   attr_reader :client, :token, :address
 
   def initialize
@@ -8,19 +9,18 @@ class Icinga
     @token = Setting[:icinga_token]
   end
 
-  def call(endpoint, payload = '', params = {})
+  def call(endpoint, payload = {}, params = {}, method = :post)
     uri = icinga_url_for(endpoint, params.merge(default_params))
-    parse post(uri, payload)
+    result = nil
+    result = parse post(uri, payload) if method == :post
+    result = parse get(uri, payload) if method == :get
+    result
   rescue OpenSSL::SSL::SSLError => e
     message = "SSL Connection to Icinga failed: #{e}"
     logger.warn message
     error_response message
   end
 
-  def logger
-    Rails.logger
-  end
-
   protected
 
   attr_reader :connect_params
@@ -30,7 +30,7 @@ class Icinga
       :timeout      => 3,
       :open_timeout => 3,
       :headers      => {
-        :accept     => :json
+        :accept     => '*/*',
       },
       :verify_ssl   => verify_ssl?,
       :ssl_ca_file  => ssl_ca_file
@@ -55,10 +55,14 @@ class Icinga
     RestClient::Resource.new(uri, connect_params)
   end
 
-  def post(path, payload = '')
+  def post(path, payload = {})
     client(path).post(payload)
   end
 
+  def get(path, payload = {})
+    client(path).get(payload)
+  end
+
   def parse(response)
     if response && response.code >= 200 && response.code < 300
       return response.body.present? ? JSON.parse(response.body) : error_response(_('received empty result'))
@@ -81,7 +85,7 @@ class Icinga
 
   def icinga_url_for(route, params = {})
     base = URI.join(address, route).to_s
-    return base if params.empty?
+    return base + "?token=" + token if params.empty?
     base + '?' + params.to_query + '&token=' + token
   end
 end

data/lib/foreman_icinga/version.rb

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

data/test/unit/icinga_test.rb

@@ -7,7 +7,7 @@ class IcingaTest < ActiveSupport::TestCase
   end
 
   test '#icinga_url_for should return valid urls' do
-    assert_equal 'http://example.com/test/bla&token=123456',
+    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&token=123456',
                  @icinga.send('icinga_url_for', 'test/blubb', 'param' => '1')
@@ -20,18 +20,18 @@ class IcingaTest < ActiveSupport::TestCase
 
   test 'should correctly parse response' do
     @icinga.expects(:post)
-      .with('http://example.com/health?host=example.com&json=true&token=123456', '')
+      .with('http://example.com/health?host=example.com&json=true&token=123456', {})
       .returns(fake_response(JSON('healthy' => 'true')))
-    response = @icinga.call('health', '', 'host' => 'example.com')
+    response = @icinga.call('health', {}, {'host' => 'example.com'})
     assert_kind_of Hash, response
     assert response['healthy']
   end
 
   test 'should return error message when result is empty' do
     @icinga.expects(:post)
-      .with('http://example.com/health?host=example.com&json=true&token=123456', '')
+      .with('http://example.com/health?host=example.com&json=true&token=123456', {})
       .returns(fake_response(''))
-    response = @icinga.call('health', '', 'host' => 'example.com')
+    response = @icinga.call('health', {}, {'host' => 'example.com'})
     assert_kind_of Hash, response
     assert_equal 'error', response['status']
     assert_equal 'received empty result', response['message']

metadata

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