icinga2 0.6.6.1 → 0.7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd8c5f9e6f260ffd94ce85a0814de8400db08d2
-  data.tar.gz: 5343c9012ca164d3fbd9a06a107a31d0258f2020
+  metadata.gz: c177787de41957958f31e98143b45e04d0215718
+  data.tar.gz: ca5ee207818c54b5622a4c8bd82b81331a4345c7
 SHA512:
-  metadata.gz: 21b027f3133be7f7eb320371e401202328c1868e0325a8ef0cfd3c5ff0dfcb18e27d2e1e99aadf1466dbb71895601b20598c1c885c3a134e5949ef4a115023bc
-  data.tar.gz: 2f3fea541b42764e334961d81080ed997ebbacee0bba0f2255607c09f585b079c371bb04e6a8aaff7d203dece7bfe8b2ddb67b2f67b035a178aa55d437de4c93
+  metadata.gz: b231ee1147b7d6dbec8f3261dccdb50490f52df3264c3f167907f4f7c56d099ee9d42fd9a34c9085f4b512149f20137d5c464ad360d890b1c3e1565a3a5a495c
+  data.tar.gz: 31e1bb01d9c1d1121234700b16fb2ce03d859ae46b61f58f42ca9893ab6cf11e1a352e73c9cfb11f538bc492cea4f62ae4fae58eb039a50301480b73895b39f8

data/examples/test.rb

@@ -12,12 +12,15 @@ require_relative '../lib/icinga2'
 
 # -----------------------------------------------------------------------------
 
-icinga_host         = ENV.fetch( 'ICINGA_HOST'             , 'icinga2' )
-icinga_api_port     = ENV.fetch( 'ICINGA_API_PORT'         , 5665 )
-icinga_api_user     = ENV.fetch( 'ICINGA_API_USER'         , 'admin' )
-icinga_api_pass     = ENV.fetch( 'ICINGA_API_PASSWORD'     , nil )
-icinga_cluster      = ENV.fetch( 'ICINGA_CLUSTER'          , false )
-icinga_satellite    = ENV.fetch( 'ICINGA_CLUSTER_SATELLITE', nil )
+icinga_host          = ENV.fetch( 'ICINGA_HOST'             , 'icinga2' )
+icinga_api_port      = ENV.fetch( 'ICINGA_API_PORT'         , 5665 )
+icinga_api_user      = ENV.fetch( 'ICINGA_API_USER'         , 'admin' )
+icinga_api_pass      = ENV.fetch( 'ICINGA_API_PASSWORD'     , nil )
+icinga_api_pki_path  = ENV.fetch( 'ICINGA_API_PKI_PATH'     , '/etc/icinga2' )
+icinga_api_node_name = ENV.fetch( 'ICINGA_API_NODE_NAME'    , nil )
+icinga_cluster       = ENV.fetch( 'ICINGA_CLUSTER'          , false )
+icinga_satellite     = ENV.fetch( 'ICINGA_CLUSTER_SATELLITE', nil )
+
 
 # convert string to bool
 icinga_cluster   = icinga_cluster.to_s.eql?('true') ? true : false
@@ -28,7 +31,9 @@ config = {
     api: {
       port: icinga_api_port,
       user: icinga_api_user,
-      password: icinga_api_pass
+      password: icinga_api_pass,
+      pki_path: icinga_api_pki_path,
+      node_name: icinga_api_node_name
     },
     cluster: icinga_cluster,
     satellite: icinga_satellite

data/lib/icinga2/hosts.rb

@@ -275,7 +275,9 @@ module Icinga2
 
         # get the count of problems
         #
-        @host_problems.keys[1..max_items].each { |k,_v| @host_problems_severity[k] = @host_problems[k] }
+        if( @host_problems.count != 0 )
+          @host_problems.keys[1..max_items].each { |k,_v| @host_problems_severity[k] = @host_problems[k] }
+        end
       end
       @host_problems_severity
 

data/lib/icinga2/network.rb

@@ -61,11 +61,17 @@ module Icinga2
           end
 
         end
+      rescue RestClient::Unauthorized => e
+
+        result = {
+          status: 401,
+          name: host,
+          message: 'unauthorized'
+        }
 
       rescue RestClient::ExceptionWithResponse => e
 
         error  = e.response ? e.response : nil
-
         error  = JSON.parse( error )
 
         result = {

data/lib/icinga2/status.rb

@@ -86,30 +86,29 @@ module Icinga2
 
       return stats if data.nil?
 
-        data = data.dig(:data)
+      data = data.dig(:data)
 
-        a = {
-          'json-rpc'  => data.dig('ApiListener', 'api', 'json_rpc'),
-          'graphite'  => data.dig('GraphiteWriter', 'graphitewriter', 'graphite'),
-          'ido-mysql' => data.dig('IdoMysqlConnection', 'idomysqlconnection', 'ido-mysql')
-        }
+      json_rpc_data  = data.dig('ApiListener', 'api', 'json_rpc')
+      graphite_data  = data.dig('GraphiteWriter', 'graphitewriter', 'graphite')
+      ido_mysql_data = data.dig('IdoMysqlConnection', 'idomysqlconnection', 'ido-mysql')
 
-        key_list = %w[work_queue_item_rate query_queue_item_rate]
+      a = {}
+      a['json_rpc']  = json_rpc_data  if(json_rpc_data.is_a?(Hash))
+      a['graphite']  = graphite_data  if(graphite_data.is_a?(Hash))
+      a['ido-mysql'] = ido_mysql_data if(ido_mysql_data.is_a?(Hash))
 
-        a.each do |k,v|
-          if(v.nil?)
-            next
-          end
-          key_list.each do |key|
-            if( v.include?( key ))
-              attr_name = format('%s queue rate', k)
-              stats[attr_name] = v[key].to_f.round(3)
-            end
+      key_list = %w[work_queue_item_rate query_queue_item_rate]
+
+      a.each do |k,v|
+        key_list.each do |key|
+          if( v.include?( key ))
+            attr_name = format('%s queue rate', k)
+            stats[attr_name] = v[key].to_f.round(3)
           end
         end
+      end
 
-        stats
-
+      stats
     end
 
 
@@ -206,5 +205,6 @@ module Icinga2
         end
       end
     end
+
   end
 end

data/lib/icinga2/version.rb

@@ -9,9 +9,9 @@ module Icinga2
     # major part of version
     MAJOR = 0
     # minor part of version
-    MINOR = 6
+    MINOR = 7
     # tiny part of version
-    TINY  = 6
+    TINY  = 0
     # patch part
     PATCH = 1
 

data/lib/icinga2.rb

@@ -109,14 +109,26 @@ module Icinga2
       @icinga_api_port       = settings.dig(:icinga, :api, :port)     || 5665
       @icinga_api_user       = settings.dig(:icinga, :api, :user)
       @icinga_api_pass       = settings.dig(:icinga, :api, :password)
+      @icinga_api_pki_path   = settings.dig(:icinga, :api, :pki_path)
+      @icinga_api_node_name  = settings.dig(:icinga, :api, :node_name)
+
       @icinga_cluster        = settings.dig(:icinga, :cluster)        || false
       @icinga_satellite      = settings.dig(:icinga, :satellite)
       @icinga_notifications  = settings.dig(:icinga, :notifications)  || false
 
       @icinga_api_url_base   = format( 'https://%s:%d', @icinga_host, @icinga_api_port )
-      @node_name             = Socket.gethostbyname( Socket.gethostname ).first
 
-      @has_cert   = cert?( user: @icinga_api_user, password: @icinga_api_pass )
+      if( @icinga_api_node_name.nil? )
+        @icinga_api_node_name = Socket.gethostbyname( Socket.gethostname ).first
+      end
+
+      @has_cert, @options = cert?(
+        pki_path: @icinga_api_pki_path,
+        node_name: @icinga_api_node_name,
+        user: @icinga_api_user,
+        password: @icinga_api_pass
+      )
+
       @headers    = { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
 
 
@@ -141,7 +153,7 @@ module Icinga2
     # @option params [Integer] :user the Icinga2 API User
     # @option params [Integer] :password the Icinga2 API Password
     # @example with Certificate
-    #    @icinga.cert?(name_name: 'icinga2-dashing')
+    #    @icinga.cert?(pki_path: '/etc/icinga2', name_name: 'icinga2-dashing')
     #
     # @example with User
     #    @icinga.cert?(user: 'root', password: 'icinga')
@@ -150,44 +162,46 @@ module Icinga2
     #
     def cert?( params = {} )
 
-      node_name    = params.dig(:node_name) || 'localhost'
+      pki_path     = params.dig(:pki_path)
+      node_name    = params.dig(:node_name)
       user         = params.dig(:user)
       password     = params.dig(:password)
 
-      # check whether pki files are there, otherwise use basic auth
-      if File.file?( format( 'pki/%s.crt', node_name ) )
+      ssl_cert_file = format( '%s/%s.crt', pki_path, node_name )
+      ssl_key_file  = format( '%s/%s.key', pki_path, node_name )
+      ssl_ca_file   = format( '%s/ca.crt', pki_path )
+
+      if( File.file?( ssl_cert_file ) && File.file?( ssl_key_file ) && File.file?( ssl_ca_file ) )
 
         logger.debug( 'PKI found, using client certificates for connection to Icinga 2 API' )
 
-        ssl_cert_file = File.read( format( 'pki/%s.crt', node_name ) )
-        ssl_key_file  = File.read( format( 'pki/%s.key', node_name ) )
-        ssl_ca_file   = File.read( 'pki/ca.crt' )
+        ssl_cert_file = File.read( ssl_cert_file )
+        ssl_key_file  = File.read( ssl_key_file )
+        ssl_ca_file   = File.read( ssl_ca_file )
 
-        cert      = OpenSSL::X509::Certificate.new( ssl_cert_file )
-        key       = OpenSSL::PKey::RSA.new( ssl_key_file )
+        cert          = OpenSSL::X509::Certificate.new( ssl_cert_file )
+        key           = OpenSSL::PKey::RSA.new( ssl_key_file )
 
-        @options   = {
+        [true, {
           ssl_client_cert: cert,
           ssl_client_key: key,
           ssl_ca_file: ssl_ca_file,
           verify_ssl: OpenSSL::SSL::VERIFY_NONE
-        }
+        } ]
 
-        return true
       else
 
         logger.debug( 'PKI not found, using basic auth for connection to Icinga 2 API' )
 
-        @options = {
+        [false, {
           user: user,
           password: password,
           verify_ssl: OpenSSL::SSL::VERIFY_NONE
-        }
-
-        return false
+        } ]
       end
 
     end
 
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icinga2
 version: !ruby/object:Gem::Version
-  version: 0.6.6.1
+  version: 0.7.0.1
 platform: ruby
 authors:
 - Bodo Schulz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client